]> www.infradead.org Git - users/hch/misc.git/commitdiff
net: bcmgenet: BCM7712 is GENETv5 compatible
authorDoug Berger <opendmb@gmail.com>
Thu, 6 Mar 2025 19:26:32 +0000 (11:26 -0800)
committerJakub Kicinski <kuba@kernel.org>
Sat, 8 Mar 2025 03:33:47 +0000 (19:33 -0800)
The major revision of the GENET core in the BCM7712 SoC was bumped
to 7 but it is compatible with the GENETv5 implementation. This
commit maps the version accordingly to avoid a warning.

Signed-off-by: Doug Berger <opendmb@gmail.com>
Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com>
Link: https://patch.msgid.link/20250306192643.2383632-5-opendmb@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/broadcom/genet/bcmgenet.c

index 48830942afa8a6a7e48c9f12e2122dc5c691de31..e6b2a0499edbc2cc9293e4ecd1c5f2d389b9c7bd 100644 (file)
@@ -3825,7 +3825,7 @@ static void bcmgenet_set_hw_params(struct bcmgenet_priv *priv)
        /* Read GENET HW version */
        reg = bcmgenet_sys_readl(priv, SYS_REV_CTRL);
        major = (reg >> 24 & 0x0f);
-       if (major == 6)
+       if (major == 6 || major == 7)
                major = 5;
        else if (major == 5)
                major = 4;