]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
net: mvpp2: Fix GoP port 3 Networking Complex Control configurations
authorStefan Chulski <stefanc@marvell.com>
Sun, 20 Dec 2020 11:02:29 +0000 (13:02 +0200)
committerJakub Kicinski <kuba@kernel.org>
Tue, 22 Dec 2020 01:48:46 +0000 (17:48 -0800)
During GoP port 2 Networking Complex Control mode of operation configurations,
also GoP port 3 mode of operation was wrongly set.
Patch removes these configurations.

Fixes: f84bf386f395 ("net: mvpp2: initialize the GoP")
Acked-by: Marcin Wojtas <mw@semihalf.com>
Signed-off-by: Stefan Chulski <stefanc@marvell.com>
Link: https://lore.kernel.org/r/1608462149-1702-1-git-send-email-stefanc@marvell.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c

index 0f18d034ce3e841ef7aff6cb14f6f6de6991be2d..f20b31327027006d9450bb1ad6fec84b5eae39ad 100644 (file)
@@ -1231,7 +1231,7 @@ static void mvpp22_gop_init_rgmii(struct mvpp2_port *port)
 
        regmap_read(priv->sysctrl_base, GENCONF_CTRL0, &val);
        if (port->gop_id == 2)
-               val |= GENCONF_CTRL0_PORT0_RGMII | GENCONF_CTRL0_PORT1_RGMII;
+               val |= GENCONF_CTRL0_PORT0_RGMII;
        else if (port->gop_id == 3)
                val |= GENCONF_CTRL0_PORT1_RGMII_MII;
        regmap_write(priv->sysctrl_base, GENCONF_CTRL0, val);