Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu

[deliverable/linux.git] / arch / arm / boot / dts / imx28.dtsi

diff --git a/arch/arm/boot/dts/imx28.dtsi b/arch/arm/boot/dts/imx28.dtsi
index f637ec900cc8d13a0073dce096d0e3c5e9cdfc20..74aa151cdb45ec094f70f823063d5e73034b710f 100644 (file)
--- a/arch/arm/boot/dts/imx28.dtsi
+++ b/arch/arm/boot/dts/imx28.dtsi
@@ -434,6 +434,32 @@
                                        fsl,pull-up = <MXS_PULL_ENABLE>;
                                };
 
+                               mac0_pins_b: mac0@1 {
+                                       reg = <1>;
+                                       fsl,pinmux-ids = <
+                                               MX28_PAD_ENET0_MDC__ENET0_MDC
+                                               MX28_PAD_ENET0_MDIO__ENET0_MDIO
+                                               MX28_PAD_ENET0_RX_EN__ENET0_RX_EN
+                                               MX28_PAD_ENET0_RXD0__ENET0_RXD0
+                                               MX28_PAD_ENET0_RXD1__ENET0_RXD1
+                                               MX28_PAD_ENET0_RXD2__ENET0_RXD2
+                                               MX28_PAD_ENET0_RXD3__ENET0_RXD3
+                                               MX28_PAD_ENET0_TX_EN__ENET0_TX_EN
+                                               MX28_PAD_ENET0_TXD0__ENET0_TXD0
+                                               MX28_PAD_ENET0_TXD1__ENET0_TXD1
+                                               MX28_PAD_ENET0_TXD2__ENET0_TXD2
+                                               MX28_PAD_ENET0_TXD3__ENET0_TXD3
+                                               MX28_PAD_ENET_CLK__CLKCTRL_ENET
+                                               MX28_PAD_ENET0_COL__ENET0_COL
+                                               MX28_PAD_ENET0_CRS__ENET0_CRS
+                                               MX28_PAD_ENET0_TX_CLK__ENET0_TX_CLK
+                                               MX28_PAD_ENET0_RX_CLK__ENET0_RX_CLK
+                                               >;
+                                       fsl,drive-strength = <MXS_DRIVE_8mA>;
+                                       fsl,voltage = <MXS_VOLTAGE_HIGH>;
+                                       fsl,pull-up = <MXS_PULL_ENABLE>;
+                               };
+
                                mac1_pins_a: mac1@0 {
                                        reg = <0>;
                                        fsl,pinmux-ids = <