Merge remote-tracking branch 'omap_dss2/for-next'

[deliverable/linux.git] / arch / arm / boot / dts / imx6q-ba16.dtsi

diff --git a/arch/arm/boot/dts/imx6q-ba16.dtsi b/arch/arm/boot/dts/imx6q-ba16.dtsi
index f7e17e2004acb7869c711ffdabcfe634e73fb6dd..308e11cea1db47894efc943119b100add1c0078b 100644 (file)
--- a/arch/arm/boot/dts/imx6q-ba16.dtsi
+++ b/arch/arm/boot/dts/imx6q-ba16.dtsi
@@ -351,7 +351,7 @@
 &uart3 {
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_uart3>;
-       fsl,uart-has-rtscts;
+       uart-has-rtscts;
        status = "okay";
 };
 
@@ -448,19 +448,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
                        /* FEC Reset */
                        MX6QDL_PAD_ENET_TX_EN__GPIO1_IO28     0x1b0b0
                        /* AR8033 Interrupt */