summaryrefslogtreecommitdiff
path: root/arch/arm/boot
AgeCommit message (Collapse)Author
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>
2020-02-09ARM: dts: add recovery for I2C for iMX7Oleksandr Suvorov
- add recovery mode for applicable i2c buses for Colibri iMX7 module. Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com> (cherry picked from commit 01c0bda6912c37456b3df34a7cf30300100ffbad) Conflicts: arch/arm/boot/dts/imx7-colibri.dtsi Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
2020-02-09ARM: dts: imx7-colibri: Add sleep mode to ethernetPhilippe Schenker
Add sleep pinmux to the fec so it can properly sleep. Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
2020-02-09ARM: dts: imx7-colibri: prepare module device tree for FlexCANPhilippe Schenker
Prepare FlexCAN use on SODIMM 55/63 178/188. Those SODIMM pins are compatible for CAN bus use with several modules from the Colibri family. Add Better drivestrength and also add flexcan2. This is a squashed commit from: (cherry picked from commit 5562bcc82fd50633199a6627c11ec9d41833ed4e and commit 491a63f465e45eda40336d3e75538668a44e166e) Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
2020-02-09ARM: dts: imx7-colibri: disable HS400Stefan Agner
Force HS200 by masking bit 63 of the SDHCI capability register. The i.MX ESDHC driver uses SDHCI_QUIRK2_CAPS_BIT63_FOR_HS400. With that the stack checks bit 63 to descide whether HS400 is available. Using sdhci-caps-mask allows to mask bit 63. The stack then selects HS200 as operating mode. This prevents rare communication errors with minimal effect on performance: sdhci-esdhc-imx 30b60000.usdhc: warning! HS400 strobe DLL status REF not lock! Signed-off-by: Stefan Agner <stefan.agner@toradex.com> Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> (cherry picked from commit cf7097961efb6c93945b940065375ede1e03b254)
2020-02-09colibri_imx7: make sure module supplies are always onMarcel Ziswiler
Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> Acked-by: Philippe Schenker <philippe.schenker@toradex.com> (cherry picked from commit c81fc92fa8852d4dcc607b6771463471607d0942)
2020-02-09ARM: dts: Add stmpe-adc DT node to Toradex iMX6 modulesPhilippe Schenker
Add the stmpe-adc DT node as found on Toradex iMX6 modules Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com> Reviewed-by: Stefan Agner <stefan@agner.ch> Signed-off-by: Shawn Guo <shawnguo@kernel.org> (cherry picked from commit a822029a0cc0b838bff043482629f5fb9c2deb32)
2020-02-09ARM: dts: colibri: use valid range configuration for weimStefan Agner
A valid WEIM range configuration must specify range entries for all four chip selects. This fixes an error on boot: imx-weim: probe of 21b8000.weim failed with error -22 Signed-off-by: Stefan Agner <stefan@agner.ch> Signed-off-by: Shawn Guo <shawnguo@kernel.org> (cherry picked from commit 063182a4c85673c735508dc01dd07fffbe7defb1)
2020-02-09ARM: dts: imx6*-apalis/-colibri: mark I2C recovery GPIOs as open drainStefan Agner
Since commit d2d0ad2aec4a ("i2c: imx: use open drain for recovery GPIO") GPIO lib expects this GPIO to be configured as open drain. Make sure we define this GPIO as open drain in the device tree. This gets rid of the following warning: gpio-81 (scl): enforced open drain please flag it properly in DT/ACPI DSDT/board file Note that currently the i.MX pinctrl driver does not support enabling open drain directly, so this patch has no effect in practice. Open drain is enabled by the fixed pinmux entry. Signed-off-by: Stefan Agner <stefan@agner.ch> Reviewed-by: Philippe Schenker <philippe.schenker@toradex.com> Signed-off-by: Shawn Guo <shawnguo@kernel.org> (cherry picked from commit d2b91ab1480618885fe0a7f240b7e7710344a066)
2020-02-09ARM: dts: imx7: Fix memory node duplicationFabio Estevam
Boards based on imx7 have duplicate memory nodes: - One coming from the board dts file: memory@ - One coming from the imx7s.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 29988e867cb17de7119e971f9acfad2c3fccdb47) Conflicts: arch/arm/boot/dts/imx7d-cl-som-imx7.dts arch/arm/boot/dts/imx7d-colibri-emmc.dtsi arch/arm/boot/dts/imx7d-colibri.dtsi arch/arm/boot/dts/imx7d-nitrogen7.dts arch/arm/boot/dts/imx7d-pico.dtsi arch/arm/boot/dts/imx7d-sdb.dts arch/arm/boot/dts/imx7s-colibri.dtsi arch/arm/boot/dts/imx7s-warp.dts arch/arm/boot/dts/imx7s.dtsi Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
2020-02-09ARM: dts: imx6q-apalis: mux RESET_MOCI# signalStefan Agner
The pinctrl properties on the IOMUXC node get overwritten by the carrier board level device tree, hence the pinctrl_reset_moci pinctrl does not get applied. Associate the pinctrl_reset_moci pinctrl with the PCIe node where we also make use of the pin as a reset GPIO. Since the pin is muxed as a GPIO by default not muxing it explicitly worked fine in practise. Signed-off-by: Stefan Agner <stefan@agner.ch> Signed-off-by: Shawn Guo <shawnguo@kernel.org> (cherry picked from commit 78f10734f95873c22255f536e894c704bb5e8fa2)
2020-02-09ARM: dts: imx6qdl-apalis/-colibri: remove unused pinctrl groupsStefan Agner
100/200MHz states for USDHC3 are not required since the SoC does not support modes faster than DDR52 for the on board eMMC. Signed-off-by: Stefan Agner <stefan@agner.ch> Signed-off-by: Shawn Guo <shawnguo@kernel.org> (cherry picked from commit b074f057ac60d32f604e0ca3120064e688e9a622)
2020-02-09ARM: dts: imx6qdl-apalis/-colibri: assign VDDD to SGTL5000Stefan Agner
VDDD is connected to VGEN4 of the PF0100. This rail should only run at 1.8V since there are multiple consumer and they all expect the rail to be at 1.8V. Signed-off-by: Stefan Agner <stefan@agner.ch> Signed-off-by: Shawn Guo <shawnguo@kernel.org> (cherry picked from commit 330f85598e87497974431c0f6f736e413ccf2d27)
2020-02-09ARM: dts: imx6qdl-apalis/-colibri: fix on-module regulatorsStefan Agner
Remove the 2.5V regulator, it does not exist. There is 3.3V and 3.3V_AUDIO provided to the module through the edge connector, model those as fixed regulators like we use to do in other Colibri device trees. The SGTL5000 uses 3.3V_AUDIO as VDDA. Note that the driver derives the analog ground voltage (VAG) from this supply. The new value should allow higher output swings before clipping occurs. Refer to the SGTL5000 datasheet for details. Signed-off-by: Stefan Agner <stefan@agner.ch> Signed-off-by: Shawn Guo <shawnguo@kernel.org> (cherry picked from commit 7060066d3e9920a4d96e106243e544c14ba0fd79)
2020-02-09ARM: dts: imx6qdl-apalis/-colibri: remove 1.8V regulatorStefan Agner
The fixed 1.8V regulator is not used, and there is in fact no fixed 1.8V regulator on the module. Remove it. Signed-off-by: Stefan Agner <stefan@agner.ch> Signed-off-by: Shawn Guo <shawnguo@kernel.org> (cherry picked from commit 7034de41186f3b49fe987b4626ae1a151760a609)
2020-02-09ARM: dts: imx6qdl-apalis/-colibri: disable read-only switchStefan Agner
Use the disable-wp to indicate that Apalis and Colibri iMX6 do not make use of the native write-protect signal available on the i.MX 6 SoCs. This prevents warnings: mmc0: host does not support reading read-only switch, assuming write-enable Signed-off-by: Stefan Agner <stefan@agner.ch> Signed-off-by: Shawn Guo <shawnguo@kernel.org> (cherry picked from commit 147299a8fc3a70f02984a6d6a042d0cbf53c46f9)
2020-02-09ARM: dts: imx6qdl-apalis/-colibri: prevent 1.8V modesStefan Agner
Use no-1-8-v device tree property to indicate that the board does not support 1.8V signaling. The property voltage-ranges seems not appropriate in our case since we do not have level shifters in place. Signed-off-by: Stefan Agner <stefan@agner.ch> Signed-off-by: Shawn Guo <shawnguo@kernel.org> (cherry picked from commit 3b1147a952cf9efb36144c1f7fd847d5a99adb7a)
2020-02-09ARM: dts: imx6q-apalis-eval: add carrier board 3.3V supplyStefan Agner
Add the 3.3V main supply on the carrier board. Currently as a fixed supply since not all consumer are modeled yet. This gets also rid of some missing supply warnings. Signed-off-by: Stefan Agner <stefan@agner.ch> Signed-off-by: Shawn Guo <shawnguo@kernel.org> (cherry picked from commit 5780acda81d3f5378b71d8dead95b8d052dc22ae)
2020-02-09ARM: dts: imx6q-apalis: add chosen nodeStefan Agner
Add Apalis UART1 as default serial console. Signed-off-by: Stefan Agner <stefan@agner.ch> Signed-off-by: Shawn Guo <shawnguo@kernel.org> (cherry picked from commit 6c74366b8db6fc70b65266bf52c58a89ebc946f1)
2020-02-09ARM: dts: imx6qdl-colibri: use pull-down on wake-up pinStefan Agner
The wake-up pin is pulled low with 100kOhm on the carrier board. The current configuration of 100kOhm pull-up caused lots of interrupts, especially during boot up. Make sure the pin is at a reasonable level at startup by pulling it low on SoC side too. Signed-off-by: Stefan Agner <stefan@agner.ch> Signed-off-by: Shawn Guo <shawnguo@kernel.org> (cherry picked from commit c4288946d43ed2d76247ab757581ce428c90d9ef)
2020-02-09ARM: dts: imx6qdl-colibri: move card detect to module device treeStefan Agner
Muxing the card detect only in the carrier board device tree overwrites the USDHC muxing in the module level device tree. Move card detect to the module level device tree since this is also a default pinout of the Colibri standard. If a carrier board requires a different setting it still can overwrite the nodes in the carrier board specific device tree. Signed-off-by: Stefan Agner <stefan@agner.ch> Signed-off-by: Shawn Guo <shawnguo@kernel.org> (cherry picked from commit c768224360094b3e3b11c81a4163a9e1c7bd3336)
generated by cgit v1.2.3 (git 2.0.4) at 2024-04-26 23:55:57 +0000