Commit aafc66f1 authored by Florian Fainelli's avatar Florian Fainelli Committed by David S. Miller

net: dsa: bcm_sf2: Utilize BRCM_PSEUDO_PHY_ADDR

Utilize the newly introduced BRCM_PSEUDO_PHY_ADDR constant from
brcmphy.h instead of open-coding the Broadcom Ethernet switches
pseudo-PHY address (30).
Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4447d2ad
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
#include <net/dsa.h> #include <net/dsa.h>
#include <linux/ethtool.h> #include <linux/ethtool.h>
#include <linux/if_bridge.h> #include <linux/if_bridge.h>
#include <linux/brcmphy.h>
#include "bcm_sf2.h" #include "bcm_sf2.h"
#include "bcm_sf2_regs.h" #include "bcm_sf2_regs.h"
...@@ -697,7 +698,7 @@ static int bcm_sf2_sw_setup(struct dsa_switch *ds) ...@@ -697,7 +698,7 @@ static int bcm_sf2_sw_setup(struct dsa_switch *ds)
/* Include the pseudo-PHY address and the broadcast PHY address to /* Include the pseudo-PHY address and the broadcast PHY address to
* divert reads towards our workaround * divert reads towards our workaround
*/ */
ds->phys_mii_mask |= ((1 << 30) | (1 << 0)); ds->phys_mii_mask |= ((1 << BRCM_PSEUDO_PHY_ADDR) | (1 << 0));
rev = reg_readl(priv, REG_SWITCH_REVISION); rev = reg_readl(priv, REG_SWITCH_REVISION);
priv->hw_params.top_rev = (rev >> SWITCH_TOP_REV_SHIFT) & priv->hw_params.top_rev = (rev >> SWITCH_TOP_REV_SHIFT) &
...@@ -782,7 +783,7 @@ static int bcm_sf2_sw_phy_read(struct dsa_switch *ds, int addr, int regnum) ...@@ -782,7 +783,7 @@ static int bcm_sf2_sw_phy_read(struct dsa_switch *ds, int addr, int regnum)
*/ */
switch (addr) { switch (addr) {
case 0: case 0:
case 30: case BRCM_PSEUDO_PHY_ADDR:
return bcm_sf2_sw_indir_rw(ds, 1, addr, regnum, 0); return bcm_sf2_sw_indir_rw(ds, 1, addr, regnum, 0);
default: default:
return 0xffff; return 0xffff;
...@@ -797,7 +798,7 @@ static int bcm_sf2_sw_phy_write(struct dsa_switch *ds, int addr, int regnum, ...@@ -797,7 +798,7 @@ static int bcm_sf2_sw_phy_write(struct dsa_switch *ds, int addr, int regnum,
*/ */
switch (addr) { switch (addr) {
case 0: case 0:
case 30: case BRCM_PSEUDO_PHY_ADDR:
bcm_sf2_sw_indir_rw(ds, 0, addr, regnum, val); bcm_sf2_sw_indir_rw(ds, 0, addr, regnum, val);
break; break;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment