diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2018-03-15 16:06:55 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2018-03-15 22:03:10 +0100 |
| commit | 7a76aad0262e7eed6d7aca3b4c95e4621601d779 (patch) | |
| tree | ff2ffc847d983db0deeac4fd6bfe5b958bc1b2da /arch/arm/boot/dts/imx6qdl-hummingboard.dtsi | |
| parent | fed925ea70f6a8bb1a60baad1146f251770cc777 (diff) | |
| parent | f4be9b77fac3d8141add1d84e75199f0e0ddd5a3 (diff) | |
Merge tag 'imx-dt-4.17' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/dt
Pull "i.MX device tree updates for 4.17" from Shawn Guo:
- New board support: phyBOARD-Mira i.MX6 boards; Advantech DMS-BA16
i.MX6Q board; Toradex Colibri iMX6ULL boards.
- ZII RDU board updates: add RAVE SP device; disable on-chip watchdog
as the external watchdog is being used instead; improve USDHC node
regarding to voltage and SDIO capability.
- i.MX6UL/ULL updates: cpufreq clock cleanup; add IOMUXC_SNVS pins and
missing daisy chain configurations; add more devices like WDOG3,
UART8, PMU, architected timer etc.
- Hummingboard updates: correct USBOTG-ID pin; remove mention of
nonexistent node.
- Fix compatibles of atmel eeprom devices.
- A couple of improvements on i.MX25 pinfunc header regarding to eSDHC
pins.
- A bunch of patches from Fabio and Marco to fix DTC warnings seen with
W=1 switch.
- Remove GPU subsystem nodes, as they are not needed by the etnaviv
driver anymore and have been removed from the binding.
- Add FIFO depth definition for i.MX25 SSI devices.
- Add missing '#sound-dai-cells' for sgtl5000 codec which is complained
by DTC.
- Miscellaneous and random updates.
* tag 'imx-dt-4.17' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (66 commits)
ARM: dts: i.MX25: define SSI FIFO depth
ARM: dts: vf610m4: Remove the zero length reg property
ARM: dts: vf610m4: Remove skeleton.dtsi inclusion
ARM: dts: vf500: Remove the zero length reg property
ARM: dts: vf: Add memory node unit name
ARM: dts: vf500: Remove skeleton.dtsi inclusion
ARM: dts: imx7s: add temperature monitor support
ARM: dts: imx: Add missing #sound-dai-cells for sgtl5000 codec
ARM: dts: imx51-zii-rdu1: Add node for RAVE SP device
ARM: dts: imx6: RDU2: Add RAVE SP device
ARM: dts: imx5: Pass the memory unit-address
ARM: dts: imx7s: add spba-bus abstraction
ARM: dts: imx6dl-icore-rqs: Fix invalid PHY address assignment for ethernet
ARM: dts: imx6ul: add wdog3 node
ARM: dts: imx7: add CPU PMU support
ARM: dts: imx6dl-colibri-eval-v3: Add chosen node
ARM: dts: imx6: Pass memory unit-adress
ARM: dts: imx6dl: remove 'lcdif' node
ARM: dts: hummingboard: Remove mention of nonexistent node
ARM: dts: imx6qdl-hummingboard: fix USBOTG-ID pin
...
Diffstat (limited to 'arch/arm/boot/dts/imx6qdl-hummingboard.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/imx6qdl-hummingboard.dtsi | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi b/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi index 92583238ca4a..7e20b47de839 100644 --- a/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi +++ b/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi @@ -40,6 +40,11 @@ */ / { + /* Will be filled by the bootloader */ + memory@10000000 { + reg = <0x10000000 0>; + }; + chosen { stdout-path = &uart1; }; @@ -239,10 +244,9 @@ pinctrl_hummingboard_usbotg_id: hummingboard-usbotg-id { /* - * Similar to pinctrl_usbotg_2, but we want it - * pulled down for a fixed host connection. + * We want it pulled down for a fixed host connection. */ - fsl,pins = <MX6QDL_PAD_GPIO_1__USB_OTG_ID 0x13059>; + fsl,pins = <MX6QDL_PAD_ENET_RX_ER__USB_OTG_ID 0x13059>; }; pinctrl_hummingboard_usbotg_vbus: hummingboard-usbotg-vbus { |