diff options
| author | Igal Liberman <igall@marvell.com> | 2018-05-14 11:20:54 +0300 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2021-04-29 07:45:24 +0200 |
| commit | 341e548eb8f586c39c49efbd0b90eaf283fbee63 (patch) | |
| tree | e6426dd0c088063f67402e48c2b6b6a8be23bf85 /arch | |
| parent | a007f236260d15fadea6643b2dd8ca5e6387e506 (diff) | |
| download | u-boot-341e548eb8f586c39c49efbd0b90eaf283fbee63.tar.gz u-boot-341e548eb8f586c39c49efbd0b90eaf283fbee63.tar.xz u-boot-341e548eb8f586c39c49efbd0b90eaf283fbee63.zip | |
phy: marvell: add support for SFI1
In CP115, comphy4 can be configured into SFI port1
(in addition to SFI0). This patch adds the option
described above.
In addition, rename all existing SFI/XFI references:
COMPHY_TYPE_SFI --> COMPHY_TYPE_SFI0
No functional change for exsiting configuration.
Change-Id: If9176222e0080424ba67347fe4d320215b1ba0c0
Signed-off-by: Igal Liberman <igall@marvell.com>
Signed-off-by: Konstantin Porotchkin <kostap@marvell.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/dts/armada-7040-db.dts | 3 | ||||
| -rw-r--r-- | arch/arm/dts/armada-8040-clearfog-gt-8k.dts | 4 | ||||
| -rw-r--r-- | arch/arm/dts/armada-8040-db.dts | 4 | ||||
| -rw-r--r-- | arch/arm/dts/armada-8040-mcbin.dts | 4 | ||||
| -rw-r--r-- | arch/arm/dts/armada-8040-puzzle-m801.dts | 4 | ||||
| -rw-r--r-- | arch/arm/dts/cn9130-crb-A.dts | 2 | ||||
| -rw-r--r-- | arch/arm/dts/cn9130-crb-B.dts | 2 |
7 files changed, 12 insertions, 11 deletions
diff --git a/arch/arm/dts/armada-7040-db.dts b/arch/arm/dts/armada-7040-db.dts index f475fb3610..b158f92349 100644 --- a/arch/arm/dts/armada-7040-db.dts +++ b/arch/arm/dts/armada-7040-db.dts @@ -132,7 +132,8 @@ }; phy2 { - phy-type = <COMPHY_TYPE_SFI>; + phy-type = <COMPHY_TYPE_SFI0>; + phy-speed = <COMPHY_SPEED_10_3125G>; }; phy3 { diff --git a/arch/arm/dts/armada-8040-clearfog-gt-8k.dts b/arch/arm/dts/armada-8040-clearfog-gt-8k.dts index ce5832c2fb..6a586dbbba 100644 --- a/arch/arm/dts/armada-8040-clearfog-gt-8k.dts +++ b/arch/arm/dts/armada-8040-clearfog-gt-8k.dts @@ -154,7 +154,7 @@ * CP0 Serdes Configuration: * Lane 0: PCIe0 (x1) * Lane 1: Not connected - * Lane 2: SFI (10G) + * Lane 2: SFI0 (10G) * Lane 3: Not connected * Lane 4: USB 3.0 host port1 (can be PCIe) * Lane 5: Not connected @@ -166,7 +166,7 @@ phy-type = <COMPHY_TYPE_UNCONNECTED>; }; phy2 { - phy-type = <COMPHY_TYPE_SFI>; + phy-type = <COMPHY_TYPE_SFI0>; }; phy3 { phy-type = <COMPHY_TYPE_UNCONNECTED>; diff --git a/arch/arm/dts/armada-8040-db.dts b/arch/arm/dts/armada-8040-db.dts index 1edfaab682..51c2f23f4d 100644 --- a/arch/arm/dts/armada-8040-db.dts +++ b/arch/arm/dts/armada-8040-db.dts @@ -95,7 +95,7 @@ phy-type = <COMPHY_TYPE_SATA0>; }; phy2 { - phy-type = <COMPHY_TYPE_SFI>; + phy-type = <COMPHY_TYPE_SFI0>; }; phy3 { phy-type = <COMPHY_TYPE_SATA1>; @@ -194,7 +194,7 @@ phy-type = <COMPHY_TYPE_SATA0>; }; phy2 { - phy-type = <COMPHY_TYPE_SFI>; + phy-type = <COMPHY_TYPE_SFI0>; }; phy3 { phy-type = <COMPHY_TYPE_SATA1>; diff --git a/arch/arm/dts/armada-8040-mcbin.dts b/arch/arm/dts/armada-8040-mcbin.dts index a6ef40138d..2184648318 100644 --- a/arch/arm/dts/armada-8040-mcbin.dts +++ b/arch/arm/dts/armada-8040-mcbin.dts @@ -183,7 +183,7 @@ phy-type = <COMPHY_TYPE_PEX0>; }; phy4 { - phy-type = <COMPHY_TYPE_SFI>; + phy-type = <COMPHY_TYPE_SFI0>; }; phy5 { phy-type = <COMPHY_TYPE_SATA1>; @@ -299,7 +299,7 @@ phy-type = <COMPHY_TYPE_SATA1>; }; phy4 { - phy-type = <COMPHY_TYPE_SFI>; + phy-type = <COMPHY_TYPE_SFI0>; }; phy5 { phy-type = <COMPHY_TYPE_SGMII2>; diff --git a/arch/arm/dts/armada-8040-puzzle-m801.dts b/arch/arm/dts/armada-8040-puzzle-m801.dts index 0becc4ff0d..510fb84d5a 100644 --- a/arch/arm/dts/armada-8040-puzzle-m801.dts +++ b/arch/arm/dts/armada-8040-puzzle-m801.dts @@ -234,7 +234,7 @@ phy-speed = <COMPHY_SPEED_1_25G>; }; phy4 { - phy-type = <COMPHY_TYPE_SFI>; + phy-type = <COMPHY_TYPE_SFI0>; }; phy5 { phy-type = <COMPHY_TYPE_SATA1>; @@ -380,7 +380,7 @@ phy-speed = <COMPHY_SPEED_1_25G>; }; phy4 { - phy-type = <COMPHY_TYPE_SFI>; + phy-type = <COMPHY_TYPE_SFI0>; }; phy5 { phy-type = <COMPHY_TYPE_SGMII2>; diff --git a/arch/arm/dts/cn9130-crb-A.dts b/arch/arm/dts/cn9130-crb-A.dts index 5c5e0fb2eb..fcfcd15d8d 100644 --- a/arch/arm/dts/cn9130-crb-A.dts +++ b/arch/arm/dts/cn9130-crb-A.dts @@ -31,7 +31,7 @@ }; phy4 { - phy-type = <COMPHY_TYPE_SFI>; + phy-type = <COMPHY_TYPE_SFI0>; phy-speed = <COMPHY_SPEED_10_3125G>; }; diff --git a/arch/arm/dts/cn9130-crb-B.dts b/arch/arm/dts/cn9130-crb-B.dts index 6041084a2c..b681b6032d 100644 --- a/arch/arm/dts/cn9130-crb-B.dts +++ b/arch/arm/dts/cn9130-crb-B.dts @@ -31,7 +31,7 @@ }; phy4 { - phy-type = <COMPHY_TYPE_SFI>; + phy-type = <COMPHY_TYPE_SFI0>; phy-speed = <COMPHY_SPEED_10_3125G>; }; |