raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-06 01:49:46 +00:00
Code Issues Projects Releases Wiki Activity

phy: broadcom: split out the BCM54213PE from the BCM54210E IDs

Browse Source 
The last nibble is a revision ID, and the 54213pe is a later rev
than the 54210e. Running the 54210e setup code on a 54213pe results
in a broken RGMII interface.

Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
This commit is contained in:
Jonathan Bell
2019-05-14 17:00:41 +01:00
committed by Dom Cobley
parent ace480724b
commit 251d7be278
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/net/phy/broadcom.c
View File

@@ -297,7 +297,8 @@ static void bcm54xx_adjust_rxrefclk(struct phy_device *phydev)
BRCM_PHY_MODEL(phydev) != PHY_ID_BCM50610M && BRCM_PHY_MODEL(phydev) != PHY_ID_BCM50610M &&
BRCM_PHY_MODEL(phydev) != PHY_ID_BCM54210E && BRCM_PHY_MODEL(phydev) != PHY_ID_BCM54210E &&
BRCM_PHY_MODEL(phydev) != PHY_ID_BCM54810 && BRCM_PHY_MODEL(phydev) != PHY_ID_BCM54810 &&
BRCM_PHY_MODEL(phydev) != PHY_ID_BCM54811) BRCM_PHY_MODEL(phydev) != PHY_ID_BCM54811 &&
BRCM_PHY_MODEL(phydev) != PHY_ID_BCM54213PE)
return; return;
val = bcm_phy_read_shadow(phydev, BCM54XX_SHD_SCR3); val = bcm_phy_read_shadow(phydev, BCM54XX_SHD_SCR3);
@@ -1491,7 +1492,7 @@ static struct phy_driver broadcom_drivers[] = {
.link_change_notify = bcm54xx_link_change_notify, .link_change_notify = bcm54xx_link_change_notify,
}, { }, {
.phy_id = PHY_ID_BCM54210E, .phy_id = PHY_ID_BCM54210E,
.phy_id_mask = 0xfffffff0, .phy_id_mask = 0xffffffff,
.name = "Broadcom BCM54210E", .name = "Broadcom BCM54210E",
/* PHY_GBIT_FEATURES */ /* PHY_GBIT_FEATURES */
.flags = PHY_ALWAYS_CALL_SUSPEND, .flags = PHY_ALWAYS_CALL_SUSPEND,
@@ -1508,6 +1509,13 @@ static struct phy_driver broadcom_drivers[] = {
.get_wol = bcm54xx_phy_get_wol, .get_wol = bcm54xx_phy_get_wol,
.set_wol = bcm54xx_phy_set_wol, .set_wol = bcm54xx_phy_set_wol,
.led_brightness_set = bcm_phy_led_brightness_set, .led_brightness_set = bcm_phy_led_brightness_set,
}, {
.phy_id = PHY_ID_BCM54213PE,
.phy_id_mask = 0xffffffff,
.name = "Broadcom BCM54213PE",
/* PHY_GBIT_FEATURES */
.config_init = bcm54xx_config_init,
.config_intr = bcm_phy_config_intr,
}, { }, {
.phy_id = PHY_ID_BCM5461, .phy_id = PHY_ID_BCM5461,
.phy_id_mask = 0xfffffff0, .phy_id_mask = 0xfffffff0,
@@ -1775,7 +1783,8 @@ module_phy_driver(broadcom_drivers);
static const struct mdio_device_id __maybe_unused broadcom_tbl[] = { static const struct mdio_device_id __maybe_unused broadcom_tbl[] = {
{ PHY_ID_BCM5411, 0xfffffff0 }, { PHY_ID_BCM5411, 0xfffffff0 },
{ PHY_ID_BCM5421, 0xfffffff0 }, { PHY_ID_BCM5421, 0xfffffff0 },
{ PHY_ID_BCM54210E, 0xfffffff0 }, { PHY_ID_BCM54210E, 0xffffffff },
{ PHY_ID_BCM54213PE, 0xffffffff },
{ PHY_ID_BCM5461, 0xfffffff0 }, { PHY_ID_BCM5461, 0xfffffff0 },
{ PHY_ID_BCM54612E, 0xfffffff0 }, { PHY_ID_BCM54612E, 0xfffffff0 },
{ PHY_ID_BCM54616S, 0xfffffff0 }, { PHY_ID_BCM54616S, 0xfffffff0 },

1
include/linux/brcmphy.h
View File

@@ -24,6 +24,7 @@
#define PHY_ID_BCM5411 0x00206070 #define PHY_ID_BCM5411 0x00206070
#define PHY_ID_BCM5421 0x002060e0 #define PHY_ID_BCM5421 0x002060e0
#define PHY_ID_BCM54210E 0x600d84a0 #define PHY_ID_BCM54210E 0x600d84a0
#define PHY_ID_BCM54213PE 0x600d84a2
#define PHY_ID_BCM5464 0x002060b0 #define PHY_ID_BCM5464 0x002060b0
#define PHY_ID_BCM5461 0x002060c0 #define PHY_ID_BCM5461 0x002060c0
#define PHY_ID_BCM54612E 0x03625e60 #define PHY_ID_BCM54612E 0x03625e60