summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/imx28-tx28.dts
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2018-03-15 18:06:55 +0300
committerArnd Bergmann <arnd@arndb.de>2018-03-16 00:03:10 +0300
commit7a76aad0262e7eed6d7aca3b4c95e4621601d779 (patch)
treeff2ffc847d983db0deeac4fd6bfe5b958bc1b2da /arch/arm/boot/dts/imx28-tx28.dts
parentfed925ea70f6a8bb1a60baad1146f251770cc777 (diff)
parentf4be9b77fac3d8141add1d84e75199f0e0ddd5a3 (diff)
downloadlinux-7a76aad0262e7eed6d7aca3b4c95e4621601d779.tar.xz
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/imx28-tx28.dts')
-rw-r--r--arch/arm/boot/dts/imx28-tx28.dts34
1 files changed, 22 insertions, 12 deletions
diff --git a/arch/arm/boot/dts/imx28-tx28.dts b/arch/arm/boot/dts/imx28-tx28.dts
index 152621ea37db..687186358c18 100644
--- a/arch/arm/boot/dts/imx28-tx28.dts
+++ b/arch/arm/boot/dts/imx28-tx28.dts
@@ -65,8 +65,8 @@
usbotg = &usb0;
};
- memory {
- reg = <0 0>; /* will be filled in by U-Boot */
+ memory@40000000 {
+ reg = <0x40000000 0>; /* will be filled in by U-Boot */
};
onewire {
@@ -531,7 +531,8 @@
fsl,pull-up = <MXS_PULL_DISABLE>;
};
- tx28_edt_ft5x06_pins: tx28-edt-ft5x06-pins {
+ tx28_edt_ft5x06_pins: tx28-edt-ft5x06-pins@0 {
+ reg = <0>;
fsl,pinmux-ids = <
MX28_PAD_SSP0_DATA6__GPIO_2_6 /* RESET */
MX28_PAD_SSP0_DATA5__GPIO_2_5 /* IRQ */
@@ -542,7 +543,8 @@
fsl,pull-up = <MXS_PULL_DISABLE>;
};
- tx28_flexcan_xcvr_pins: tx28-flexcan-xcvr-pins {
+ tx28_flexcan_xcvr_pins: tx28-flexcan-xcvr-pins@0 {
+ reg = <0>;
fsl,pinmux-ids = <
MX28_PAD_LCD_D00__GPIO_1_0
>;
@@ -551,7 +553,8 @@
fsl,pull-up = <MXS_PULL_DISABLE>;
};
- tx28_lcdif_23bit_pins: tx28-lcdif-23bit {
+ tx28_lcdif_23bit_pins: tx28-lcdif-23bit@0 {
+ reg = <0>;
fsl,pinmux-ids = <
/* LCD_D00 may be used as Flexcan Transceiver Enable on STK5-V5 */
MX28_PAD_LCD_D01__LCD_D1
@@ -583,7 +586,8 @@
fsl,pull-up = <MXS_PULL_DISABLE>;
};
- tx28_lcdif_ctrl_pins: tx28-lcdif-ctrl {
+ tx28_lcdif_ctrl_pins: tx28-lcdif-ctrl@0 {
+ reg = <0>;
fsl,pinmux-ids = <
MX28_PAD_LCD_ENABLE__GPIO_1_31 /* Enable */
MX28_PAD_LCD_RESET__GPIO_3_30 /* Reset */
@@ -593,7 +597,8 @@
fsl,pull-up = <MXS_PULL_DISABLE>;
};
- tx28_mac0_pins_gpio: tx28-mac0-gpio-pins {
+ tx28_mac0_pins_gpio: tx28-mac0-gpio-pins@0 {
+ reg = <0>;
fsl,pinmux-ids = <
MX28_PAD_ENET0_MDC__GPIO_4_0
MX28_PAD_ENET0_MDIO__GPIO_4_1
@@ -610,7 +615,8 @@
fsl,pull-up = <MXS_PULL_DISABLE>;
};
- tx28_pca9554_pins: tx28-pca9554-pins {
+ tx28_pca9554_pins: tx28-pca9554-pins@0 {
+ reg = <0>;
fsl,pinmux-ids = <
MX28_PAD_PWM3__GPIO_3_28
>;
@@ -619,7 +625,8 @@
fsl,pull-up = <MXS_PULL_DISABLE>;
};
- tx28_spi_gpio_pins: spi-gpiogrp {
+ tx28_spi_gpio_pins: spi-gpiogrp@0 {
+ reg = <0>;
fsl,pinmux-ids = <
MX28_PAD_AUART2_RX__GPIO_3_8
MX28_PAD_AUART2_TX__GPIO_3_9
@@ -633,7 +640,8 @@
fsl,pull-up = <MXS_PULL_DISABLE>;
};
- tx28_tsc2007_pins: tx28-tsc2007-pins {
+ tx28_tsc2007_pins: tx28-tsc2007-pins@0 {
+ reg = <0>;
fsl,pinmux-ids = <
MX28_PAD_SAIF0_MCLK__GPIO_3_20 /* TSC2007 IRQ */
>;
@@ -643,7 +651,8 @@
};
- tx28_usbphy0_pins: tx28-usbphy0-pins {
+ tx28_usbphy0_pins: tx28-usbphy0-pins@0 {
+ reg = <0>;
fsl,pinmux-ids = <
MX28_PAD_GPMI_CE2N__GPIO_0_18 /* USBOTG_VBUSEN */
MX28_PAD_GPMI_CE3N__GPIO_0_19 /* USBOTH_OC */
@@ -653,7 +662,8 @@
fsl,pull-up = <MXS_PULL_DISABLE>;
};
- tx28_usbphy1_pins: tx28-usbphy1-pins {
+ tx28_usbphy1_pins: tx28-usbphy1-pins@0 {
+ reg = <0>;
fsl,pinmux-ids = <
MX28_PAD_SPDIF__GPIO_3_27 /* USBH_VBUSEN */
MX28_PAD_JTAG_RTCK__GPIO_4_20 /* USBH_OC */