leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

phy: marvell: rename comphy related definitions to COMPHY_XX

Browse Source 
Currently, all comphy definitions are PHY_TYPE_XX and PHY_SPEEED_XX.
Those definition might be confused with MDIO PHY definitions.

This patch does the following changes:
 - PHY_TYPE_XX --> COMPHY_TYPE_XX
 - PHY_SPEED_XX --> COMPHY_SPEED_XX

This improves readability, no functional change.

Change-Id: I2bd1d9289ebbc5c16fa80f9870f797ea1bcaf5fa
Signed-off-by: Igal Liberman <igall@marvell.com>
Signed-off-by: Konstantin Porotchkin <kostap@marvell.com>
This commit is contained in:
Igal Liberman
2017-04-26 15:40:00 +03:00
committed by Stefan Roese
parent 4568e2041c
commit 2dbba24088
18 changed files with 287 additions and 273 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
arch/arm/dts/armada-3720-db.dts
View File

@@ -70,13 +70,13 @@
&comphy {
phy0 {
phy-type = <PHY_TYPE_PEX0>;
phy-speed = <PHY_SPEED_2_5G>;
phy-type = <COMPHY_TYPE_USB3_HOST0>;
phy-speed = <COMPHY_SPEED_5G>;
};
phy1 {
phy-type = <PHY_TYPE_USB3_HOST0>;
phy-speed = <PHY_SPEED_5G>;
phy-type = <COMPHY_TYPE_PEX0>;
phy-speed = <COMPHY_SPEED_2_5G>;
};
};

12
arch/arm/dts/armada-3720-espressobin.dts
View File

@@ -83,18 +83,18 @@
&comphy {
max-lanes = <3>;
phy0 {
phy-type = <PHY_TYPE_USB3_HOST0>;
phy-speed = <PHY_SPEED_5G>;
phy-type = <COMPHY_TYPE_USB3_HOST0>;
phy-speed = <COMPHY_SPEED_5G>;
};
phy1 {
phy-type = <PHY_TYPE_PEX0>;
phy-speed = <PHY_SPEED_2_5G>;
phy-type = <COMPHY_TYPE_PEX0>;
phy-speed = <COMPHY_SPEED_2_5G>;
};
phy2 {
phy-type = <PHY_TYPE_SATA0>;
phy-speed = <PHY_SPEED_5G>;
phy-type = <COMPHY_TYPE_SATA0>;
phy-speed = <COMPHY_SPEED_5G>;
};
};

12
arch/arm/dts/armada-3720-turris-mox.dts
View File

@@ -73,18 +73,18 @@
&comphy {
max-lanes = <3>;
phy0 {
phy-type = <PHY_TYPE_SGMII1>;
phy-speed = <PHY_SPEED_3_125G>;
phy-type = <COMPHY_TYPE_SGMII1>;
phy-speed = <COMPHY_SPEED_3_125G>;
};
phy1 {
phy-type = <PHY_TYPE_PEX0>;
phy-speed = <PHY_SPEED_5G>;
phy-type = <COMPHY_TYPE_PEX0>;
phy-speed = <COMPHY_SPEED_5G>;
};
phy2 {
phy-type = <PHY_TYPE_USB3_HOST0>;
phy-speed = <PHY_SPEED_5G>;
phy-type = <COMPHY_TYPE_USB3_HOST0>;
phy-speed = <COMPHY_SPEED_5G>;
};
};

21
arch/arm/dts/armada-3720-uDPU.dts
View File

