Commit f927e8ef authored by Paul Geurts's avatar Paul Geurts Committed by David S. Miller
Browse files

net: dsa: b53: mdio: add support for BCM53134 



Add support for the BCM53134 Ethernet switch in the existing b53 dsa driver.
BCM53134 is very similar to the BCM58XX series.

Signed-off-by: default avatarPaul Geurts <paul.geurts@prodrive-technologies.com>
Signed-off-by: default avatarÁlvaro Fernández Rojas <noltari@gmail.com>
Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a20869b3

drivers/net/dsa/b53/b53_common.c

+15 −0
Original line number Diff line number Diff line
@@ -2613,6 +2613,20 @@ static const struct b53_chip_data b53_switch_chips[] = { 
		.jumbo_pm_reg = B53_JUMBO_PORT_MASK,

		.jumbo_size_reg = B53_JUMBO_MAX_SIZE,

	},

	{

		.chip_id = BCM53134_DEVICE_ID,

		.dev_name = "BCM53134",

		.vlans = 4096,

		.enabled_ports = 0x12f,

		.imp_port = 8,

		.cpu_port = B53_CPU_PORT,

		.vta_regs = B53_VTA_REGS,

		.arl_bins = 4,

		.arl_buckets = 1024,

		.duplex_reg = B53_DUPLEX_STAT_GE,

		.jumbo_pm_reg = B53_JUMBO_PORT_MASK,

		.jumbo_size_reg = B53_JUMBO_MAX_SIZE,

	},

};



static int b53_switch_init(struct b53_device *dev)
@@ -2790,6 +2804,7 @@ int b53_switch_detect(struct b53_device *dev) 
		case BCM53012_DEVICE_ID:

		case BCM53018_DEVICE_ID:

		case BCM53019_DEVICE_ID:

		case BCM53134_DEVICE_ID:

			dev->chip_id = id32;

			break;

		default:

drivers/net/dsa/b53/b53_mdio.c

+4 −1
Original line number Diff line number Diff line
@@ -286,6 +286,7 @@ static const struct b53_io_ops b53_mdio_ops = { 
#define B53_BRCM_OUI_2	0x03625c00

#define B53_BRCM_OUI_3	0x00406000

#define B53_BRCM_OUI_4	0x01410c00

#define B53_BRCM_OUI_5	0xae025000



static int b53_mdio_probe(struct mdio_device *mdiodev)

{
@@ -313,7 +314,8 @@ static int b53_mdio_probe(struct mdio_device *mdiodev) 
	if ((phy_id & 0xfffffc00) != B53_BRCM_OUI_1 &&

	    (phy_id & 0xfffffc00) != B53_BRCM_OUI_2 &&

	    (phy_id & 0xfffffc00) != B53_BRCM_OUI_3 &&

	    (phy_id & 0xfffffc00) != B53_BRCM_OUI_4) {

	    (phy_id & 0xfffffc00) != B53_BRCM_OUI_4 &&

	    (phy_id & 0xfffffc00) != B53_BRCM_OUI_5) {

		dev_err(&mdiodev->dev, "Unsupported device: 0x%08x\n", phy_id);

		return -ENODEV;

	}
@@ -375,6 +377,7 @@ static const struct of_device_id b53_of_match[] = { 
	{ .compatible = "brcm,bcm53115" },

	{ .compatible = "brcm,bcm53125" },

	{ .compatible = "brcm,bcm53128" },

	{ .compatible = "brcm,bcm53134" },

	{ .compatible = "brcm,bcm5365" },

	{ .compatible = "brcm,bcm5389" },

	{ .compatible = "brcm,bcm5395" },

drivers/net/dsa/b53/b53_priv.h

+5 −2
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ enum { 
	BCM583XX_DEVICE_ID = 0x58300,

	BCM7445_DEVICE_ID = 0x7445,

	BCM7278_DEVICE_ID = 0x7278,

	BCM53134_DEVICE_ID = 0x5075,

};



struct b53_pcs {
@@ -187,7 +188,8 @@ static inline int is531x5(struct b53_device *dev) 
{

	return dev->chip_id == BCM53115_DEVICE_ID ||

		dev->chip_id == BCM53125_DEVICE_ID ||

		dev->chip_id == BCM53128_DEVICE_ID;

		dev->chip_id == BCM53128_DEVICE_ID ||

		dev->chip_id == BCM53134_DEVICE_ID;

}



static inline int is63xx(struct b53_device *dev)
@@ -215,7 +217,8 @@ static inline int is58xx(struct b53_device *dev) 
	return dev->chip_id == BCM58XX_DEVICE_ID ||

		dev->chip_id == BCM583XX_DEVICE_ID ||

		dev->chip_id == BCM7445_DEVICE_ID ||

		dev->chip_id == BCM7278_DEVICE_ID;

		dev->chip_id == BCM7278_DEVICE_ID ||

		dev->chip_id == BCM53134_DEVICE_ID;

}



#define B53_63XX_RGMII0	4