Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ddeec083 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'b53-nsp-switch' 



Florian Fainelli says:

====================
net: dsa: b53: Add Broadcom NSP switch support

This patch series updates the B53 driver to support Broadcom's Northstar Plus
Soc integrated switch.

Unlike the version of the core present in BCM5301x/Northstar, we cannot read the
full chip id of the switch, so we need to get the information about our switch
id from Device Tree.

Other than that, this is a regular Broadcom Ethernet switch which is register
compatible for all practical purposes with the existing switch driver.

Since DSA requires a working CPU Ethernet MAC driver this depends on Jon
Mason's AMAC/BGMAC driver changes to support NSP. Board specific changes depend
on patches present in Broadcom's ARM SoC branches and will be posted in a short
while.
====================

Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents fb3bbdb8 991a36bb

Documentation/devicetree/bindings/net/dsa/b53.txt

+9 −0
Original line number Diff line number Diff line
@@ -20,6 +20,15 @@ Required properties: 
      "brcm,bcm53018-srab"

      "brcm,bcm53019-srab" and the mandatory "brcm,bcm5301x-srab" string



  For the BCM585xx/586XX/88312 SoCs with an integrated switch, must be one of:

      "brcm,bcm58522-srab"

      "brcm,bcm58523-srab"

      "brcm,bcm58525-srab"

      "brcm,bcm58622-srab"

      "brcm,bcm58623-srab"

      "brcm,bcm58625-srab"

      "brcm,bcm88312-srab" and the mandatory "brcm,nsp-srab string



  For the BCM63xx/33xx SoCs with an integrated switch, must be one of:

      "brcm,bcm3384-switch"

      "brcm,bcm6328-switch"

drivers/net/dsa/b53/b53_common.c

+12 −0
Original line number Diff line number Diff line
@@ -1581,6 +1581,18 @@ 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 = BCM58XX_DEVICE_ID,

		.dev_name = "BCM585xx/586xx/88312",

		.vlans	= 4096,

		.enabled_ports = 0x1ff,

		.arl_entries = 4,

		.cpu_port = B53_CPU_PORT_25,

		.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,

	},

};



static int b53_switch_init(struct b53_device *dev)

drivers/net/dsa/b53/b53_priv.h

+1 −0
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ enum { 
	BCM53012_DEVICE_ID = 0x53012,

	BCM53018_DEVICE_ID = 0x53018,

	BCM53019_DEVICE_ID = 0x53019,

	BCM58XX_DEVICE_ID = 0x5800,

};



#define B53_N_PORTS	9

drivers/net/dsa/b53/b53_srab.c

+37 −10
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <linux/delay.h>

#include <linux/platform_device.h>

#include <linux/platform_data/b53.h>

#include <linux/of.h>



#include "b53_priv.h"
@@ -356,12 +357,45 @@ static struct b53_io_ops b53_srab_ops = { 
	.write64 = b53_srab_write64,

};



static const struct of_device_id b53_srab_of_match[] = {

	{ .compatible = "brcm,bcm53010-srab" },

	{ .compatible = "brcm,bcm53011-srab" },

	{ .compatible = "brcm,bcm53012-srab" },

	{ .compatible = "brcm,bcm53018-srab" },

	{ .compatible = "brcm,bcm53019-srab" },

	{ .compatible = "brcm,bcm5301x-srab" },

	{ .compatible = "brcm,bcm58522-srab", .data = (void *)BCM58XX_DEVICE_ID },

	{ .compatible = "brcm,bcm58525-srab", .data = (void *)BCM58XX_DEVICE_ID },

	{ .compatible = "brcm,bcm58535-srab", .data = (void *)BCM58XX_DEVICE_ID },

	{ .compatible = "brcm,bcm58622-srab", .data = (void *)BCM58XX_DEVICE_ID },

	{ .compatible = "brcm,bcm58623-srab", .data = (void *)BCM58XX_DEVICE_ID },

	{ .compatible = "brcm,bcm58625-srab", .data = (void *)BCM58XX_DEVICE_ID },

	{ .compatible = "brcm,bcm88312-srab", .data = (void *)BCM58XX_DEVICE_ID },

	{ .compatible = "brcm,nsp-srab", .data = (void *)BCM58XX_DEVICE_ID },

	{ /* sentinel */ },

};

MODULE_DEVICE_TABLE(of, b53_srab_of_match);



static int b53_srab_probe(struct platform_device *pdev)

{

	struct b53_platform_data *pdata = pdev->dev.platform_data;

	struct device_node *dn = pdev->dev.of_node;

	const struct of_device_id *of_id = NULL;

	struct b53_srab_priv *priv;

	struct b53_device *dev;

	struct resource *r;



	if (dn)

		of_id = of_match_node(b53_srab_of_match, dn);



	if (of_id) {

		pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL);

		if (!pdata)

			return -ENOMEM;



		pdata->chip_id = (u32)of_id->data;

	}



	priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL);

	if (!priv)

		return -ENOMEM;
@@ -375,6 +409,9 @@ static int b53_srab_probe(struct platform_device *pdev) 
	if (!dev)

		return -ENOMEM;



	if (pdata)

		dev->pdata = pdata;



	platform_set_drvdata(pdev, dev);



	return b53_switch_register(dev);
@@ -390,16 +427,6 @@ static int b53_srab_remove(struct platform_device *pdev) 
	return 0;

}



static const struct of_device_id b53_srab_of_match[] = {

	{ .compatible = "brcm,bcm53010-srab" },

	{ .compatible = "brcm,bcm53011-srab" },

	{ .compatible = "brcm,bcm53012-srab" },

	{ .compatible = "brcm,bcm53018-srab" },

	{ .compatible = "brcm,bcm53019-srab" },

	{ .compatible = "brcm,bcm5301x-srab" },

	{ /* sentinel */ },

};



static struct platform_driver b53_srab_driver = {

	.probe = b53_srab_probe,

	.remove = b53_srab_remove,