@@ -108,18 +108,19 @@
&comphy {
phy0 {
phy-type = <PHY_TYPE_SGMII1>;
phy-speed = <PHY_SPEED_3_125G>;
phy-type = <COMPHY_TYPE_SGMII1>;
phy-speed = <COMPHY_SPEED_1_25G>;
};
phy1 {
phy-type = <PHY_TYPE_SGMII0>;
phy-speed = <PHY_SPEED_3_125G>;
};
phy2 {
phy-type = <PHY_TYPE_USB3_HOST1>;
phy-speed = <PHY_SPEED_5G>;
};
phy1 {
phy-type = <COMPHY_TYPE_SGMII0>;
phy-speed = <COMPHY_SPEED_1_25G>;
};
phy2 {
phy-type = <COMPHY_TYPE_USB3_HOST1>;
phy-speed = <COMPHY_SPEED_5G>;
};
};
&eth0 {

24
arch/arm/dts/armada-7040-db-nand.dts
View File

@@ -129,33 +129,33 @@
&cp0_comphy {
phy0 {
phy-type = <PHY_TYPE_SGMII2>;
phy-speed = <PHY_SPEED_3_125G>;
phy-type = <COMPHY_TYPE_SGMII2>;
phy-speed = <COMPHY_SPEED_3_125G>;
};
phy1 {
phy-type = <PHY_TYPE_USB3_HOST0>;
phy-speed = <PHY_SPEED_5G>;
phy-type = <COMPHY_TYPE_USB3_HOST0>;
phy-speed = <COMPHY_SPEED_5G>;
};
phy2 {
phy-type = <PHY_TYPE_SGMII0>;
phy-speed = <PHY_SPEED_1_25G>;
phy-type = <COMPHY_TYPE_SGMII0>;
phy-speed = <COMPHY_SPEED_1_25G>;
};
phy3 {
phy-type = <PHY_TYPE_SATA1>;
phy-speed = <PHY_SPEED_5G>;
phy-type = <COMPHY_TYPE_SATA1>;
phy-speed = <COMPHY_SPEED_5G>;
};
phy4 {
phy-type = <PHY_TYPE_USB3_HOST1>;
phy-speed = <PHY_SPEED_5G>;
phy-type = <COMPHY_TYPE_USB3_HOST1>;
phy-speed = <COMPHY_SPEED_5G>;
};
phy5 {
phy-type = <PHY_TYPE_PEX2>;
phy-speed = <PHY_SPEED_5G>;
phy-type = <COMPHY_TYPE_PEX2>;
phy-speed = <COMPHY_SPEED_5G>;
};
};

22
arch/arm/dts/armada-7040-db.dts
View File

@@ -122,32 +122,32 @@
&cp0_comphy {
phy0 {
phy-type = <PHY_TYPE_SGMII1>;
phy-speed = <PHY_SPEED_1_25G>;
phy-type = <COMPHY_TYPE_SGMII1>;
phy-speed = <COMPHY_SPEED_1_25G>;
};
phy1 {
phy-type = <PHY_TYPE_USB3_HOST0>;
phy-speed = <PHY_SPEED_5G>;
phy-type = <COMPHY_TYPE_USB3_HOST0>;
phy-speed = <COMPHY_SPEED_5G>;
};
phy2 {
phy-type = <PHY_TYPE_SFI>;
phy-type = <COMPHY_TYPE_SFI>;
};
phy3 {
phy-type = <PHY_TYPE_SATA1>;
phy-speed = <PHY_SPEED_5G>;
phy-type = <COMPHY_TYPE_SATA1>;
phy-speed = <COMPHY_SPEED_5G>;
};
phy4 {
phy-type = <PHY_TYPE_USB3_HOST1>;
phy-speed = <PHY_SPEED_5G>;
phy-type = <COMPHY_TYPE_USB3_HOST1>;
phy-speed = <COMPHY_SPEED_5G>;
};
phy5 {
phy-type = <PHY_TYPE_PEX2>;
phy-speed = <PHY_SPEED_5G>;
phy-type = <COMPHY_TYPE_PEX2>;
phy-speed = <COMPHY_SPEED_5G>;
};
};

30
arch/arm/dts/armada-8040-clearfog-gt-8k.dts
View File

@@ -160,22 +160,22 @@
* Lane 5: Not connected
*/
phy0 {
phy-type = <PHY_TYPE_PEX0>;
phy-type = <COMPHY_TYPE_PEX0>;
};
phy1 {
phy-type = <PHY_TYPE_UNCONNECTED>;
phy-type = <COMPHY_TYPE_UNCONNECTED>;
};
phy2 {
phy-type = <PHY_TYPE_SFI>;
phy-type = <COMPHY_TYPE_SFI>;
};
phy3 {
phy-type = <PHY_TYPE_UNCONNECTED>;
phy-type = <COMPHY_TYPE_UNCONNECTED>;
};
phy4 {
phy-type = <PHY_TYPE_USB3_HOST1>;
phy-type = <COMPHY_TYPE_USB3_HOST1>;
};
phy5 {
phy-type = <PHY_TYPE_UNCONNECTED>;
phy-type = <COMPHY_TYPE_UNCONNECTED>;
};
};
@@ -272,25 +272,25 @@
* Lane 5: SGMII2 - Connected to Topaz switch
*/
phy0 {
phy-type = <PHY_TYPE_SATA1>;
phy-invert = <PHY_POLARITY_RXD_INVERT>;
phy-type = <COMPHY_TYPE_SATA1>;
phy-invert = <COMPHY_POLARITY_RXD_INVERT>;
};
phy1 {
phy-type = <PHY_TYPE_UNCONNECTED>;
phy-type = <COMPHY_TYPE_UNCONNECTED>;
};
phy2 {
phy-type = <PHY_TYPE_USB3_HOST0>;
phy-type = <COMPHY_TYPE_USB3_HOST0>;
};
phy3 {
phy-type = <PHY_TYPE_SGMII1>;
phy-speed = <PHY_SPEED_1_25G>;
phy-type = <COMPHY_TYPE_SGMII1>;
phy-speed = <COMPHY_SPEED_1_25G>;
};
phy4 {
phy-type = <PHY_TYPE_UNCONNECTED>;
phy-type = <COMPHY_TYPE_UNCONNECTED>;
};
phy5 {
phy-type = <PHY_TYPE_SGMII2>;
phy-speed = <PHY_SPEED_3_125G>;
phy-type = <COMPHY_TYPE_SGMII2>;
phy-speed = <COMPHY_SPEED_3_125G>;
};
};

