summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-02-12cache-l2x0.c: silence compiler warningMax Krummenacher
Fix commit '46a30aca7f5c MLK-20052 L2 Cache TEE/Linux shared mutex' when CONFIG_OPTEE is not defined. Compiler warning: | arch/arm/mm/cache-l2x0.c:151:12: warning: ‘l2c_set_mutex’ defined but not used [-Wunused-function] fns.set_mutex and l2c_set_mutex() are guarded by CONFIG_OPTEE. On top of that the function pointer is tested for NULL before calling. Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
2020-02-12ARM: dts: Add initial Iris devicetreesPhilippe Schenker
Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
2020-02-12drm/mxsfb: don't manipulate with clock inside ISROleksandr Suvorov
iMX8 manages clocks with system controller (sc) using RPC. Using RPC procedures from interrupt context leads kernel crash. Remove enabling/disabling clock in interrupt handler. Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
2020-02-12drm/mxsfb: grab the pm->sync() reference on probingOleksandr Suvorov
The mxsfb driver doesn't have a real consumer. This leads the power domains of eLCDIF to off right after device probing. It is required to get the reference counter to prevent this behavior. Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
2020-02-12ARM: dts: imx6qdl-colibri: Correct usdhc1Philippe Schenker
Usdhc1 had wrong stuff in it due to the merge request. Fix that Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
2020-02-12ARM: dts: imx6/7-colibri: switch dr_mode to otgPhilippe Schenker
In order for the otg ports, that these modules support, it is needed that dr_mode is on otg. Switch to use that feature. Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
2020-02-12arm64: dts: fsl: colibri-imx8qxp: set bus width for elcdifOleksandr Suvorov
By default, Colibri iMX8QXP uses 18-bit output bus of eLCDIF. Set bus width correctly fixes framebuffer translation issue. Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
2020-02-12drm/mxsfb: support bus-width property of dtOleksandr Suvorov
There could be different implementations of output bus widths (8, 16, 18, 24 bits). Selecting the correct bus format allows eLCDIF to translate framebuffer properly. Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
2020-02-12arm64: dts: fsl: colibri-imx8qxp: Fix mode for eLCDIF Enable signalOleksandr Suvorov
gpio_bl_on is used as output to enable linked consumers of eLCDIF: panel or bridge. Fix pinmux mode for this pin. Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
2020-02-12arm64: dts: fsl: colibri-imx8qxp: Add VGA and DISP outputs for LCDIFOleksandr Suvorov
Support DAC VGA converter and parallel display interface as output ports of LCDIF block. Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
2020-02-12arm64: dts: fsl: colibri-imx8qxp: Add VGA VDDOleksandr Suvorov
Add VDD regulator for VGA encoder ADV7125. Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
2020-02-12ARM64: defconfig: add dumb-vga-dac idrm bridgeOleksandr Suvorov
This driver serves ADV7125 VGA DAC Coverter on Colibri Evaluation board. Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
2020-02-12drm/mxsfb: support bridge connectionOleksandr Suvorov
Add support a bridge as a connection of eLCDIF device. Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
2020-02-12arm64: dts: imx8dx: Don't reparent eLCDIF clocksOleksandr Suvorov
Fix working of eLCDIF block. This commit makes eLCDIF clocks to be set and work properly. Probably need to reinvestigate to find the root cause. Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
2020-02-12drm/atomic: make drm_atomic_helper_wait_for_vblanks more agressiveLucas Stach
drm_atomic_helper_setup_commit expects that flipping of previous commits has happened when it is called to set up a new commit. This can be violated by commits where userspace doesn't get a flip completion event to synchronize against i.e. legacy modesets and property changes. The expectation is that those are done by blocking commits, which wait for completion. Most drivers call drm_atomic_helper_wait_for_vblanks in the commit_tail to ensure completion, but the wait for next vblank might not actually happen if the commit didn't change any planes. Make the wait more agressive by also waiting if no planes changed. This is the minimal regression fix for the 4.15 kernel series. Long term drivers should switch away from drm_atomic_helper_wait_for_vblanks and use drm_atomic_helper_wait_for_flip_done instead. Fixes: de39bec1a0c4 ("drm/atomic: Remove waits in drm_atomic_helper_commit_cleanup_done, v2.") Signed-off-by: Lucas Stach <l.stach@pengutronix.de> Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20171129110431.6300-1-l.stach@pengutronix.de
2020-02-12drm/vblank: Allow dynamic per-crtc max_vblank_countVille Syrjälä
On i965gm we need to adjust max_vblank_count dynamically depending on whether the TV encoder is used or not. To that end add a per-crtc max_vblank_count that takes precedence over its device wide counterpart. The driver can now call drm_crtc_set_max_vblank_count() to configure the per-crtc value before calling drm_vblank_on(). Also looks like there was some discussion about exynos needing similar treatment. v2: Drop the extra max_vblank_count!=0 check for the WARN(last!=current), will take care of it in i915 code (Daniel) WARN_ON(!inmodeset) (Daniel) WARN_ON(dev->max_vblank_count) Pimp up the docs (Daniel) Cc: stable@vger.kernel.org Cc: Inki Dae <inki.dae@samsung.com> Cc: Daniel Vetter <daniel@ffwll.ch> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20181127182004.28885-1-ville.syrjala@linux.intel.com Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2020-02-12mxc: Kconfig: Fix dependancies for hdp-cecOleksandr Suvorov
It is possible to select IMX_HDP_CEC w/o CEC_CORE and MEDIA_CEC_SUPPORT that leads to following compillation errors: drivers/mxc/hdp-cec/imx-hdp-cec.c: In function ‘cec_poll_worker’: drivers/mxc/hdp-cec/imx-hdp-cec.c:187:4: error: implicit declaration of function ‘cec_transmit_done’; did you mean ‘pinctrl_init_done’? [-Werror=implicit-function-declaration] cec_transmit_done(cec->adap, CEC_TX_STATUS_OK, 0, 0, 0, ^~~~~~~~~~~~~~~~~ pinctrl_init_done drivers/mxc/hdp-cec/imx-hdp-cec.c:221:5: error: implicit declaration of function ‘cec_received_msg’; did you mean ‘free_reserved_page’? [-Werror=implicit-function-declaration] cec_received_msg(cec->adap, &cec->msg); ^~~~~~~~~~~~~~~~ free_reserved_page drivers/mxc/hdp-cec/imx-hdp-cec.c: In function ‘imx_cec_register’: drivers/mxc/hdp-cec/imx-hdp-cec.c:278:14: error: implicit declaration of function ‘cec_allocate_adapter’; did you mean ‘cec_delete_adapter’? [-Werror=implicit-function-declaration] cec->adap = cec_allocate_adapter(&imx_cec_adap_ops, cec, ^~~~~~~~~~~~~~~~~~~~ cec_delete_adapter drivers/mxc/hdp-cec/imx-hdp-cec.c:278:12: warning: assignment to ‘struct cec_adapter *’ from ‘int’ makes pointer from integer without a cast [-Wint-conversion] cec->adap = cec_allocate_adapter(&imx_cec_adap_ops, cec, ^ This change fixes dependancies/selections for IMX_HDP_CEC. Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
2020-02-12mxc: hantro: Kconfig: add COMPAT dependancyOleksandr Suvorov
Building hantro_845_h1 with undefined CONFIG_COMPAT leads to compillation error: drivers/mxc/hantro_845_h1/hx280enc.c: In function ‘hx280enc_ioctl32’: drivers/mxc/hantro_845_h1/hx280enc.c:460:23: error: implicit declaration of function ‘compat_ptr’; did you mean ‘compat_lr’? [-Werror=implicit-function-declaration] void __user *up = compat_ptr(arg); ^~~~~~~~~~ compat_lr This driver uses compat_ptr() so requires CONFIG_COMPAT to be selected. Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
2020-02-12of: irq: export symbol of_irq_count()Oleksandr Suvorov
A kernel built with CONFIG_OF_IRQ usually fails to link because of unreachable function of_irq_count(). I.e.: ERROR: "of_irq_count" [drivers/dma/fsl-edma.ko] undefined! make[1]: *** [scripts/Makefile.modpost:92: __modpost] Error 1 This change fixes such kind linking errors. Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
2020-02-12pinctrl: always include consumer.hOleksandr Suvorov
linux/pinctrl/consumer.h has stubs of functions for no PINCTRL configuration. Including this header file fixes several errors "undefined references". Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
2020-02-12gpu: imx: lcdif: Fix undefined symbolOleksandr Suvorov
Fix typo that prevents lcdif-common to compile. Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
2020-02-12ARM: dts (ds): sort iomuxc entries as downstream linux expectsPhilippe Schenker
Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
2020-02-12arm64: dts: fsl-imx8qxp-colibri: add mipi camera with nxp's v3 driverMax Krummenacher
Related to: #42565 Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
2020-02-12arm64: dts: fsl-imx8qm-apalis: mipi camera: use nxp's v3 driverMax Krummenacher
Related to: #32172 Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
2020-02-12arm64: dts: fsl-imx8qm-apalis: spi: use pio modeMax Krummenacher
If using DMA mode the chip select gets deasserted and asserted again with each word in a transmission. PIO mode on the other hand asserts at the beginning of a transmission and de-asserts at the end which for most use-cases is prefered. Related to: #51387 Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
2020-02-12arm64: dts: fsl: lpspi2: add dma mode supportMarcel Ziswiler
Follow commit 'a1204e3b0e7a dts: lpspi: add dma mode support' for lpspi2. This requires a follow up to dtbs which delete the edma0 node in favour of their own implementation. Related to: #51387 Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> (cherry picked from commit 1ff8709cc875557d3ba3c105af3be6bd6033c122) Fixed power-domain stuff after imx_4.14.98_2.3.0 resp. 4.14-2.3.x-imx merge. Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
2020-02-11(apalis|colibri)*_defconfig: make IMX_SDMA a module 2Philippe Schenker
Remove firmware kobject uevent fallback mechanism and make imx_sdma a module so it gets loaded when rootfs is mounted. This prevents the error, that firmware can't be loaded from rootfs There where some defconfigs missed in the commit with the same name before, correct that. Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
2020-02-11Video: backlight: Enable backlight in any casePhilippe Schenker
This patch enables the backlight in any case. Mainline assumes now that backlight is turned on from an appropriate driver to get flickerless backlight experience. Theres no such thing in downstream, so get rid of the code part that blocks backlight from turning on. Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
2020-02-11(apalis|colibri)*_defconfig: make IMX_SDMA a modulePhilippe Schenker
Remove firmware kobject uevent fallback mechanism and make imx_sdma a module so it gets loaded when rootfs is mounted. This prevents the error, that firmware can't be loaded from rootfs Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
2020-02-11colibri-imx6ull_defconfig: enable mwifiex_sdioMarcel Ziswiler
Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
2020-02-11arm: dts: colibri_imx7: fix gpio-keysMarcel Ziswiler
Avoid the following spew: [ 2.083946] imx7d-pinctrl 302c0000.iomuxc-lpsr: pin MX7D_PAD_GPIO1_IO01 already requested by 302c0000.iomuxc-lpsr; cannot claim for gpio-keys [ 2.099682] imx7d-pinctrl 302c0000.iomuxc-lpsr: pin-1 (gpio-keys) status -22 [ 2.108272] imx7d-pinctrl 302c0000.iomuxc-lpsr: could not request pin 1 (MX7D_PAD_GPIO1_IO01) from group gpiokeysgrp on device 302c0000.iomuxc-lpsr [ 2.124626] gpio-keys gpio-keys: Error applying setting, reverse things back [ 2.133420] gpio-keys: probe of gpio-keys failed with error -22 While at it also fix some missing new lines. Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
2020-02-11arm64: dts: fsl: colibri-imx8qxp: add initial device treeMax Krummenacher
Copied from toradex_imx_4.14.78_1.0.0_ga-bring_up. Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
2020-02-11arm64: dts: fsl: apalis-imx8qm: add initial device treeStefan Agner
Copied from toradex_imx_4.14.78_1.0.0_ga-bring_up. Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
2020-02-11ARM64: defconfig: add colibri-vf50-ts driverMax Krummenacher
The Apalis iMX8 QM module provides this touchscreen hardware. Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
2020-02-11ARM64: defconfig: add extcon_usb_gpio configMax Krummenacher
This is used with the USB_C port on Colibri iMX8X. Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
2020-02-11ARM64: defconfig: Add atmel_mxt_ts touchscreen driverPhilippe Schenker
This adds the touchscreen atmel_mxt_ts driver used by displays from toradex. Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
2020-02-11arm64: defconfig: add modversionsMax Krummenacher
CONFIG_MODVERSIONS allows to use kernel modules slightly different from the running kernel. Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
2020-02-11arm: defconfig: add spi bit banging driverMax Krummenacher
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> (cherry picked from commit fe0736d779d71237cba9f6ed5ebf6d7fdf71d9cd) (cherry picked from commit eb19205dcadee79170778136e149643b20b71b62)
2020-02-11arm: defconfig: add fxl6408 gpio expanderMax Krummenacher
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> (cherry picked from commit 13244ea064560813f3c4b67d02838930daa56fb4) (cherry picked from commit f45782b76f20f5adf3ac0b234c458846cd3704fc)
2020-02-11arm: defconfig: add lt8912 drm brigeMax Krummenacher
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> (cherry picked from commit e9656428bfa3a85c99e424785dea50628992e394) (cherry picked from commit 7cbf898f1287bec82b3a25ed47633539c61ed49c)
2020-02-11arm: defconfig: add touchcontroller ad7879Max Krummenacher
It is used on the Colibri iMX8QXP Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> (cherry picked from commit 961a35836af3e5dce034018b3e010bf3499e2f25) (cherry picked from commit 78bd4e96eaee1a103a8bd52a2568e6b033ce26ba)
2020-02-11arm64: defconfig: add SGTL5000 supportStefan Agner
Add NXP SGTL5000 codec support for Apalis iMX8. Signed-off-by: Stefan Agner <stefan.agner@toradex.com> (cherry picked from commit 1ed393a89bc808273f9653020b2fcad4d655f765) Conflicts: arch/arm64/configs/defconfig Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> (cherry picked from commit 4f8e7db9db1bac86c6c5bc2f78793ebebbd60a14) (cherry picked from commit ed7618f8085c7f02fb9d9bf8fe160ec0025671f4) (cherry picked from commit 52ae1fefc8794d41ac7544fc22028ac9a04a6424)
2020-02-11arm64: defconfig: add M41T0 RTC supportStefan Agner
Add DS1307 family RTC support which also supports M41T0 RTC as used on our carrier board. Signed-off-by: Stefan Agner <stefan.agner@toradex.com> (cherry picked from commit d6ec2d954abbdf639cbb435c89cad71775e24795) (cherry picked from commit a8fa55ea007eb29f8f18fc86cbab3bab0d45a90f) (cherry picked from commit baf09ae0654769311a390382f22d64d195c4b167) (cherry picked from commit 32df0ec733ee19740f2075c4501291febd722505)
2020-02-11add configs required by Toradex Easy InstallerStefan Agner
Signed-off-by: Stefan Agner <stefan.agner@toradex.com> (cherry picked from commit 944f626fab84a4457f36ec11270fd243f8d80edf) Conflicts: arch/arm64/configs/defconfig Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> (cherry picked from commit 75b89c90ac9c3a3b1374354cd3cc1aaa70cea0f0) (cherry picked from commit 6efcd53a6bd3d4f437f4fd2362dab9685863e639) (cherry picked from commit ff5f17d53273a644b2c8d76fbd495d9d2eb6e21b)
2020-02-11arm64: defconfig: add configs for BluetoothStefan Agner
Add Marvell/USB Bluetooth support. Signed-off-by: Stefan Agner <stefan.agner@toradex.com> (cherry picked from commit 9fe8e87ad955c087d2fa6a35fda3287aa5dccbd7) Conflicts: arch/arm64/configs/defconfig Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> (cherry picked from commit 9bd23adac54773bfd2ed02d577667053cc61dd74) (cherry picked from commit 9380becfb11a1cb2502c7938a19b84785735b9a9) (cherry picked from commit f17e33d650885310866b300c578a3f4d31d5332f)
2020-02-11arm64: defconfig: add Marvell Wi-Fi supportStefan Agner
Add Marvell Wi-Fi support using the mwifiex driver. Signed-off-by: Stefan Agner <stefan.agner@toradex.com> (cherry picked from commit acc1f6790a86f38398da46bc30908c8e8e2c0757) Conflicts: arch/arm64/configs/defconfig Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> (cherry picked from commit 734a9127e49ce3592b804afb8379f8fa1fc41c9e) (cherry picked from commit 0a3eeddc6bcf29d9ceacb4838bf26eeb1af36095) (cherry picked from commit a7eac7df03d30f66f6b5f855727f0f1a2d4666f2)
2020-02-11arm64: defconfig: add configs for Apalis iMX8Stefan Agner
Add GPIO fan/backlight for Apalis iMX8. Enable USB camera support. Also enable configs relevant for MIPI CSI2 camera (OV5640) support, but this needs further changes to the driver to work with i.MX8QM. Signed-off-by: Stefan Agner <stefan.agner@toradex.com> (cherry picked from commit 6a74107935a0d4a3a7cebf879a1ae684366bec19) Conflicts: arch/arm64/configs/defconfig Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> (cherry picked from commit 471a0d336d637ed1c66c96d10a9f998d0cafc510) (cherry picked from commit 153848b2e63330fe38315f22baac7817e77f1d00) (cherry picked from commit 3fb7df4524c6ef6002a940c12ecee199832d321a)
2020-02-11drm/bridge: nwl-dsi: support probe deferralMarcel Ziswiler
Properly support probe deferral e.g. in case I2C is behind an I2C switch as is the case for our new DSI to HDMI Adapter V1.1A. Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
2020-02-11lt8912: properly reserve i2c sub addressesMarcel Ziswiler
Properly reserve I2C sub addresses as well. Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
2020-02-11usb: chipidea: Fix enum name conflictOleksandr Suvorov
This fixes a compilation error: CC drivers/rtc/rtc-lib.o In file included from drivers/phy/ti/phy-omap-usb2.c:30:0: ./include/linux/phy/omap_control_phy.h:46:2: error: redeclaration of enumerator ‘USB_MODE_HOST’ USB_MODE_HOST, ^~~~~~~~~~~~~ In file included from ./include/linux/usb/otg.h:14:0, from ./include/linux/phy/omap_usb.h:23, from drivers/phy/ti/phy-omap-usb2.c:24: ./include/linux/usb/phy.h:69:2: note: previous definition of ‘USB_MODE_HOST’ was here USB_MODE_HOST, ^~~~~~~~~~~~~ In file included from drivers/phy/ti/phy-omap-usb2.c:30:0: ./include/linux/phy/omap_control_phy.h:47:2: error: redeclaration of enumerator ‘USB_MODE_DEVICE’ USB_MODE_DEVICE, ^~~~~~~~~~~~~~~ In file included from ./include/linux/usb/otg.h:14:0, from ./include/linux/phy/omap_usb.h:23, from drivers/phy/ti/phy-omap-usb2.c:24: ./include/linux/usb/phy.h:70:2: note: previous definition of ‘USB_MODE_DEVICE’ was here USB_MODE_DEVICE, ^~~~~~~~~~~~~~~ make[3]: *** [scripts/Makefile.build:328: drivers/phy/ti/phy-omap-usb2.o] Error 1 AR drivers/pps/clients/built-in.o make[2]: *** [scripts/Makefile.build:587: drivers/phy/ti] Error 2 make[1]: *** [scripts/Makefile.build:587: drivers/phy] Error 2 make[1]: *** Waiting for unfinished jobs.... CC drivers/rtc/hctosys.o Related to: #50570 Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>