Merge tag 'cris-for-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/jesper...

[cascardo/linux.git] / arch / arm / boot / dts / imx6qdl-nitrogen6_max.dtsi

diff --git a/arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi b/arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi
index 9677bf3..b0b3220 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi
@@ -484,19 +484,19 @@
                        fsl,pins = <
                                MX6QDL_PAD_ENET_MDIO__ENET_MDIO         0x100b0
                                MX6QDL_PAD_ENET_MDC__ENET_MDC           0x100b0
-                               MX6QDL_PAD_RGMII_TXC__RGMII_TXC         0x100b0
-                               MX6QDL_PAD_RGMII_TD0__RGMII_TD0         0x100b0
-                               MX6QDL_PAD_RGMII_TD1__RGMII_TD1         0x100b0
-                               MX6QDL_PAD_RGMII_TD2__RGMII_TD2         0x100b0
-                               MX6QDL_PAD_RGMII_TD3__RGMII_TD3         0x100b0
-                               MX6QDL_PAD_RGMII_TX_CTL__RGMII_TX_CTL   0x100b0
+                               MX6QDL_PAD_RGMII_TXC__RGMII_TXC         0x10030
+                               MX6QDL_PAD_RGMII_TD0__RGMII_TD0         0x10030
+                               MX6QDL_PAD_RGMII_TD1__RGMII_TD1         0x10030
+                               MX6QDL_PAD_RGMII_TD2__RGMII_TD2         0x10030
+                               MX6QDL_PAD_RGMII_TD3__RGMII_TD3         0x10030
+                               MX6QDL_PAD_RGMII_TX_CTL__RGMII_TX_CTL   0x10030
                                MX6QDL_PAD_ENET_REF_CLK__ENET_TX_CLK    0x100b0
-                               MX6QDL_PAD_RGMII_RXC__RGMII_RXC         0x1b0b0
-                               MX6QDL_PAD_RGMII_RD0__RGMII_RD0         0x1b0b0
-                               MX6QDL_PAD_RGMII_RD1__RGMII_RD1         0x1b0b0
-                               MX6QDL_PAD_RGMII_RD2__RGMII_RD2         0x1b0b0
-                               MX6QDL_PAD_RGMII_RD3__RGMII_RD3         0x1b0b0
-                               MX6QDL_PAD_RGMII_RX_CTL__RGMII_RX_CTL   0x1b0b0
+                               MX6QDL_PAD_RGMII_RXC__RGMII_RXC         0x1b030
+                               MX6QDL_PAD_RGMII_RD0__RGMII_RD0         0x1b030
+                               MX6QDL_PAD_RGMII_RD1__RGMII_RD1         0x1b030
+                               MX6QDL_PAD_RGMII_RD2__RGMII_RD2         0x1b030
+                               MX6QDL_PAD_RGMII_RD3__RGMII_RD3         0x1b030
+                               MX6QDL_PAD_RGMII_RX_CTL__RGMII_RX_CTL   0x1b030
                                /* Phy reset */
                                MX6QDL_PAD_ENET_RXD0__GPIO1_IO27        0x0f0b0
                                MX6QDL_PAD_ENET_TX_EN__GPIO1_IO28       0x1b0b0