24
arch/arm/dts/armada-8040-db.dts
View File

@@ -89,22 +89,22 @@
* Lane 5: PCIe2 (x1)
*/
phy0 {
phy-type = <PHY_TYPE_PEX0>;
phy-type = <COMPHY_TYPE_PEX0>;
};
phy1 {
phy-type = <PHY_TYPE_SATA0>;
phy-type = <COMPHY_TYPE_SATA0>;
};
phy2 {
phy-type = <PHY_TYPE_SFI>;
phy-type = <COMPHY_TYPE_SFI>;
};
phy3 {
phy-type = <PHY_TYPE_SATA1>;
phy-type = <COMPHY_TYPE_SATA1>;
};
phy4 {
phy-type = <PHY_TYPE_USB3_HOST1>;
phy-type = <COMPHY_TYPE_USB3_HOST1>;
};
phy5 {
phy-type = <PHY_TYPE_PEX2>;
phy-type = <COMPHY_TYPE_PEX2>;
};
};
@@ -188,22 +188,22 @@
* Lane 5: PCIe2 (x1)
*/
phy0 {
phy-type = <PHY_TYPE_PEX0>;
phy-type = <COMPHY_TYPE_PEX0>;
};
phy1 {
phy-type = <PHY_TYPE_SATA0>;
phy-type = <COMPHY_TYPE_SATA0>;
};
phy2 {
phy-type = <PHY_TYPE_SFI>;
phy-type = <COMPHY_TYPE_SFI>;
};
phy3 {
phy-type = <PHY_TYPE_SATA1>;
phy-type = <COMPHY_TYPE_SATA1>;
};
phy4 {
phy-type = <PHY_TYPE_PEX1>;
phy-type = <COMPHY_TYPE_PEX1>;
};
phy5 {
phy-type = <PHY_TYPE_PEX2>;
phy-type = <COMPHY_TYPE_PEX2>;
};
};

27
arch/arm/dts/armada-8040-mcbin.dts
View File

@@ -171,22 +171,22 @@
* Lane 5: SATA1
*/
phy0 {
phy-type = <PHY_TYPE_PEX0>;
phy-type = <COMPHY_TYPE_PEX0>;
};
phy1 {
phy-type = <PHY_TYPE_PEX0>;
phy-type = <COMPHY_TYPE_PEX0>;
};
phy2 {
phy-type = <PHY_TYPE_PEX0>;
phy-type = <COMPHY_TYPE_PEX0>;
};
phy3 {
phy-type = <PHY_TYPE_PEX0>;
phy-type = <COMPHY_TYPE_PEX0>;
};
phy4 {
phy-type = <PHY_TYPE_SFI>;
phy-type = <COMPHY_TYPE_SFI>;
};
phy5 {
phy-type = <PHY_TYPE_SATA1>;
phy-type = <COMPHY_TYPE_SATA1>;
};
};
@@ -286,22 +286,23 @@
* Lane 5: SGMII3
*/
phy0 {
phy-type = <PHY_TYPE_SGMII1>;
phy-speed = <PHY_SPEED_1_25G>;
phy-type = <COMPHY_TYPE_SGMII1>;
phy-speed = <COMPHY_SPEED_1_25G>;
};
phy1 {
phy-type = <PHY_TYPE_SATA0>;
phy-type = <COMPHY_TYPE_SATA0>;
};
phy2 {
phy-type = <PHY_TYPE_USB3_HOST0>;
phy-type = <COMPHY_TYPE_USB3_HOST0>;
};
phy3 {
phy-type = <PHY_TYPE_SATA1>;
phy-type = <COMPHY_TYPE_SATA1>;
};
phy4 {
phy-type = <PHY_TYPE_SFI>;
phy-type = <COMPHY_TYPE_SFI>;
};
phy5 {
phy-type = <PHY_TYPE_SGMII3>;
phy-type = <COMPHY_TYPE_SGMII3>;
phy-speed = <COMPHY_SPEED_3_125G>;
};
};

32
arch/arm/dts/armada-8040-puzzle-m801.dts
View File

