net: dsa: bcm_sf2: fix BCM4908 RGMII reg(s)

[ Upstream commit 6859d91549341c2ad769d482de58129f080c0f04 ]

BCM4908 has only 1 RGMII reg for controlling port 7.

Fixes: 73b7a6047971 ("net: dsa: bcm_sf2: support BCM4908's integrated switch")
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
Acked-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/net/dsa/bcm_sf2.c b/drivers/net/dsa/bcm_sf2.c
index cd64b7f471b5b37653d4823d4c2286190d938709..9c86cacc4a7271ef34b2ae212e0c20c4c38a7fe7 100644 (file)
--- a/drivers/net/dsa/bcm_sf2.c
+++ b/drivers/net/dsa/bcm_sf2.c
@@ -36,7 +36,12 @@ static u16 bcm_sf2_reg_rgmii_cntrl(struct bcm_sf2_priv *priv, int port)
 {
        switch (priv->type) {
        case BCM4908_DEVICE_ID:
-               /* TODO */
+               switch (port) {
+               case 7:
+                       return REG_RGMII_11_CNTRL;
+               default:
+                       break;
+               }
                break;
        default:
                switch (port) {
@@ -1179,9 +1184,7 @@ static const u16 bcm_sf2_4908_reg_offsets[] = {
        [REG_PHY_REVISION]      = 0x14,
        [REG_SPHY_CNTRL]        = 0x24,
        [REG_CROSSBAR]          = 0xc8,
-       [REG_RGMII_0_CNTRL]     = 0xe0,
-       [REG_RGMII_1_CNTRL]     = 0xec,
-       [REG_RGMII_2_CNTRL]     = 0xf8,
+       [REG_RGMII_11_CNTRL]    = 0x014c,
        [REG_LED_0_CNTRL]       = 0x40,
        [REG_LED_1_CNTRL]       = 0x4c,
        [REG_LED_2_CNTRL]       = 0x58,

diff --git a/drivers/net/dsa/bcm_sf2_regs.h b/drivers/net/dsa/bcm_sf2_regs.h
index c7783cb4584555ba848ad8378760bb48e2411c61..9e141d1a0b07c43deb47af81363bdc007af2c191 100644 (file)
--- a/drivers/net/dsa/bcm_sf2_regs.h
+++ b/drivers/net/dsa/bcm_sf2_regs.h
@@ -21,6 +21,7 @@ enum bcm_sf2_reg_offs {
        REG_RGMII_0_CNTRL,
        REG_RGMII_1_CNTRL,
        REG_RGMII_2_CNTRL,
+       REG_RGMII_11_CNTRL,
        REG_LED_0_CNTRL,
        REG_LED_1_CNTRL,
        REG_LED_2_CNTRL,