Merge branch 'pm-cpufreq'

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

diff --git a/arch/arm/boot/dts/imx6q-evi.dts b/arch/arm/boot/dts/imx6q-evi.dts
index 4fa5601..6de21ff 100644 (file)
--- a/arch/arm/boot/dts/imx6q-evi.dts
+++ b/arch/arm/boot/dts/imx6q-evi.dts
@@ -139,6 +139,9 @@
        pinctrl-0 = <&pinctrl_enet>;
        phy-mode = "rgmii";
        phy-reset-gpios = <&gpio1 25 0>;
+       interrupts-extended = <&gpio1 6 IRQ_TYPE_LEVEL_HIGH>,
+                             <&intc 0 119 IRQ_TYPE_LEVEL_HIGH>;
+       fsl,err006687-workaround-present;
        status = "okay";
 };
 
@@ -303,21 +306,22 @@
                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
                        MX6QDL_PAD_ENET_REF_CLK__ENET_TX_CLK 0x1b0b0
-                       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
                        MX6QDL_PAD_ENET_TX_EN__ENET_TX_EN 0x4001b0a8
                        MX6QDL_PAD_ENET_CRS_DV__GPIO1_IO25 0x1b0b0
+                       MX6QDL_PAD_GPIO_6__ENET_IRQ 0x000b1
                >;
        };