Commit a12c92e3932e0dd223780a3d293d97d0267f0c8b
1 parent
96816a843f
Exists in
v2017.01-smarct4x
and in
25 other branches
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>
Showing 2 changed files with 6 additions and 6 deletions Side-by-side Diff
arch/arm/dts/armada-7040-db.dts
| ... | ... | @@ -152,7 +152,7 @@ |
| 152 | 152 | status = "okay"; |
| 153 | 153 | }; |
| 154 | 154 | |
| 155 | -&comphy_cp110 { | |
| 155 | +&cpm_comphy { | |
| 156 | 156 | phy0 { |
| 157 | 157 | phy-type = <PHY_TYPE_SGMII2>; |
| 158 | 158 | phy-speed = <PHY_SPEED_3_125G>; |
| 159 | 159 | |
| ... | ... | @@ -184,11 +184,11 @@ |
| 184 | 184 | }; |
| 185 | 185 | }; |
| 186 | 186 | |
| 187 | -&utmi0 { | |
| 187 | +&cpm_utmi0 { | |
| 188 | 188 | status = "okay"; |
| 189 | 189 | }; |
| 190 | 190 | |
| 191 | -&utmi1 { | |
| 191 | +&cpm_utmi1 { | |
| 192 | 192 | status = "okay"; |
| 193 | 193 | }; |
arch/arm/dts/armada-cp110-master.dtsi
| ... | ... | @@ -149,7 +149,7 @@ |
| 149 | 149 | status = "disabled"; |
| 150 | 150 | }; |
| 151 | 151 | |
| 152 | - comphy_cp110: comphy@441000 { | |
| 152 | + cpm_comphy: comphy@441000 { | |
| 153 | 153 | compatible = "marvell,mvebu-comphy", "marvell,comphy-cp110"; |
| 154 | 154 | reg = <0x441000 0x8>, |
| 155 | 155 | <0x120000 0x8>; |
| ... | ... | @@ -157,7 +157,7 @@ |
| 157 | 157 | max-lanes = <6>; |
| 158 | 158 | }; |
| 159 | 159 | |
| 160 | - utmi0: utmi@580000 { | |
| 160 | + cpm_utmi0: utmi@580000 { | |
| 161 | 161 | compatible = "marvell,mvebu-utmi-2.6.0"; |
| 162 | 162 | reg = <0x580000 0x1000>, /* utmi-unit */ |
| 163 | 163 | <0x440420 0x4>, /* usb-cfg */ |
| ... | ... | @@ -166,7 +166,7 @@ |
| 166 | 166 | status = "disabled"; |
| 167 | 167 | }; |
| 168 | 168 | |
| 169 | - utmi1: utmi@581000 { | |
| 169 | + cpm_utmi1: utmi@581000 { | |
| 170 | 170 | compatible = "marvell,mvebu-utmi-2.6.0"; |
| 171 | 171 | reg = <0x581000 0x1000>, /* utmi-unit */ |
| 172 | 172 | <0x440420 0x4>, /* usb-cfg */ |