]> git.baikalelectronics.ru Git - kernel.git/commitdiff
net: macb: ignore tx_clk if MII is used
authorMichael Walle <michael@walle.cc>
Wed, 20 Jan 2021 19:43:03 +0000 (20:43 +0100)
committerJakub Kicinski <kuba@kernel.org>
Fri, 22 Jan 2021 03:50:47 +0000 (19:50 -0800)
If the MII interface is used, the PHY is the clock master, thus don't
set the clock rate. On Zynq-7000, this will prevent the following
warning:
  macb e000b000.ethernet eth0: unable to generate target frequency: 25000000 Hz

Signed-off-by: Michael Walle <michael@walle.cc>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Link: https://lore.kernel.org/r/20210120194303.28268-1-michael@walle.cc
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/cadence/macb_main.c

index 814a5b10141d19038fd3ffc17cc5387b18c7aa19..472bf8f220bc6234e0cbf480b143acf33fd3cc04 100644 (file)
@@ -470,6 +470,10 @@ static void macb_set_tx_clk(struct macb *bp, int speed)
        if (!bp->tx_clk || (bp->caps & MACB_CAPS_CLK_HW_CHG))
                return;
 
+       /* In case of MII the PHY is the clock master */
+       if (bp->phy_interface == PHY_INTERFACE_MODE_MII)
+               return;
+
        switch (speed) {
        case SPEED_10:
                rate = 2500000;