Merge tag 'docs-5.15' of git://git.lwn.net/linux

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

diff --git a/arch/arm/boot/dts/am335x-myirtech-myc.dtsi b/arch/arm/boot/dts/am335x-myirtech-myc.dtsi
index 270a3d5..245c35f 100644 (file)
--- a/arch/arm/boot/dts/am335x-myirtech-myc.dtsi
+++ b/arch/arm/boot/dts/am335x-myirtech-myc.dtsi
@@ -57,16 +57,27 @@
        };
 };
 
-&cpsw_emac0 {
+&mac_sw {
+       pinctrl-names = "default", "sleep";
+       pinctrl-0 = <&eth_slave1_pins_default>;
+       pinctrl-1 = <&eth_slave1_pins_sleep>;
+       status = "okay";
+};
+
+&cpsw_port1 {
        phy-handle = <&phy0>;
        phy-mode = "rgmii-id";
+       ti,dual-emac-pvid = <1>;
+};
+
+&cpsw_port2 {
+       status = "disabled";
 };
 
-&davinci_mdio {
+&davinci_mdio_sw {
        pinctrl-names = "default", "sleep";
        pinctrl-0 = <&mdio_pins_default>;
        pinctrl-1 = <&mdio_pins_sleep>;
-       status = "okay";
 
        phy0: ethernet-phy@4 {
                reg = <4>;
@@ -137,14 +148,6 @@
        };
 };
 
-&mac {
-       pinctrl-names = "default", "sleep";
-       pinctrl-0 = <&eth_slave1_pins_default>;
-       pinctrl-1 = <&eth_slave1_pins_sleep>;
-       slaves = <1>;
-       status = "okay";
-};
-
 &rtc {
        system-power-controller;
 };