summaryrefslogtreecommitdiff
path: root/arch/arm/boot
AgeCommit message (Collapse)Author
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-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-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-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>
2020-02-09ARM: dts: Remove fsl,tuning-stepMarcel Ziswiler
As it is anyway default in downstream. Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
2020-02-09ARM: dts: colibri-imx7: Add mdio phy nodeMarcel Ziswiler
In this commit the mdio bus with the respective phy is added, so one is able to make changes to that easier. This is as well neede for 4.14 Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
2020-02-09ARM: dts: enable gpmi for the iMX7 eMMC 1GB variantPhilippe Schenker
Enable gpmi part nessesary for Colibri iMX7 Dual 1GB (eMMC). Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
2020-02-09ARM: dts: add UHS-I pinmuxingPhilippe Schenker
The iMX7 is supporting UHS-I but as those pins are shared a define is needed to let the user decide if he wants UHS-I. Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
2020-02-09ARM: dts: add touch controllers that are used with this boardPhilippe Schenker
Add atmel mxt multitouch controller driver which is interfaced over I2C bus. Add TouchRevolution multitouch controller driver which is connectable over I2C bus. Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
2020-02-09ARM: dts: colibri: preparations for adding aster devicetreePhilippe Schenker
This patch adds spigpios group to pinmux. This is needed by Aster devicetrees that will be added later on. Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
2020-02-09ARM: dts: colibri-imx7: add new gpio hog grpBhuvanchandra DV
Add new gpio hog group for atmel mxt ts GPIOs. Signed-off-by: Bhuvanchandra DV <bhuvanchandra.dv@toradex.com> Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> (cherry picked from commit e747c0e955869e5cb6d9ea4da9477895901dbc92) (cherry picked from commit 27e488ab4f471002a4549ea47551d08f62bbb698)
2020-02-09ARM: dts: imx7-colibri: add alias for RTC and disable SNVS powerkeyStefan Agner
The SNVS subnodes reenable the power key which is not used on the Colibri iMX7 modules. Disable the power key again. Also make sure that the priority of the RTCs used is defined. Signed-off-by: Stefan Agner <stefan.agner@toradex.com> Acked-by: Max Krummenacher <max.krummenacher@toradex.com> (cherry picked from commit 41ef3fad976e68175d9b087b1d072aac7183a906)
2020-02-09ARM: dts: Add Aster devicetrees from 4.9Philippe Schenker
Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
2020-02-09Revert "MLK-13548 ARM: dts: imx: Add 1.2GHz setpoint for imx7d"Stefan Agner
This reverts commit 511eacb77e74e9a23546b3afb0d2b2208eb4621c. (cherry picked from commit ae8f31f4a7d78c8ff792cf2cf549b540f19488dc)
2020-02-09ARM: dts (ds): imx7: merge changes from toradex_4.9-2.3.x-imx-nextPhilippe Schenker
Merge changes from Toradex Linux 4.9 BSP. Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
2020-02-09ARM: dts: imx7-colibri: fix 1.8V/UHS supportStefan Agner
Add pinmuxing and do not specify voltage restrictions in the module level device tree. Signed-off-by: Stefan Agner <stefan.agner@toradex.com> Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> (cherry picked from commit d4f875d9f8319ae9157702d5232f8b0b91444105)
2020-02-09ARM: dts: imx7-colibri: add GPIO wakeup keyStefan Agner
Add wakeup GPIO key which is able to wake the system from sleep modes (e.g. Suspend-to-Memory). Signed-off-by: Stefan Agner <stefan.agner@toradex.com> Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>