@@ -220,24 +220,24 @@
* Lane 5: SATA1
*/
phy0 {
phy-type = <PHY_TYPE_PEX0>;
phy-type = <COMPHY_TYPE_PEX0>;
};
phy1 {
phy-type = <PHY_TYPE_SGMII2>;
phy-speed = <PHY_SPEED_1_25G>;
phy-type = <COMPHY_TYPE_SGMII2>;
phy-speed = <COMPHY_SPEED_1_25G>;
};
phy2 {
phy-type = <PHY_TYPE_SATA0>;
phy-type = <COMPHY_TYPE_SATA0>;
};
phy3 {
phy-type = <PHY_TYPE_SGMII1>;
phy-speed = <PHY_SPEED_1_25G>;
phy-type = <COMPHY_TYPE_SGMII1>;
phy-speed = <COMPHY_SPEED_1_25G>;
};
phy4 {
phy-type = <PHY_TYPE_SFI>;
phy-type = <COMPHY_TYPE_SFI>;
};
phy5 {
phy-type = <PHY_TYPE_SATA1>;
phy-type = <COMPHY_TYPE_SATA1>;
};
};
@@ -367,23 +367,23 @@
* Lane 5: SGMII2
*/
phy0 {
phy-type = <PHY_TYPE_PEX0>;
phy-type = <COMPHY_TYPE_PEX0>;
};
phy1 {
phy-type = <PHY_TYPE_PEX0>;
phy-type = <COMPHY_TYPE_PEX0>;
};
phy2 {
phy-type = <PHY_TYPE_USB3_HOST0>;
phy-type = <COMPHY_TYPE_USB3_HOST0>;
};
phy3 {
phy-type = <PHY_TYPE_SGMII1>;
phy-speed = <PHY_SPEED_1_25G>;
phy-type = <COMPHY_TYPE_SGMII1>;
phy-speed = <COMPHY_SPEED_1_25G>;
};
phy4 {
phy-type = <PHY_TYPE_SFI>;
phy-type = <COMPHY_TYPE_SFI>;
};
phy5 {
phy-type = <PHY_TYPE_SGMII2>;
phy-speed = <PHY_SPEED_1_25G>;
phy-type = <COMPHY_TYPE_SGMII2>;
phy-speed = <COMPHY_SPEED_1_25G>;
};
};

16
arch/arm/dts/cn9130-crb-A.dts
View File

@@ -15,29 +15,29 @@
&cp0_comphy {
phy0 {
phy-type = <PHY_TYPE_PEX0>;
phy-type = <COMPHY_TYPE_PEX0>;
};
phy1 {
phy-type = <PHY_TYPE_PEX0>;
phy-type = <COMPHY_TYPE_PEX0>;
};
phy2 {
phy-type = <PHY_TYPE_PEX0>;
phy-type = <COMPHY_TYPE_PEX0>;
};
phy3 {
phy-type = <PHY_TYPE_PEX0>;
phy-type = <COMPHY_TYPE_PEX0>;
};
phy4 {
phy-type = <PHY_TYPE_SFI>;
phy-speed = <PHY_SPEED_10_3125G>;
phy-type = <COMPHY_TYPE_SFI>;
phy-speed = <COMPHY_SPEED_10_3125G>;
};
phy5 {
phy-type = <PHY_TYPE_SGMII2>;
phy-speed = <PHY_SPEED_3_125G>;
phy-type = <COMPHY_TYPE_SGMII2>;
phy-speed = <COMPHY_SPEED_3_125G>;
};
};

16
arch/arm/dts/cn9130-crb-B.dts
View File

@@ -15,29 +15,29 @@
&cp0_comphy {
phy0 {
phy-type = <PHY_TYPE_PEX0>;
phy-type = <COMPHY_TYPE_PEX0>;
};
phy1 {
phy-type = <PHY_TYPE_USB3_HOST0>;
phy-type = <COMPHY_TYPE_USB3_HOST0>;
};
phy2 {
phy-type = <PHY_TYPE_SATA0>;
phy-type = <COMPHY_TYPE_SATA0>;
};
phy3 {
phy-type = <PHY_TYPE_USB3_HOST1>;
phy-type = <COMPHY_TYPE_USB3_HOST1>;
};
phy4 {
phy-type = <PHY_TYPE_SFI>;
phy-speed = <PHY_SPEED_10_3125G>;
phy-type = <COMPHY_TYPE_SFI>;
phy-speed = <COMPHY_SPEED_10_3125G>;
};
phy5 {
phy-type = <PHY_TYPE_SGMII2>;
phy-speed = <PHY_SPEED_3_125G>;
phy-type = <COMPHY_TYPE_SGMII2>;
phy-speed = <COMPHY_SPEED_3_125G>;
};
};