arm64: mvebu: armada-cp110-master.dtsi: Rename comphy DT node names

Since the cp110 slave also has comphy DT nodes, the names need to be
renamed to avoid a name clash. Lets use the common naming scheme:
"cpm_xxx" for master and "cps_xxx" for slave.

Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Nadav Haklai <nadavh@marvell.com>
Cc: Neta Zur Hershkovits <neta@marvell.com>
Cc: Kostya Porotchkin <kostap@marvell.com>
Cc: Omri Itach <omrii@marvell.com>
Cc: Igal Liberman <igall@marvell.com>
Cc: Haim Boot <hayim@marvell.com>
Cc: Hanna Hawa <hannah@marvell.com>

diff --git a/arch/arm/dts/armada-7040-db.dts b/arch/arm/dts/armada-7040-db.dts
index 7d0059afe5c2030fcd0fd8a2fb8da6d708b540bc..b8fe5a9cb93dcf9e4e49505800f182d7fb8b58df 100644 (file)
--- a/arch/arm/dts/armada-7040-db.dts
+++ b/arch/arm/dts/armada-7040-db.dts
@@ -152,7 +152,7 @@
        status = "okay";
 };
 
-&comphy_cp110 {
+&cpm_comphy {
        phy0 {
                phy-type = <PHY_TYPE_SGMII2>;
                phy-speed = <PHY_SPEED_3_125G>;
@@ -184,10 +184,10 @@
        };
 };
 
-&utmi0 {
+&cpm_utmi0 {
        status = "okay";
 };
 
-&utmi1 {
+&cpm_utmi1 {
        status = "okay";
 };

diff --git a/arch/arm/dts/armada-cp110-master.dtsi b/arch/arm/dts/armada-cp110-master.dtsi
index 7da98bf5cbc05cd65173e5dcfbe6fe27438df7e8..422d7544012df6733f68f9499c1d44a9b1af5c5e 100644 (file)
--- a/arch/arm/dts/armada-cp110-master.dtsi
+++ b/arch/arm/dts/armada-cp110-master.dtsi
@@ -149,7 +149,7 @@
                                status = "disabled";
                        };
 
-                       comphy_cp110: comphy@441000 {
+                       cpm_comphy: comphy@441000 {
                                compatible = "marvell,mvebu-comphy", "marvell,comphy-cp110";
                                reg = <0x441000 0x8>,
                                      <0x120000 0x8>;
@@ -157,7 +157,7 @@
                                max-lanes = <6>;
                        };
 
-                       utmi0: utmi@580000 {
+                       cpm_utmi0: utmi@580000 {
                                compatible = "marvell,mvebu-utmi-2.6.0";
                                reg = <0x580000 0x1000>,        /* utmi-unit */
                                      <0x440420 0x4>,           /* usb-cfg */
@@ -166,7 +166,7 @@
                                status = "disabled";
                        };
 
-                       utmi1: utmi@581000 {
+                       cpm_utmi1: utmi@581000 {
                                compatible = "marvell,mvebu-utmi-2.6.0";
                                reg = <0x581000 0x1000>,        /* utmi-unit */
                                      <0x440420 0x4>,           /* usb-cfg */