summaryrefslogtreecommitdiff
path: root/arch/arm
AgeCommit message (Collapse)Author
2019-08-26ARM: dts: imx6q: follow addition of sata_ext clkColibri-iMX8X_Console-Image_3.0b2.65-20190830Colibri-iMX7_Console-Image_3.0b2.65-20190830Colibri-iMX6_Console-Image_3.0b2.65-20190830Colibri-iMX6ULL_Console-Image_3.0b2.65-20190830Apalis-iMX8_Console-Image_3.0b2.65-20190830Apalis-iMX6_Console-Image_3.0b2.65-20190830Max Krummenacher
Commit f014b5b3b3ab added an additional clock to ahci_imx.c used on i.MX8. Add a dummy clock to imx6q.dtsi so that i.MX6 which doesn't need the clock the driver keeps working. Fixes: [ 2.053942] ahci-imx 2200000.sata: can't get sata_ext clock. [ 2.053962] ahci-imx: probe of 2200000.sata failed with error -2 Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
2019-08-25bpf: get rid of pure_initcall dependency to enable jitsDaniel Borkmann
commit fa9dd599b4dae841924b022768354cfde9affecb upstream. Having a pure_initcall() callback just to permanently enable BPF JITs under CONFIG_BPF_JIT_ALWAYS_ON is unnecessary and could leave a small race window in future where JIT is still disabled on boot. Since we know about the setting at compilation time anyway, just initialize it properly there. Also consolidate all the individual bpf_jit_enable variables into a single one and move them under one location. Moreover, don't allow for setting unspecified garbage values on them. Signed-off-by: Daniel Borkmann <daniel@iogearbox.net> Acked-by: Alexei Starovoitov <ast@kernel.org> Signed-off-by: Alexei Starovoitov <ast@kernel.org> [bwh: Backported to 4.14 as dependency of commit 2e4a30983b0f "bpf: restrict access to core bpf sysctls": - Adjust context] Signed-off-by: Ben Hutchings <ben.hutchings@codethink.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2019-08-20ARM: dts: imx6ull-colibri: add group to iomuxc to suppress warningPhilippe Schenker
Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
2019-08-20ARM: dts: imx6-ixora: fix missing includesPhilippe Schenker
Fixes: commit: 5d2a26667010640e33ca0a52c73310f158179711 Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
2019-08-20ARM: dts: (apalis|colibri): unify backlight settingsPhilippe Schenker
This commit unifys the backlight settings. All displays sold by Toradex are now supporting 150Hz as a PWM backlight typical frequency. Use this value for all SoM's and put also some better default values for different brightness. Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
2019-08-16ARM: davinci: fix sleep.S build error on ARMv4Arnd Bergmann
[ Upstream commit d64b212ea960db4276a1d8372bd98cb861dfcbb0 ] When building a multiplatform kernel that includes armv4 support, the default target CPU does not support the blx instruction, which leads to a build failure: arch/arm/mach-davinci/sleep.S: Assembler messages: arch/arm/mach-davinci/sleep.S:56: Error: selected processor does not support `blx ip' in ARM mode Add a .arch statement in the sources to make this file build. Link: https://lore.kernel.org/r/20190722145211.1154785-1-arnd@arndb.de Acked-by: Sekhar Nori <nsekhar@ti.com> Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Olof Johansson <olof@lixom.net> Signed-off-by: Sasha Levin <sashal@kernel.org>
2019-08-15ARM: dts: toradex: fix i2c gpios flagsOleksandr Suvorov
According to manual of I2C bus, both signals sda/scl are "open drain". Fix flags for all affected Toradex boards. Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
2019-08-12arm: dts: colibri_imx7: fix flags for gpio signals of i2cOleksandr Suvorov
scl-gpios should be (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN) since commit d2d0ad2aec4a ("i2c: imx: use open drain for recovery GPIO") Fix on-boot warning: "enforced open drain please flag it properly in DT/ACPI DSDT/board file" Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
2019-08-09ARM: dts: Add pinmuxing for i2c2 and i2c3 for LogicPD torpedoAdam Ford
[ Upstream commit a135a392acbec7ecda782981788e8c03767a1571 ] Since I2C1 and I2C4 have explicit pinmuxing set, let's be on the safe side and set the pin muxing for I2C2 and I2C3. Signed-off-by: Adam Ford <aford173@gmail.com> Signed-off-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
2019-08-09ARM: dts: Add pinmuxing for i2c2 and i2c3 for LogicPD SOM-LVAdam Ford
[ Upstream commit 5fe3c0fa0d54877c65e7c9b4442aeeb25cdf469a ] Since I2C1 and I2C4 have explicit pinmuxing set, let's be on the safe side and set the pin muxing for I2C2 and I2C3. Signed-off-by: Adam Ford <aford173@gmail.com> Signed-off-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
2019-08-06ARM: dts: rockchip: Mark that the rk3288 timer might stop in suspendDouglas Anderson
[ Upstream commit 8ef1ba39a9fa53d2205e633bc9b21840a275908e ] This is similar to commit e6186820a745 ("arm64: dts: rockchip: Arch counter doesn't tick in system suspend"). Specifically on the rk3288 it can be seen that the timer stops ticking in suspend if we end up running through the "osc_disable" path in rk3288_slp_mode_set(). In that path the 24 MHz clock will turn off and the timer stops. To test this, I ran this on a Chrome OS filesystem: before=$(date); \ suspend_stress_test -c1 --suspend_min=30 --suspend_max=31; \ echo ${before}; date ...and I found that unless I plug in a device that requests USB wakeup to be active that the two calls to "date" would show that fewer than 30 seconds passed. NOTE: deep suspend (where the 24 MHz clock gets disabled) isn't supported yet on upstream Linux so this was tested on a downstream kernel. Signed-off-by: Douglas Anderson <dianders@chromium.org> Signed-off-by: Heiko Stuebner <heiko@sntech.de> Signed-off-by: Sasha Levin <sashal@kernel.org>
2019-08-06ARM: dts: rockchip: Make rk3288-veyron-mickey's emmc work againDouglas Anderson
[ Upstream commit 99fa066710f75f18f4d9a5bc5f6a711968a581d5 ] When I try to boot rk3288-veyron-mickey I totally fail to make the eMMC work. Specifically my logs (on Chrome OS 4.19): mmc_host mmc1: card is non-removable. mmc_host mmc1: Bus speed (slot 0) = 400000Hz (slot req 400000Hz, actual 400000HZ div = 0) mmc_host mmc1: Bus speed (slot 0) = 50000000Hz (slot req 52000000Hz, actual 50000000HZ div = 0) mmc1: switch to bus width 8 failed mmc1: switch to bus width 4 failed mmc1: new high speed MMC card at address 0001 mmcblk1: mmc1:0001 HAG2e 14.7 GiB mmcblk1boot0: mmc1:0001 HAG2e partition 1 4.00 MiB mmcblk1boot1: mmc1:0001 HAG2e partition 2 4.00 MiB mmcblk1rpmb: mmc1:0001 HAG2e partition 3 4.00 MiB, chardev (243:0) mmc_host mmc1: Bus speed (slot 0) = 400000Hz (slot req 400000Hz, actual 400000HZ div = 0) mmc_host mmc1: Bus speed (slot 0) = 50000000Hz (slot req 52000000Hz, actual 50000000HZ div = 0) mmc1: switch to bus width 8 failed mmc1: switch to bus width 4 failed mmc1: tried to HW reset card, got error -110 mmcblk1: error -110 requesting status mmcblk1: recovery failed! print_req_error: I/O error, dev mmcblk1, sector 0 ... When I remove the '/delete-property/mmc-hs200-1_8v' then everything is hunky dory. That line comes from the original submission of the mickey dts upstream, so presumably at the time the HS200 was failing and just enumerating things as a high speed device was fine. ...or maybe it's just that some mickey devices work when enumerating at "high speed", just not mine? In any case, hs200 seems good now. Let's turn it on. Signed-off-by: Douglas Anderson <dianders@chromium.org> Signed-off-by: Heiko Stuebner <heiko@sntech.de> Signed-off-by: Sasha Levin <sashal@kernel.org>
2019-08-06ARM: dts: rockchip: Make rk3288-veyron-minnie run at hs200Douglas Anderson
[ Upstream commit 1c0479023412ab7834f2e98b796eb0d8c627cd62 ] As some point hs200 was failing on rk3288-veyron-minnie. See commit 984926781122 ("ARM: dts: rockchip: temporarily remove emmc hs200 speed from rk3288 minnie"). Although I didn't track down exactly when it started working, it seems to work OK now, so let's turn it back on. To test this, I booted from SD card and then used this script to stress the enumeration process after fixing a memory leak [1]: cd /sys/bus/platform/drivers/dwmmc_rockchip for i in $(seq 1 3000); do echo "========================" $i echo ff0f0000.dwmmc > unbind sleep .5 echo ff0f0000.dwmmc > bind while true; do if [ -e /dev/mmcblk2 ]; then break; fi sleep .1 done done It worked fine. [1] https://lkml.kernel.org/r/20190503233526.226272-1-dianders@chromium.org Signed-off-by: Douglas Anderson <dianders@chromium.org> Signed-off-by: Heiko Stuebner <heiko@sntech.de> Signed-off-by: Sasha Levin <sashal@kernel.org>
2019-08-06ARM: riscpc: fix DMARussell King
[ Upstream commit ffd9a1ba9fdb7f2bd1d1ad9b9243d34e96756ba2 ] DMA got broken a while back in two different ways: 1) a change in the behaviour of disable_irq() to wait for the interrupt to finish executing causes us to deadlock at the end of DMA. 2) a change to avoid modifying the scatterlist left the first transfer uninitialised. DMA is only used with expansion cards, so has gone unnoticed. Fixes: fa4e99899932 ("[ARM] dma: RiscPC: don't modify DMA SG entries") Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> Signed-off-by: Sasha Levin <sashal@kernel.org>
2019-07-21ARM: dts: imx6ul: fix PWM[1-4] interruptsSébastien Szymanski
[ Upstream commit 3cf10132ac8d536565f2c02f60a3aeb315863a52 ] According to the i.MX6UL/L RM, table 3.1 "ARM Cortex A7 domain interrupt summary", the interrupts for the PWM[1-4] go from 83 to 86. Fixes: b9901fe84f02 ("ARM: dts: imx6ul: add pwm[1-4] nodes") Signed-off-by: Sébastien Szymanski <sebastien.szymanski@armadeus.com> Reviewed-by: Fabio Estevam <festevam@gmail.com> Signed-off-by: Shawn Guo <shawnguo@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
2019-07-21ARM: omap2: remove incorrect __init annotationArnd Bergmann
[ Upstream commit 27e23d8975270df6999f8b5b3156fc0c04927451 ] omap3xxx_prm_enable_io_wakeup() is marked __init, but its caller is not, so we get a warning with clang-8: WARNING: vmlinux.o(.text+0x343c8): Section mismatch in reference from the function omap3xxx_prm_late_init() to the function .init.text:omap3xxx_prm_enable_io_wakeup() The function omap3xxx_prm_late_init() references the function __init omap3xxx_prm_enable_io_wakeup(). This is often because omap3xxx_prm_late_init lacks a __init annotation or the annotation of omap3xxx_prm_enable_io_wakeup is wrong. When building with gcc, omap3xxx_prm_enable_io_wakeup() is always inlined, so we never noticed in the past. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Reviewed-by: Nathan Chancellor <natechancellor@gmail.com> Acked-by: Tony Lindgren <tony@atomide.com> Reviewed-by: Andrew Murray <andrew.murray@arm.com> Signed-off-by: Olof Johansson <olof@lixom.net> Signed-off-by: Sasha Levin <sashal@kernel.org>
2019-07-21ARM: davinci: da8xx: specify dma_coherent_mask for lcdcBartosz Golaszewski
[ Upstream commit 68f2515bb31a664ba3e2bc1eb78dd9f529b10067 ] The lcdc device is missing the dma_coherent_mask definition causing the following warning on da850-evm: da8xx_lcdc da8xx_lcdc.0: found Sharp_LK043T1DG01 panel ------------[ cut here ]------------ WARNING: CPU: 0 PID: 1 at kernel/dma/mapping.c:247 dma_alloc_attrs+0xc8/0x110 Modules linked in: CPU: 0 PID: 1 Comm: swapper Not tainted 5.2.0-rc3-00077-g16d72dd4891f #18 Hardware name: DaVinci DA850/OMAP-L138/AM18x EVM [<c000fce8>] (unwind_backtrace) from [<c000d900>] (show_stack+0x10/0x14) [<c000d900>] (show_stack) from [<c001a4f8>] (__warn+0xec/0x114) [<c001a4f8>] (__warn) from [<c001a634>] (warn_slowpath_null+0x3c/0x48) [<c001a634>] (warn_slowpath_null) from [<c0065860>] (dma_alloc_attrs+0xc8/0x110) [<c0065860>] (dma_alloc_attrs) from [<c02820f8>] (fb_probe+0x228/0x5a8) [<c02820f8>] (fb_probe) from [<c02d3e9c>] (platform_drv_probe+0x48/0x9c) [<c02d3e9c>] (platform_drv_probe) from [<c02d221c>] (really_probe+0x1d8/0x2d4) [<c02d221c>] (really_probe) from [<c02d2474>] (driver_probe_device+0x5c/0x168) [<c02d2474>] (driver_probe_device) from [<c02d2728>] (device_driver_attach+0x58/0x60) [<c02d2728>] (device_driver_attach) from [<c02d27b0>] (__driver_attach+0x80/0xbc) [<c02d27b0>] (__driver_attach) from [<c02d047c>] (bus_for_each_dev+0x64/0xb4) [<c02d047c>] (bus_for_each_dev) from [<c02d1590>] (bus_add_driver+0xe4/0x1d8) [<c02d1590>] (bus_add_driver) from [<c02d301c>] (driver_register+0x78/0x10c) [<c02d301c>] (driver_register) from [<c000a5c0>] (do_one_initcall+0x48/0x1bc) [<c000a5c0>] (do_one_initcall) from [<c05cae6c>] (kernel_init_freeable+0x10c/0x1d8) [<c05cae6c>] (kernel_init_freeable) from [<c048a000>] (kernel_init+0x8/0xf4) [<c048a000>] (kernel_init) from [<c00090e0>] (ret_from_fork+0x14/0x34) Exception stack(0xc6837fb0 to 0xc6837ff8) 7fa0: 00000000 00000000 00000000 00000000 7fc0: 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 7fe0: 00000000 00000000 00000000 00000000 00000013 00000000 ---[ end trace 8a8073511be81dd2 ]--- Add a 32-bit mask to the platform device's definition. Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com> Signed-off-by: Sekhar Nori <nsekhar@ti.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
2019-07-21ARM: davinci: da850-evm: call regulator_has_full_constraints()Bartosz Golaszewski
[ Upstream commit 0c0c9b5753cd04601b17de09da1ed2885a3b42fe ] The BB expander at 0x21 i2c bus 1 fails to probe on da850-evm because the board doesn't set has_full_constraints to true in the regulator API. Call regulator_has_full_constraints() at the end of board registration just like we do in da850-lcdk and da830-evm. Reviewed-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com> Signed-off-by: Sekhar Nori <nsekhar@ti.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
2019-07-21ARM: dts: am335x phytec boards: Fix cd-gpios active levelTeresa Remmet
[ Upstream commit 8a0098c05a272c9a68f6885e09755755b612459c ] Active level of the mmc1 cd gpio needs to be low instead of high. Fix PCM-953 and phyBOARD-WEGA. Signed-off-by: Teresa Remmet <t.remmet@phytec.de> Signed-off-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
2019-07-15cache-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>
2019-07-15ARM: dts: Add initial Iris devicetreesPhilippe Schenker
Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
2019-07-12Merge tag 'v4.14.126' into 4.14-2.0.x-imxMax Krummenacher
This is the 4.14.126 stable release Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> Conflicts: drivers/gpio/gpio-vf610.c: Follow commit 338aa10750ba gpio: vf610: Do not share irq_chip drivers/gpu/drm/bridge/adv7511/adv7511_drv.c: Follow commit 67793bd3b394 drm/bridge: adv7511: Fix low refresh rate selection Use drm_mode_vrefresh(mode) helper drivers/net/ethernet/freescale/fec_main.c: Keep downstream file. drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c Follow commit 46953f97224d brcmfmac: fix missing checks for kmemdup sound/soc/fsl/Kconfig: Follow commit ea751227c813 ASoC: imx: fix fiq dependencies Logical Conflicts: sound/soc/fsl/fsl_sai.c: Revert upstream d7325abe29b as downstream fixed it differently drivers/clk/imx/clk-imx6sl.c Revert upstream bda9f846ae0 as downstream implemented it differently 68c736e9378
2019-07-09ARM: 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>
2019-07-09ARM: 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>
2019-07-05ARM: dts (ds): sort iomuxc entries as downstream linux expectsPhilippe Schenker
Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
2019-07-03(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>
2019-07-02(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>
2019-06-25ARM: dts: am57xx-idk: Remove support for voltage switching for SD cardFaiz Abbas
commit 88a748419b84187fd1da05637b8e5928b04a1e06 upstream. If UHS speed modes are enabled, a compatible SD card switches down to 1.8V during enumeration. If after this a software reboot/crash takes place and on-chip ROM tries to enumerate the SD card, the difference in IO voltages (host @ 3.3V and card @ 1.8V) may end up damaging the card. The fix for this is to have support for power cycling the card in hardware (with a PORz/soft-reset line causing a power cycle of the card). Since am571x-, am572x- and am574x-idk don't have this capability, disable voltage switching for these boards. The major effect of this is that the maximum supported speed mode is now high speed(50 MHz) down from SDR104(200 MHz). Cc: <stable@vger.kernel.org> Signed-off-by: Faiz Abbas <faiz_abbas@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2019-06-25ARM: imx: cpuidle-imx6sx: Restrict the SW2ISO increase to i.MX6SXFabio Estevam
commit b25af2ff7c07bd19af74e3f64ff82e2880d13d81 upstream. Since commit 1e434b703248 ("ARM: imx: update the cpu power up timing setting on i.mx6sx") some characters loss is noticed on i.MX6ULL UART as reported by Christoph Niedermaier. The intention of such commit was to increase the SW2ISO field for i.MX6SX only, but since cpuidle-imx6sx is also used on i.MX6UL/i.MX6ULL this caused unintended side effects on other SoCs. Fix this problem by keeping the original SW2ISO value for i.MX6UL/i.MX6ULL and only increase SW2ISO in the i.MX6SX case. Cc: stable@vger.kernel.org Fixes: 1e434b703248 ("ARM: imx: update the cpu power up timing setting on i.mx6sx") Reported-by: Christoph Niedermaier <cniedermaier@dh-electronics.com> Signed-off-by: Fabio Estevam <festevam@gmail.com> Tested-by: Sébastien Szymanski <sebastien.szymanski@armadeus.com> Tested-by: Christoph Niedermaier <cniedermaier@dh-electronics.com> Signed-off-by: Shawn Guo <shawnguo@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2019-06-21colibri-imx6ull_defconfig: enable mwifiex_sdioMarcel Ziswiler
Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
2019-06-21arm: 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>
2019-06-21ARM: dts: apalis_imx6: further clean-upMarcel Ziswiler
Further clean-up Apalis iMX6 device trees. Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
2019-06-21(apalis|colibri)*_defconfig: Add new defconfigs for 4.14 kernelPhilippe Schenker
No options where added or removed in this commit. A simple make (apalis|colibri)*_defconfig make savedefconfig cp defconfig arch/arm/boot/(apalis|colibri)*_defconfig Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
2019-06-21ARM: dts: imx6ull-colibri-aster: Follow pinctrl naming from mainlineMax Krummenacher
While at it, add the dtbs for Aster Carrier Board to the Makefile. Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
2019-06-21ARM: dts: imx6ull-colibri: add missing #endifMax Krummenacher
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
2019-06-18ARM: dts (ds): imx6ull*colibri*: Merge changes from 4.9-2.3.x-imx-nextPhilippe Schenker
In 4.14 devicetress are based on the mainline DT's and only necessary stuff for downstream is put into those devicetrees. This commit holds the changes for imx6ull*colibri* from 4.9. Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
2019-06-18ARM: dts (ds): imx6: Merge changes from toradex_4.9-2.3.x-imx-nextPhilippe Schenker
In 4.14 devicetress are based on the mainline DT's and only necessary stuff for downstream is put into those devicetrees. This commit holds the changes for imx6*(colibri|apalis)* from 4.9. Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
2019-06-18ARM: dts: apalis-imx6: Add mipi_csi nodePhilippe Schenker
This commit adds the mipi_csi node to Toradex's evalboard as found on the mezzanine connector Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
2019-06-18ARM: dts: apalis-imx6: Add some example I2C devicesPhilippe Schenker
Those devices are used in conjunction with Toradex's carrier boards. Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
2019-06-18ARM: dts: colibri-imx6: Add missing pinmuxing to Toradex eval boardPhilippe Schenker
Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
2019-06-18ARM: dts: imx6: Add touchscreens used on Toradex eval boardsPhilippe Schenker
This commit adds the touchscreens from Toradex so one can enable it. Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
2019-06-18ARM: dts: add recovery mode for all I2C busesOleksandr Suvorov
- fix the name of pinctrl set for i2c2 recovery mode; - add recovery mode for applicable i2c buses for Apalis/Colibri iMX6Q/D/DL modules. Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com> Related to: #49059 (cherry picked from commit 1501883b4682178e38afc3f08b221f9477fcd7ae)
2019-06-18ARM: dts: imx6: Add sleep state to can interfacesPhilippe Schenker
This patch prepares the devicetree for the new Ixora V1.2 where we are able to turn off the supply of the can transceiver. This implies to use a sleep state on transmission pins in order to prevent backfeeding. Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com> (cherry picked from commit c1016f5da0dbb8291575949e7f4a417c6306d70a)
2019-06-18ARM: dts: imx6qdl-colibri.dtsi: UHS-I support for v1.1a hwIgor Opaniuk
Provide proper configuration for VGEN3, to make sure it's is always powered which allows that rail to be automatically switched to 1.8 volts for proper UHS-I operation. By default it's disabled. With UHS-I enabled: [ 104.153898] mmc1: new ultra high speed SDR104 SDHC card at address 59b4 [ 104.166202] mmcblk1: mmc1:59b4 USD00 15.0 GiB [ 104.173923] mmcblk1: p1 root@colibri-imx6:~# hdparm -t /dev/mmcblk1 /dev/mmcblk1: Timing buffered disk reads: 226 MB in 3.01 seconds = 75.01 MB/sec Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com> (cherry-picked from 7ffa92d64cc7a6331faaae3e2507458461ab90f3)
2019-06-18ARM: dts: imx6qdl-colibri: add phy to fecPhilippe Schenker
Add the phy-node and mdio bus to the fec-node, represented as is on hardware. This commit includes micrel,led-mode that is set to the default value, prepared for someone who wants to change this. Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com> (cherry-picked from 03ff3610434d89fc8e20b280e1219ce0ebb08935)
2019-06-18ARM: dts: imx6qdl-colibri: Add missing pin declaration in iomuxcPhilippe Schenker
This adds the muxing for the optional pins usb-oc (overcurrent) and usb-id. Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
2019-06-18ARM: dts: imx6q: correct SDMA script type for spi5Oleksandr Suvorov
Commit 41ec065fc5841 fixes ecspi sdma script type for spi1-4 only. Commit df07101e1c4a2 sets wrong type of sdma script for SPI5. The workaroud sdma script NOT work in SPBA bus, so return back the correct sdma script type for spi5. Related to: #48675 Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com> (cherry picked from commit bbe2052f145e8afbebc46d47a439f72250998539)
2019-06-18ARM: dts: imx6qdl: Fix SPDIF regressionFabio Estevam
Commit 833f2cbf7091 ("ARM: dts: imx6: change the core clock of spdif") changed many more clocks than only the SPDIF core clock as stated in the commit message. The MLB clock has been added and this causes SPDIF regression as reported by Xavi Drudis Ferran and also in this forum post: https://forum.digikey.com/thread/34240 The MX6Q Reference Manual does not mention that MLB is a clock related to SPDIF, so change it back to a dummy clock to restore SPDIF functionality. Thanks to Ambika for providing the fix at: https://community.nxp.com/thread/387131 Fixes: 833f2cbf7091 ("ARM: dts: imx6: change the core clock of spdif") Cc: <stable@vger.kernel.org> # 4.4.x Reported-by: Xavi Drudis Ferran <xdrudis@tinet.cat> Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com> Tested-by: Xavi Drudis Ferran <xdrudis@tinet.cat> Signed-off-by: Shawn Guo <shawnguo@kernel.org> (cherry picked from commit f065e9e4addd75c21bb976bb2558648bf4f61de6) This fix was correct, but overwritten by commit 833f2cbf7091099baee28136dc68678e974c0ac5. MLB (Media Local Bus) Clock is in fact not related to SPDIF according to the MX6Q Reference Manual. Tested playback and record on pulseaudio with 44.1kHz samples. Signed-off-by: Gerard Salvatella <gerard.salvatella@toradex.com> Acked-by: Max Krummenacher <max.krummenacher@toradex.com> (cherry picked from commit 58e5313d36b969029d76b1ef45d3224c8557af75)
2019-06-18arm: dts: apalis/colibri qdl: add 3rd pwm parameter to specify pos. neg. logicMax Krummenacher
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> (cherry picked from commit d1c393ddcb6937b58fa3a9314c8b6f2382b346dc) (cherry picked from commit a9dc775e6796488a3de676e1736d88560d181138)
2019-06-18ARM: dts: apalis/colibri-imx6: Get missing devicetrees from 4.9Philippe Schenker
Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>