Commit 6859d915 authored by Rafał Miłecki's avatar Rafał Miłecki Committed by David S. Miller
Browse files

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



BCM4908 has only 1 RGMII reg for controlling port 7.

Fixes: 73b7a604 ("net: dsa: bcm_sf2: support BCM4908's integrated switch")
Signed-off-by: default avatarRafał Miłecki <rafal@milecki.pl>
Acked-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 55cfeb39

drivers/net/dsa/bcm_sf2.c

+7 −4
Original line number Diff line number Diff line
@@ -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) {
@@ -1223,9 +1228,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,

drivers/net/dsa/bcm_sf2_regs.h

+1 −0
Original line number Diff line number Diff line
@@ -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,