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

[linux-2.6-microblaze.git] / arch / arm / boot / dts / am57xx-beagle-x15-common.dtsi

diff --git a/arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi b/arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi
index b3a0206..994e69a 100644 (file)
--- a/arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi
+++ b/arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi
@@ -451,7 +451,7 @@
                              <&dra7_pmx_core 0x3f8>;
 };
 
-&davinci_mdio {
+&davinci_mdio_sw {
        phy0: ethernet-phy@1 {
                reg = <1>;
        };
@@ -461,21 +461,20 @@
        };
 };
 
-&mac {
+&mac_sw {
        status = "okay";
-       dual_emac;
 };
 
-&cpsw_emac0 {
+&cpsw_port1 {
        phy-handle = <&phy0>;
        phy-mode = "rgmii-rxid";
-       dual_emac_res_vlan = <1>;
+       ti,dual-emac-pvid = <1>;
 };
 
-&cpsw_emac1 {
+&cpsw_port2 {
        phy-handle = <&phy1>;
        phy-mode = "rgmii-rxid";
-       dual_emac_res_vlan = <2>;
+       ti,dual-emac-pvid = <2>;
 };
 
 &mmc1 {
@@ -582,13 +581,13 @@
 };
 
 &dss {
-       status = "ok";
+       status = "okay";
 
        vdda_video-supply = <&ldoln_reg>;
 };
 
 &hdmi {
-       status = "ok";
+       status = "okay";
        vdda-supply = <&ldo4_reg>;
 
        port {
@@ -599,7 +598,7 @@
 };
 
 &pcie1_rc {
-       status = "ok";
+       status = "okay";
        gpios = <&gpio2 8 GPIO_ACTIVE_LOW>;
 };
 
@@ -638,3 +637,11 @@
        status = "okay";
        memory-region = <&dsp2_memory_region>;
 };
+
+&pruss1_mdio {
+       status = "disabled";
+};
+
+&pruss2_mdio {
+       status = "disabled";
+};