cb1b656027
Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.12.34 Remove upstreamed patches: generic/backport-6.12/421-01-v6.16-spi-bcm63xx-spi-fix-shared-reset.patch [1] generic/backport-6.12/421-02-v6.16-spi-bcm63xx-hsspi-fix-shared-reset.patch [2] generic/backport-6.12/610-06-v6.16-net-dsa-b53-do-not-enable-RGMII-delay-on-bcm63xx.patch [3] generic/backport-6.12/610-08-v6.16-net-dsa-b53-allow-RGMII-for-bcm63xx-RGMII-ports.patch [4] generic/backport-6.12/610-09-v6.16-net-dsa-b53-do-not-touch-DLL_IQQD-on-bcm53115.patch [5] generic/backport-6.12/611-v6.16-net-dsa-tag_brcm-legacy-fix-pskb_may_pull-length.patch [6] Manually rebased patches: bcm27xx/patches-6.12/950-0665-drm-vc4-tests-Drop-drm-parameter-for-vc4_find_crtc_f.patch [7] [1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.34&id=408ca1d1803b223d615f9021055f9ccb4f4863ea [2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.34&id=2a98786e258718ff93ef6d6bd26a9a39076e0cb7 [3] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.34&id=6d1c93a5c6b0ae87bb7001d8d6fdef3b3be9c6c6 [4] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.34&id=1aa31695bf0dc1ee3e6c559c14db7fd05b6bb102 [5] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.34&id=b2fc08d276797e529cacad6fa9d704a7367090b5 [6] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.34&id=2c32fc56c05aa69439fdfd5e0b25f57e2a158627 [7] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.34&id=aba86d49e5ac3700295ab8c417436abacc19cc32 Signed-off-by: Shiji Yang <yangshiji66@outlook.com> Link: https://github.com/openwrt/openwrt/pull/19184 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
76 lines
2.5 KiB
Diff
76 lines
2.5 KiB
Diff
From c4f873c2b65c839ff5e7c996bd9ef5a1e7eae11a Mon Sep 17 00:00:00 2001
|
|
From: Torben Nielsen <torben.nielsen@prevas.dk>
|
|
Date: Mon, 17 Feb 2025 09:05:01 +0100
|
|
Subject: [PATCH] net: dsa: b53: mdio: add support for BCM53101
|
|
|
|
BCM53101 is a ethernet switch, very similar to the BCM53115.
|
|
Enable support for it, in the existing b53 dsa driver.
|
|
|
|
Signed-off-by: Torben Nielsen <torben.nielsen@prevas.dk>
|
|
Signed-off-by: Claus Stovgaard <claus.stovgaard@prevas.dk>
|
|
Link: https://patch.msgid.link/20250217080503.1390282-1-claus.stovgaard@gmail.com
|
|
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
|
---
|
|
drivers/net/dsa/b53/b53_common.c | 14 ++++++++++++++
|
|
drivers/net/dsa/b53/b53_mdio.c | 1 +
|
|
drivers/net/dsa/b53/b53_priv.h | 2 ++
|
|
3 files changed, 17 insertions(+)
|
|
|
|
--- a/drivers/net/dsa/b53/b53_common.c
|
|
+++ b/drivers/net/dsa/b53/b53_common.c
|
|
@@ -2537,6 +2537,19 @@ static const struct b53_chip_data b53_sw
|
|
.jumbo_size_reg = B53_JUMBO_MAX_SIZE,
|
|
},
|
|
{
|
|
+ .chip_id = BCM53101_DEVICE_ID,
|
|
+ .dev_name = "BCM53101",
|
|
+ .vlans = 4096,
|
|
+ .enabled_ports = 0x11f,
|
|
+ .arl_bins = 4,
|
|
+ .arl_buckets = 512,
|
|
+ .vta_regs = B53_VTA_REGS,
|
|
+ .imp_port = 8,
|
|
+ .duplex_reg = B53_DUPLEX_STAT_GE,
|
|
+ .jumbo_pm_reg = B53_JUMBO_PORT_MASK,
|
|
+ .jumbo_size_reg = B53_JUMBO_MAX_SIZE,
|
|
+ },
|
|
+ {
|
|
.chip_id = BCM53115_DEVICE_ID,
|
|
.dev_name = "BCM53115",
|
|
.vlans = 4096,
|
|
@@ -2917,6 +2930,7 @@ int b53_switch_detect(struct b53_device
|
|
return ret;
|
|
|
|
switch (id32) {
|
|
+ case BCM53101_DEVICE_ID:
|
|
case BCM53115_DEVICE_ID:
|
|
case BCM53125_DEVICE_ID:
|
|
case BCM53128_DEVICE_ID:
|
|
--- a/drivers/net/dsa/b53/b53_mdio.c
|
|
+++ b/drivers/net/dsa/b53/b53_mdio.c
|
|
@@ -374,6 +374,7 @@ static void b53_mdio_shutdown(struct mdi
|
|
|
|
static const struct of_device_id b53_of_match[] = {
|
|
{ .compatible = "brcm,bcm5325" },
|
|
+ { .compatible = "brcm,bcm53101" },
|
|
{ .compatible = "brcm,bcm53115" },
|
|
{ .compatible = "brcm,bcm53125" },
|
|
{ .compatible = "brcm,bcm53128" },
|
|
--- a/drivers/net/dsa/b53/b53_priv.h
|
|
+++ b/drivers/net/dsa/b53/b53_priv.h
|
|
@@ -66,6 +66,7 @@ enum {
|
|
BCM5395_DEVICE_ID = 0x95,
|
|
BCM5397_DEVICE_ID = 0x97,
|
|
BCM5398_DEVICE_ID = 0x98,
|
|
+ BCM53101_DEVICE_ID = 0x53101,
|
|
BCM53115_DEVICE_ID = 0x53115,
|
|
BCM53125_DEVICE_ID = 0x53125,
|
|
BCM53128_DEVICE_ID = 0x53128,
|
|
@@ -190,6 +191,7 @@ static inline int is531x5(struct b53_dev
|
|
{
|
|
return dev->chip_id == BCM53115_DEVICE_ID ||
|
|
dev->chip_id == BCM53125_DEVICE_ID ||
|
|
+ dev->chip_id == BCM53101_DEVICE_ID ||
|
|
dev->chip_id == BCM53128_DEVICE_ID ||
|
|
dev->chip_id == BCM53134_DEVICE_ID;
|
|
}
|