Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid

[cascardo/linux.git] / arch / arm / boot / dts / imx6q-marsboard.dts

diff --git a/arch/arm/boot/dts/imx6q-marsboard.dts b/arch/arm/boot/dts/imx6q-marsboard.dts
index 3f8013c..f7995c5 100644 (file)
--- a/arch/arm/boot/dts/imx6q-marsboard.dts
+++ b/arch/arm/boot/dts/imx6q-marsboard.dts
@@ -252,26 +252,26 @@
                fsl,pins = <
                        MX6QDL_PAD_ENET_MDIO__ENET_MDIO         0x1b0b0
                        MX6QDL_PAD_ENET_MDC__ENET_MDC           0x1b0b0
-                       MX6QDL_PAD_RGMII_TXC__RGMII_TXC         0x1b0b0
-                       MX6QDL_PAD_RGMII_TD0__RGMII_TD0         0x1b0b0
-                       MX6QDL_PAD_RGMII_TD1__RGMII_TD1         0x1b0b0
-                       MX6QDL_PAD_RGMII_TD2__RGMII_TD2         0x1b0b0
-                       MX6QDL_PAD_RGMII_TD3__RGMII_TD3         0x1b0b0
-                       MX6QDL_PAD_RGMII_TX_CTL__RGMII_TX_CTL   0x1b0b0
+                       MX6QDL_PAD_RGMII_TXC__RGMII_TXC         0x1b030
+                       MX6QDL_PAD_RGMII_TD0__RGMII_TD0         0x1b030
+                       MX6QDL_PAD_RGMII_TD1__RGMII_TD1         0x1b030
+                       MX6QDL_PAD_RGMII_TD2__RGMII_TD2         0x1b030
+                       MX6QDL_PAD_RGMII_TD3__RGMII_TD3         0x1b030
+                       MX6QDL_PAD_RGMII_TX_CTL__RGMII_TX_CTL   0x1b030
                        /* AR8035 CLK_25M --> ENET_REF_CLK (V22) */
                        MX6QDL_PAD_ENET_REF_CLK__ENET_TX_CLK    0x0a0b1
                        /* AR8035 pin strapping: IO voltage: pull up */
-                       MX6QDL_PAD_RGMII_RXC__RGMII_RXC         0x1b0b0
+                       MX6QDL_PAD_RGMII_RXC__RGMII_RXC         0x1b030
                        /* AR8035 pin strapping: PHYADDR#0: pull down */
-                       MX6QDL_PAD_RGMII_RD0__RGMII_RD0         0x130b0
+                       MX6QDL_PAD_RGMII_RD0__RGMII_RD0         0x13030
                        /* AR8035 pin strapping: PHYADDR#1: pull down */
-                       MX6QDL_PAD_RGMII_RD1__RGMII_RD1         0x130b0
+                       MX6QDL_PAD_RGMII_RD1__RGMII_RD1         0x13030
                        /* AR8035 pin strapping: MODE#1: pull up */
-                       MX6QDL_PAD_RGMII_RD2__RGMII_RD2         0x1b0b0
+                       MX6QDL_PAD_RGMII_RD2__RGMII_RD2         0x1b030
                        /* AR8035 pin strapping: MODE#3: pull up */
-                       MX6QDL_PAD_RGMII_RD3__RGMII_RD3         0x1b0b0
+                       MX6QDL_PAD_RGMII_RD3__RGMII_RD3         0x1b030
                        /* AR8035 pin strapping: MODE#0: pull down */
-                       MX6QDL_PAD_RGMII_RX_CTL__RGMII_RX_CTL   0x130b0
+                       MX6QDL_PAD_RGMII_RX_CTL__RGMII_RX_CTL   0x13030
                        /* GPIO16 -> AR8035 25MHz */
                        MX6QDL_PAD_GPIO_16__ENET_REF_CLK        0x4001b0a8
                        /* RGMII_nRST */