KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

kernel: b53: add initial support for switches in BCM5301X

Browse source 
This is also known as BCM470{7,8,9}.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

SVN-Revision: 38712
This commit is contained in:
Hauke Mehrtens 2013-11-10 23:29:59 +00:00
parent f099defc00
commit 72b47e69c4
2 changed files with 87 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

76
target/linux/generic/files/drivers/net/phy/b53/b53_common.c
View file

@ -372,7 +372,7 @@ static void b53_enable_ports(struct b53_device *dev)
*/ */
if (dev->enable_vlan || is_cpu_port(dev, i)) if (dev->enable_vlan || is_cpu_port(dev, i))
pvlan_mask = 0x1ff; pvlan_mask = 0x1ff;
else if (is531x5(dev)) else if (is531x5(dev) || is5301x(dev))
/* BCM53115 may use a different port as cpu port */ /* BCM53115 may use a different port as cpu port */
pvlan_mask = BIT(dev->sw_dev.cpu_port); pvlan_mask = BIT(dev->sw_dev.cpu_port);
else else
@ -396,7 +396,7 @@ static void b53_enable_ports(struct b53_device *dev)
pvlan_mask); pvlan_mask);
/* port state is handled by bcm63xx_enet driver */ /* port state is handled by bcm63xx_enet driver */
if (!is63xx(dev)) if (!is63xx(dev) && !(is5301x(dev) && i == 6))
b53_write8(dev, B53_CTRL_PAGE, B53_PORT_CTRL(i), b53_write8(dev, B53_CTRL_PAGE, B53_PORT_CTRL(i),
port_ctrl); port_ctrl);
} }
@ -523,7 +523,7 @@ static int b53_switch_reset(struct b53_device *dev)
return -EINVAL; return -EINVAL;
} }
} }
} else if (is531x5(dev) && dev->sw_dev.cpu_port == B53_CPU_PORT) { } else if ((is531x5(dev) || is5301x(dev)) && dev->sw_dev.cpu_port == B53_CPU_PORT) {
u8 mii_port_override; u8 mii_port_override;
b53_read8(dev, B53_CTRL_PAGE, B53_PORT_OVERRIDE_CTRL, b53_read8(dev, B53_CTRL_PAGE, B53_PORT_OVERRIDE_CTRL,
@ -1140,6 +1140,71 @@ static const struct b53_chip_data b53_switch_chips[] = {
.jumbo_size_reg = B53_JUMBO_MAX_SIZE_63XX, .jumbo_size_reg = B53_JUMBO_MAX_SIZE_63XX,
.sw_ops = &b53_switch_ops, .sw_ops = &b53_switch_ops,
}, },
{
.chip_id = BCM53010_DEVICE_ID,
.dev_name = "BCM53010",
.alias = "bcm53011",
.vlans = 4096,
.enabled_ports = 0x1f,
.cpu_port = B53_CPU_PORT_25, // TODO: auto detect
.vta_regs = B53_VTA_REGS,
.duplex_reg = B53_DUPLEX_STAT_GE,
.jumbo_pm_reg = B53_JUMBO_PORT_MASK,
.jumbo_size_reg = B53_JUMBO_MAX_SIZE,
.sw_ops = &b53_switch_ops,
},
{
.chip_id = BCM53011_DEVICE_ID,
.dev_name = "BCM53011",
.alias = "bcm53011",
.vlans = 4096,
.enabled_ports = 0x1f,
.cpu_port = B53_CPU_PORT_25, // TODO: auto detect
.vta_regs = B53_VTA_REGS,
.duplex_reg = B53_DUPLEX_STAT_GE,
.jumbo_pm_reg = B53_JUMBO_PORT_MASK,
.jumbo_size_reg = B53_JUMBO_MAX_SIZE,
.sw_ops = &b53_switch_ops,
},
{
.chip_id = BCM53012_DEVICE_ID,
.dev_name = "BCM53012",
.alias = "bcm53011",
.vlans = 4096,
.enabled_ports = 0x1f,
.cpu_port = B53_CPU_PORT_25, // TODO: auto detect
.vta_regs = B53_VTA_REGS,
.duplex_reg = B53_DUPLEX_STAT_GE,
.jumbo_pm_reg = B53_JUMBO_PORT_MASK,
.jumbo_size_reg = B53_JUMBO_MAX_SIZE,
.sw_ops = &b53_switch_ops,
},
{
.chip_id = BCM53018_DEVICE_ID,
.dev_name = "BCM53018",
.alias = "bcm53018",
.vlans = 4096,
.enabled_ports = 0x1f,
.cpu_port = B53_CPU_PORT_25, // TODO: auto detect
.vta_regs = B53_VTA_REGS,
.duplex_reg = B53_DUPLEX_STAT_GE,
.jumbo_pm_reg = B53_JUMBO_PORT_MASK,
.jumbo_size_reg = B53_JUMBO_MAX_SIZE,
.sw_ops = &b53_switch_ops,
},
{
.chip_id = BCM53019_DEVICE_ID,
.dev_name = "BCM53019",
.alias = "bcm53019",
.vlans = 4096,
.enabled_ports = 0x1f,
.cpu_port = B53_CPU_PORT_25, // TODO: auto detect
.vta_regs = B53_VTA_REGS,
.duplex_reg = B53_DUPLEX_STAT_GE,
.jumbo_pm_reg = B53_JUMBO_PORT_MASK,
.jumbo_size_reg = B53_JUMBO_MAX_SIZE,
.sw_ops = &b53_switch_ops,
},
}; };
int b53_switch_init(struct b53_device *dev) int b53_switch_init(struct b53_device *dev)
@ -1296,6 +1361,11 @@ int b53_switch_detect(struct b53_device *dev)
switch (id32) { switch (id32) {
case BCM53115_DEVICE_ID: case BCM53115_DEVICE_ID:
case BCM53125_DEVICE_ID: case BCM53125_DEVICE_ID:
case BCM53010_DEVICE_ID:
case BCM53011_DEVICE_ID:
case BCM53012_DEVICE_ID:
case BCM53018_DEVICE_ID:
case BCM53019_DEVICE_ID:
dev->chip_id = id32; dev->chip_id = id32;
break; break;
default: default:

14
target/linux/generic/files/drivers/net/phy/b53/b53_priv.h
View file

@ -47,6 +47,11 @@ enum {
BCM53115_DEVICE_ID = 0x53115, BCM53115_DEVICE_ID = 0x53115,
BCM53125_DEVICE_ID = 0x53125, BCM53125_DEVICE_ID = 0x53125,
BCM63XX_DEVICE_ID = 0x6300, BCM63XX_DEVICE_ID = 0x6300,
BCM53010_DEVICE_ID = 0x53010,
BCM53011_DEVICE_ID = 0x53011,
BCM53012_DEVICE_ID = 0x53012,
BCM53018_DEVICE_ID = 0x53018,
BCM53019_DEVICE_ID = 0x53019,
}; };
#define B53_N_PORTS 9 #define B53_N_PORTS 9
@ -144,6 +149,15 @@ static inline int is63xx(struct b53_device *dev)
#endif #endif
} }
static inline int is5301x(struct b53_device *dev)
{
return dev->chip_id == BCM53010_DEVICE_ID ||
dev->chip_id == BCM53011_DEVICE_ID ||
dev->chip_id == BCM53012_DEVICE_ID ||
dev->chip_id == BCM53018_DEVICE_ID ||
dev->chip_id == BCM53019_DEVICE_ID;
}
#define B53_CPU_PORT_25 5 #define B53_CPU_PORT_25 5
#define B53_CPU_PORT 8 #define B53_CPU_PORT 8