Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-14 08:57:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
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>
This commit is contained in:
Stefan Roese 2016-10-25 17:35:55 +02:00
parent 96816a843f
commit a12c92e393
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
arch/arm/dts/armada-7040-db.dts
View file

@ -152,7 +152,7 @@
status = "okay"; status = "okay";
}; };
&comphy_cp110 { &cpm_comphy {
phy0 { phy0 {
phy-type = <PHY_TYPE_SGMII2>; phy-type = <PHY_TYPE_SGMII2>;
phy-speed = <PHY_SPEED_3_125G>; phy-speed = <PHY_SPEED_3_125G>;
@ -184,10 +184,10 @@
}; };
}; };
&utmi0 { &cpm_utmi0 {
status = "okay"; status = "okay";
}; };
&utmi1 { &cpm_utmi1 {
status = "okay"; status = "okay";
}; };

6
arch/arm/dts/armada-cp110-master.dtsi
View file

@ -149,7 +149,7 @@
status = "disabled"; status = "disabled";
}; };
comphy_cp110: comphy@441000 { cpm_comphy: comphy@441000 {
compatible = "marvell,mvebu-comphy", "marvell,comphy-cp110"; compatible = "marvell,mvebu-comphy", "marvell,comphy-cp110";
reg = <0x441000 0x8>, reg = <0x441000 0x8>,
<0x120000 0x8>; <0x120000 0x8>;
@ -157,7 +157,7 @@
max-lanes = <6>; max-lanes = <6>;
}; };
utmi0: utmi@580000 { cpm_utmi0: utmi@580000 {
compatible = "marvell,mvebu-utmi-2.6.0"; compatible = "marvell,mvebu-utmi-2.6.0";
reg = <0x580000 0x1000>, /* utmi-unit */ reg = <0x580000 0x1000>, /* utmi-unit */
<0x440420 0x4>, /* usb-cfg */ <0x440420 0x4>, /* usb-cfg */
@ -166,7 +166,7 @@
status = "disabled"; status = "disabled";
}; };
utmi1: utmi@581000 { cpm_utmi1: utmi@581000 {
compatible = "marvell,mvebu-utmi-2.6.0"; compatible = "marvell,mvebu-utmi-2.6.0";
reg = <0x581000 0x1000>, /* utmi-unit */ reg = <0x581000 0x1000>, /* utmi-unit */
<0x440420 0x4>, /* usb-cfg */ <0x440420 0x4>, /* usb-cfg */