net: dsa: b53: mmap: allow passing a chip ID

BCM6318 and BCM63268 SoCs require a special handling for their RGMIIs, so we
should be able to identify them as a special BCM63xx switch.

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Reviewed-by: Simon Horman <simon.horman@corigine.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/dsa/b53/b53_common.c b/drivers/net/dsa/b53/b53_common.c
index 6e212f6f1cb9b42692f716351f33fef3e6846af6..97327d7a6760c99d833e1353deb49fa421d6d94a 100644 (file)
--- a/drivers/net/dsa/b53/b53_common.c
+++ b/drivers/net/dsa/b53/b53_common.c
@@ -2465,6 +2465,19 @@ static const struct b53_chip_data b53_switch_chips[] = {
                .jumbo_pm_reg = B53_JUMBO_PORT_MASK_63XX,
                .jumbo_size_reg = B53_JUMBO_MAX_SIZE_63XX,
        },
+       {
+               .chip_id = BCM63268_DEVICE_ID,
+               .dev_name = "BCM63268",
+               .vlans = 4096,
+               .enabled_ports = 0, /* pdata must provide them */
+               .arl_bins = 4,
+               .arl_buckets = 1024,
+               .imp_port = 8,
+               .vta_regs = B53_VTA_REGS_63XX,
+               .duplex_reg = B53_DUPLEX_STAT_63XX,
+               .jumbo_pm_reg = B53_JUMBO_PORT_MASK_63XX,
+               .jumbo_size_reg = B53_JUMBO_MAX_SIZE_63XX,
+       },
        {
                .chip_id = BCM53010_DEVICE_ID,
                .dev_name = "BCM53010",

diff --git a/drivers/net/dsa/b53/b53_mmap.c b/drivers/net/dsa/b53/b53_mmap.c
index f63aebd445e88e9b0f8b03e0a12c0ef6064522bd..a83a0c9d6939a7f23d862f1c919ce16672beba5e 100644 (file)
--- a/drivers/net/dsa/b53/b53_mmap.c
+++ b/drivers/net/dsa/b53/b53_mmap.c
@@ -248,7 +248,7 @@ static int b53_mmap_probe_of(struct platform_device *pdev,
                return -ENOMEM;
 
        pdata->regs = mem;
-       pdata->chip_id = BCM63XX_DEVICE_ID;
+       pdata->chip_id = (u32)(unsigned long)device_get_match_data(dev);
        pdata->big_endian = of_property_read_bool(np, "big-endian");
 
        of_ports = of_get_child_by_name(np, "ports");
@@ -330,14 +330,28 @@ static void b53_mmap_shutdown(struct platform_device *pdev)
 }
 
 static const struct of_device_id b53_mmap_of_table[] = {
-       { .compatible = "brcm,bcm3384-switch" },
-       { .compatible = "brcm,bcm6318-switch" },
-       { .compatible = "brcm,bcm6328-switch" },
-       { .compatible = "brcm,bcm6362-switch" },
-       { .compatible = "brcm,bcm6368-switch" },
-       { .compatible = "brcm,bcm63268-switch" },
-       { .compatible = "brcm,bcm63xx-switch" },
-       { /* sentinel */ },
+       {
+               .compatible = "brcm,bcm3384-switch",
+               .data = (void *)BCM63XX_DEVICE_ID,
+       }, {
+               .compatible = "brcm,bcm6318-switch",
+               .data = (void *)BCM63268_DEVICE_ID,
+       }, {
+               .compatible = "brcm,bcm6328-switch",
+               .data = (void *)BCM63XX_DEVICE_ID,
+       }, {
+               .compatible = "brcm,bcm6362-switch",
+               .data = (void *)BCM63XX_DEVICE_ID,
+       }, {
+               .compatible = "brcm,bcm6368-switch",
+               .data = (void *)BCM63XX_DEVICE_ID,
+       }, {
+               .compatible = "brcm,bcm63268-switch",
+               .data = (void *)BCM63268_DEVICE_ID,
+       }, {
+               .compatible = "brcm,bcm63xx-switch",
+               .data = (void *)BCM63XX_DEVICE_ID,
+       }, { /* sentinel */ }
 };
 MODULE_DEVICE_TABLE(of, b53_mmap_of_table);
 

diff --git a/drivers/net/dsa/b53/b53_priv.h b/drivers/net/dsa/b53/b53_priv.h
index 4cf9f540696e3f5fa3eb8b3aa01312b9c803f4dd..a689a69501895a5d28237de5e843d9d1b832f8b5 100644 (file)
--- a/drivers/net/dsa/b53/b53_priv.h
+++ b/drivers/net/dsa/b53/b53_priv.h
@@ -70,6 +70,7 @@ enum {
        BCM53125_DEVICE_ID = 0x53125,
        BCM53128_DEVICE_ID = 0x53128,
        BCM63XX_DEVICE_ID = 0x6300,
+       BCM63268_DEVICE_ID = 0x63268,
        BCM53010_DEVICE_ID = 0x53010,
        BCM53011_DEVICE_ID = 0x53011,
        BCM53012_DEVICE_ID = 0x53012,
@@ -191,7 +192,13 @@ static inline int is531x5(struct b53_device *dev)
 
 static inline int is63xx(struct b53_device *dev)
 {
-       return dev->chip_id == BCM63XX_DEVICE_ID;
+       return dev->chip_id == BCM63XX_DEVICE_ID ||
+               dev->chip_id == BCM63268_DEVICE_ID;
+}
+
+static inline int is63268(struct b53_device *dev)
+{
+       return dev->chip_id == BCM63268_DEVICE_ID;
 }
 
 static inline int is5301x(struct b53_device *dev)