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

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

diff --git a/arch/arm/boot/dts/am335x-sl50.dts b/arch/arm/boot/dts/am335x-sl50.dts
index f4684c8..6516907 100644 (file)
--- a/arch/arm/boot/dts/am335x-sl50.dts
+++ b/arch/arm/boot/dts/am335x-sl50.dts
@@ -661,20 +661,24 @@
        };
 };
 
-&cpsw_emac0 {
+&cpsw_port1 {
        phy-mode = "mii";
        phy-handle = <&ethphy0>;
+       ti,dual-emac-pvid = <1>;
 };
 
-&mac {
+&cpsw_port2 {
+       status = "disabled";
+};
+
+&mac_sw {
        status = "okay";
        pinctrl-names = "default", "sleep";
        pinctrl-0 = <&cpsw_default>;
        pinctrl-1 = <&cpsw_sleep>;
 };
 
-&davinci_mdio {
-       status = "okay";
+&davinci_mdio_sw {
        pinctrl-names = "default", "sleep";
        pinctrl-0 = <&davinci_mdio_default>;
        pinctrl-1 = <&davinci_mdio_sleep>;