diff options
| author | Tom Rini <trini@konsulko.com> | 2017-05-09 15:48:09 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-05-09 15:48:09 -0400 |
| commit | a284212963277114ad60e3442d74f095102a9de5 (patch) | |
| tree | ade5bcb8f4c46b8766d439785ed7d0a210628913 /arch/arm/dts/armada-8040-mcbin.dts | |
| parent | e6ceaff1b5f1ff6a0b135fcd931562958e9c91bd (diff) | |
| parent | e38f5fc8d80d946b401ba0e9ba0fcb52d6e7e74b (diff) | |
Merge git://www.denx.de/git/u-boot-marvell
Diffstat (limited to 'arch/arm/dts/armada-8040-mcbin.dts')
| -rw-r--r-- | arch/arm/dts/armada-8040-mcbin.dts | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/arm/dts/armada-8040-mcbin.dts b/arch/arm/dts/armada-8040-mcbin.dts index e42b092b25..991ddc0c43 100644 --- a/arch/arm/dts/armada-8040-mcbin.dts +++ b/arch/arm/dts/armada-8040-mcbin.dts @@ -99,7 +99,7 @@ * [54] 2.5G SFP LOS * [55] Micro SD card detect * [56-61] Micro SD - * [62] CP1 KR SFP FAULT + * [62] CP1 SFI SFP FAULT */ /* 0 1 2 3 4 5 6 7 8 9 */ pin-func = < 0xff 0xff 0xff 0xff 0xff 0xff 0xff 0xff 0xff 0xff @@ -163,7 +163,7 @@ * Lane 1: PCIe0 (x4) * Lane 2: PCIe0 (x4) * Lane 3: PCIe0 (x4) - * Lane 4: KR (10G) + * Lane 4: SFI (10G) * Lane 5: SATA1 */ phy0 { @@ -179,7 +179,7 @@ phy-type = <PHY_TYPE_PEX0>; }; phy4 { - phy-type = <PHY_TYPE_KR>; + phy-type = <PHY_TYPE_SFI>; }; phy5 { phy-type = <PHY_TYPE_SATA1>; @@ -264,15 +264,15 @@ &cps_comphy { /* * CP1 Serdes Configuration: - * Lane 0: SGMII2 + * Lane 0: SGMII1 * Lane 1: SATA 0 * Lane 2: USB HOST 0 * Lane 3: SATA1 - * Lane 4: KR (10G) + * Lane 4: SFI (10G) * Lane 5: SGMII3 */ phy0 { - phy-type = <PHY_TYPE_SGMII2>; + phy-type = <PHY_TYPE_SGMII1>; phy-speed = <PHY_SPEED_1_25G>; }; phy1 { @@ -285,7 +285,7 @@ phy-type = <PHY_TYPE_SATA1>; }; phy4 { - phy-type = <PHY_TYPE_KR>; + phy-type = <PHY_TYPE_SFI>; }; phy5 { phy-type = <PHY_TYPE_SGMII3>; |