summaryrefslogtreecommitdiff
path: root/arch/arm
AgeCommit message (Collapse)Author
2020-02-12ARM: dts: imx6ull-colibri: rename vqmmc regulatorMax Krummenacher
Cosmetic change: Rename the reg_sd1_vmmc to reg_sd1_vqmmc as it is used for vqmmc. Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
2020-02-12ARM: dts: imx6ull-colibri: use mmc sleep state alwaysMax Krummenacher
The mmc pins sleep state has been added for the UHS1 speed case only, add it also to the regular case. Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
2020-02-12ARM: dts: imx6ull-colibri: fix vqmmc regulatorMax Krummenacher
The correct spelling for the property is gpios, otherwise the regulator will neither reserve nor control any gpio(s). Thus any SD/MMC card which can use UHS 1 modes will fail. Related-to: #46566 Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
2020-02-12ARM: dts: imx6q: follow addition of sata_ext clkMax 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>
2020-02-12ARM: dts: imx6ull-colibri: add group to iomuxc to suppress warningPhilippe Schenker
Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
2020-02-12ARM: dts: imx6-ixora: fix missing includesPhilippe Schenker
Fixes: commit: 5d2a26667010640e33ca0a52c73310f158179711 Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
2020-02-12ARM: 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>
2020-02-12ARM: 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>
2020-02-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>
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-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-12ARM: dts (ds): sort iomuxc entries as downstream linux expectsPhilippe Schenker
Signed-off-by: Philippe Schenker <philippe.schenker@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-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-09ARM: dts: apalis_imx6: further clean-upMarcel Ziswiler
Further clean-up Apalis iMX6 device trees. Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
2020-02-09(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>
2020-02-09ARM: 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>
2020-02-09ARM: dts: imx6ull-colibri: add missing #endifMax Krummenacher
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
2020-02-09ARM: 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>
2020-02-09ARM: 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>
2020-02-09ARM: 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>
2020-02-09ARM: 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>
2020-02-09ARM: dts: colibri-imx6: Add missing pinmuxing to Toradex eval boardPhilippe Schenker
Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
2020-02-09ARM: 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>
2020-02-09ARM: 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)
2020-02-09ARM: 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)
2020-02-09ARM: 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)
2020-02-09ARM: 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)
2020-02-09ARM: 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>
2020-02-09arm: 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)
2020-02-09ARM: dts: apalis/colibri-imx6: Get missing devicetrees from 4.9Philippe Schenker
Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
2020-02-09ARM: dts: imx6ull-colibri: Add touchscreens used with Eval BoardPhilippe Schenker
Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
2020-02-09ARM: dts: imx6ull-colibri: Add general wakeup key used on ColibriPhilippe Schenker
Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
2020-02-09ARM: dts: imx6ull-colibri: reduce v_batt current in power offMax Krummenacher
Reduce the current drawn from VCC_BATT when the main power on the 3V3 pins to the module are switched off. This switches off SoC internal pull resistors which are provided on the module for TAMPER7 and TAMPER9 SoC pin and switches on a pull down instead of a pullup for the USBC_DET module pin (TAMPER2). Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> (cherry picked from commit 9fd59b6eebd12106b5b53fc56466bcd89b9a7ee9) Conflicts: arch/arm/boot/dts/imx6ull-colibri.dtsi Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
2020-02-09ARM: dts: imx6ull-colibri: Add watchdogPhilippe Schenker
This patch adds the watchdog to the imx6ull-colibri devicetree Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
2020-02-09ARM: dts: imx6ull: improve can templatesMax Krummenacher
Add the pinmuxing and a inactive node for flexcan1 on SODIMM 55/63 and move the inactive flexcan modes to imx6ull-colibri-eval-v3.dtsi where they belong. Note that this commit does not enable flexcan functionality, but rather eases the effort needed to do so. Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> (cherry picked from commit 983ff8a6b61e9466beb6b4781fb370a6a7da937a) Conflicts: arch/arm/boot/dts/imx6ull-colibri-nonwifi.dtsi arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi arch/arm/boot/dts/imx6ull-colibri.dtsi Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com
2020-02-09ARM: dts: imx6ull-colibri: Add sleep mode to fecPhilippe Schenker
Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com> Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> (cherry picked from commit a6f40c3a1d659467267a9d16355c788524bc5ca7) Conflicts: arch/arm/boot/dts/imx6ull-colibri.dtsi Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
2020-02-09ARM: dts: imx6ull-colibri: change touch i2c parametersMax Krummenacher
Switch on 22 kOhm pull ups and lower the I2C frequency to around 40kHz to get a more reliable communication. Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
2020-02-09ARM: dts (ds): imx6ull: fix pwm clockMax Krummenacher
All PWM clock instances have their clock gate. Add these consistently. Fixes freezing the kernel when one of these instances is used with IMX6UL_CLK_DUMMY as its clock source. Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> Signed-off-by: Stefan Agner <stefan.agner@toradex.com> (cherry picked from commit cd5d7ba49df7918732915a31bfc0f72827bebc2c) (cherry picked from commit c6306e84601b15ee0152625757aab942fa2f2d28)
2020-02-09ARM: dts (ds): imx6ull: include all needed definitionsMax Krummenacher
The file uses linux,keycode = <KEY_POWER>;, so include the header which defines KEY_POWER. Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> Signed-off-by: Stefan Agner <stefan.agner@toradex.com> (cherry picked from commit 479e0bae1ddfe3ec527634c241fadae558966323) (cherry picked from commit b8a957b9613a597123f2eb6cd562191362fb153d)
2020-02-09ARM: dts (ds): imx6ull: add support for PWM polarity controlMax Krummenacher
Update #pwm-cells to 3 in order to support PWM signal polarity control. Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> Acked-by: Stefan Agner <stefan.agner@toradex.com> (cherry picked from commit 6863695b931ae31fe20171e75cf8a57c990873be) (cherry picked from commit 3465c49c05258f88ad0584bac8cc6e30d9d1d3a8)
2020-02-09ARM: dts: imx6ull: Add Aster devicetrees from 4.9Philippe Schenker
Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
2020-02-09ARM: dts: imx6: Pass memory unit-adressFabio Estevam
Pass the memory unit-adress to fix the following build warnings with W=1: Warning (unit_address_vs_reg): Node /memory has a reg or ranges property, but no unit name There are cases where dts passes an empty memory node, which will be filled by the bootloader. Passing the memory base address still allows the bootloader to fill the memory size. Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com> Acked-By: Lothar Waßmann <LW@KARO-electronics.de> Signed-off-by: Shawn Guo <shawnguo@kernel.org> (cherry picked from commit edc05819786fd5eee330b89bd5892dad1199effc) Conflicts: arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts arch/arm/boot/dts/imx6dl-dfi-fs700-m60.dts arch/arm/boot/dts/imx6dl-ts4900.dts arch/arm/boot/dts/imx6dl-ts7970.dts arch/arm/boot/dts/imx6q-dfi-fs700-m60.dts arch/arm/boot/dts/imx6q-h100.dts arch/arm/boot/dts/imx6q-novena.dts arch/arm/boot/dts/imx6q-ts4900.dts arch/arm/boot/dts/imx6q-ts7970.dts arch/arm/boot/dts/imx6q-zii-rdu2.dts arch/arm/boot/dts/imx6qdl-apalis.dtsi arch/arm/boot/dts/imx6qdl-cubox-i.dtsi arch/arm/boot/dts/imx6qdl-hummingboard.dtsi arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi arch/arm/boot/dts/imx6qp-zii-rdu2.dts arch/arm/boot/dts/imx6ul-tx6ul.dtsi arch/arm/boot/dts/imx6ull-colibri-nonwifi.dtsi arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
2020-02-09ARM: dts: imx6ul: Fix memory node duplicationFabio Estevam
Boards based on imx6ul have duplicate memory nodes: - One coming from the board dts file: memory@ - One coming from the imx6ul.dtsi file. Fix the duplication by removing the memory node from the dtsi file and by adding 'device_type = "memory";' in the board dts. Reported-by: Rob Herring <robh@kernel.org> Signed-off-by: Fabio Estevam <festevam@gmail.com> Signed-off-by: Shawn Guo <shawnguo@kernel.org> (cherry picked from commit 750d8df6e7b269b828f66631a1d39ea027afc92a)
2020-02-09ARM: dts (ds): Remove ENET1_CRS pinmux as this is used for usb otgPhilippe Schenker
Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
2020-02-09ARM: dts (ds): imx7-colibri: Remove regulator linkPhilippe Schenker
This vin-supply statement is not needed as the linked regulator &reg_DCDC3 is anyway marked as always-on. This is needed because NXP's code of GPCV2 can't handle deferred probing. Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>