|
@@ -34,7 +34,7 @@ struct utmi_phy_data {
|
|
|
* PIPE selector include USB and PCIe options.
|
|
|
* PHY selector include the Ethernet and SATA options, every Ethernet
|
|
|
* option has different options, for example: serdes lane2 had option
|
|
|
- * Eth_port_0 that include (SGMII0, XAUI0, RXAUI0, KR)
|
|
|
+ * Eth_port_0 that include (SGMII0, XAUI0, RXAUI0, SFI)
|
|
|
*/
|
|
|
struct comphy_mux_data cp110_comphy_phy_mux_data[] = {
|
|
|
{4, {{PHY_TYPE_UNCONNECTED, 0x0}, {PHY_TYPE_SGMII2, 0x1}, /* Lane 0 */
|
|
@@ -43,13 +43,13 @@ struct comphy_mux_data cp110_comphy_phy_mux_data[] = {
|
|
|
{PHY_TYPE_XAUI3, 0x1}, {PHY_TYPE_SATA0, 0x4} } },
|
|
|
{6, {{PHY_TYPE_UNCONNECTED, 0x0}, {PHY_TYPE_SGMII0, 0x1}, /* Lane 2 */
|
|
|
{PHY_TYPE_XAUI0, 0x1}, {PHY_TYPE_RXAUI0, 0x1},
|
|
|
- {PHY_TYPE_KR, 0x1}, {PHY_TYPE_SATA0, 0x4} } },
|
|
|
+ {PHY_TYPE_SFI, 0x1}, {PHY_TYPE_SATA0, 0x4} } },
|
|
|
{8, {{PHY_TYPE_UNCONNECTED, 0x0}, {PHY_TYPE_SGMII0, 0x1}, /* Lane 3 */
|
|
|
{PHY_TYPE_XAUI0, 0x1}, {PHY_TYPE_RXAUI0, 0x1},
|
|
|
- {PHY_TYPE_KR, 0x1}, {PHY_TYPE_XAUI1, 0x1},
|
|
|
+ {PHY_TYPE_SFI, 0x1}, {PHY_TYPE_XAUI1, 0x1},
|
|
|
{PHY_TYPE_RXAUI1, 0x1}, {PHY_TYPE_SATA1, 0x4} } },
|
|
|
{7, {{PHY_TYPE_UNCONNECTED, 0x0}, {PHY_TYPE_SGMII0, 0x2}, /* Lane 4 */
|
|
|
- {PHY_TYPE_XAUI0, 0x1}, {PHY_TYPE_RXAUI0, 0x1}, {PHY_TYPE_KR, 0x1},
|
|
|
+ {PHY_TYPE_XAUI0, 0x1}, {PHY_TYPE_RXAUI0, 0x1}, {PHY_TYPE_SFI, 0x1},
|
|
|
{PHY_TYPE_SGMII2, 0x1}, {PHY_TYPE_XAUI2, 0x1} } },
|
|
|
{6, {{PHY_TYPE_UNCONNECTED, 0x0}, {PHY_TYPE_XAUI1, 0x1}, /* Lane 5 */
|
|
|
{PHY_TYPE_RXAUI1, 0x1}, {PHY_TYPE_SGMII3, 0x1},
|
|
@@ -907,8 +907,8 @@ static int comphy_sgmii_power_up(u32 lane, u32 sgmii_speed,
|
|
|
return ret;
|
|
|
}
|
|
|
|
|
|
-static int comphy_kr_power_up(u32 lane, void __iomem *hpipe_base,
|
|
|
- void __iomem *comphy_base)
|
|
|
+static int comphy_sfi_power_up(u32 lane, void __iomem *hpipe_base,
|
|
|
+ void __iomem *comphy_base)
|
|
|
{
|
|
|
u32 mask, data, ret = 1;
|
|
|
void __iomem *hpipe_addr = HPIPE_ADDR(hpipe_base, lane);
|
|
@@ -1696,9 +1696,9 @@ int comphy_cp110_init(struct chip_serdes_phy_config *ptr_chip_cfg,
|
|
|
lane, ptr_comphy_map->speed, hpipe_base_addr,
|
|
|
comphy_base_addr);
|
|
|
break;
|
|
|
- case PHY_TYPE_KR:
|
|
|
- ret = comphy_kr_power_up(lane, hpipe_base_addr,
|
|
|
- comphy_base_addr);
|
|
|
+ case PHY_TYPE_SFI:
|
|
|
+ ret = comphy_sfi_power_up(lane, hpipe_base_addr,
|
|
|
+ comphy_base_addr);
|
|
|
break;
|
|
|
case PHY_TYPE_RXAUI0:
|
|
|
case PHY_TYPE_RXAUI1:
|