Merge branch 'work.iov_iter' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[linux-2.6-microblaze.git] / arch / arm / boot / dts / am335x-myirtech-myd.dts

diff --git a/arch/arm/boot/dts/am335x-myirtech-myd.dts b/arch/arm/boot/dts/am335x-myirtech-myd.dts
index c996639..1479fd9 100644 (file)
--- a/arch/arm/boot/dts/am335x-myirtech-myd.dts
+++ b/arch/arm/boot/dts/am335x-myirtech-myd.dts
@@ -86,18 +86,26 @@
        };
 };
 
-&cpsw_emac1 {
+&cpsw_port2 {
+       status = "okay";
        phy-handle = <&phy1>;
        phy-mode = "rgmii-id";
+       ti,dual-emac-pvid = <2>;
 };
 
-&davinci_mdio {
+&davinci_mdio_sw {
        phy1: ethernet-phy@6 {
                reg = <6>;
                eee-broken-1000t;
        };
 };
 
+&mac_sw {
+       pinctrl-0 = <&eth_slave1_pins_default>, <&eth_slave2_pins_default>;
+       pinctrl-1 = <&eth_slave1_pins_sleep>, <&eth_slave2_pins_sleep>;
+       slaves = <2>;
+};
+
 &dcan0 {
        pinctrl-names = "default", "sleep";
        pinctrl-0 = <&dcan0_pins_default>;
@@ -194,12 +202,6 @@
        };
 };
 
-&mac {
-       pinctrl-0 = <&eth_slave1_pins_default>, <&eth_slave2_pins_default>;
-       pinctrl-1 = <&eth_slave1_pins_sleep>, <&eth_slave2_pins_sleep>;
-       slaves = <2>;
-};
-
 &mcasp0 {
        pinctrl-names = "default", "sleep";
        pinctrl-0 = <&mcasp0_pins_default>;