at91: kernel v5.15: copy config and patches from 5.10

[openwrt/openwrt.git] / target / linux / at91 / patches-5.15 / 117-net-macb-add-function-to-disable-all-macb-clocks.patch

diff --git a/target/linux/at91/patches-5.15/117-net-macb-add-function-to-disable-all-macb-clocks.patch b/target/linux/at91/patches-5.15/117-net-macb-add-function-to-disable-all-macb-clocks.patch
new file mode 100644 (file)
index 0000000..a474f2a
--- /dev/null
+++ b/target/linux/at91/patches-5.15/117-net-macb-add-function-to-disable-all-macb-clocks.patch
@@ -0,0 +1,82 @@
+From 935d9aae15ee245a1bc6e322cbef02566a8996cc Mon Sep 17 00:00:00 2001
+From: Claudiu Beznea <claudiu.beznea@microchip.com>
+Date: Wed, 9 Dec 2020 15:03:34 +0200
+Subject: [PATCH 117/247] net: macb: add function to disable all macb clocks
+
+Add function to disable all macb clocks.
+
+Signed-off-by: Claudiu Beznea <claudiu.beznea@microchip.com>
+Suggested-by: Andrew Lunn <andrew@lunn.ch>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+---
+ drivers/net/ethernet/cadence/macb_main.c | 38 +++++++++++++-----------
+ 1 file changed, 21 insertions(+), 17 deletions(-)
+
+--- a/drivers/net/ethernet/cadence/macb_main.c
++++ b/drivers/net/ethernet/cadence/macb_main.c
+@@ -3606,6 +3606,20 @@ static void macb_probe_queues(void __iom
+       *num_queues = hweight32(*queue_mask);
+ }
+ 
++static void macb_clks_disable(struct clk *pclk, struct clk *hclk, struct clk *tx_clk,
++                            struct clk *rx_clk, struct clk *tsu_clk)
++{
++      struct clk_bulk_data clks[] = {
++              { .clk = tsu_clk, },
++              { .clk = rx_clk, },
++              { .clk = pclk, },
++              { .clk = hclk, },
++              { .clk = tx_clk },
++      };
++
++      clk_bulk_disable_unprepare(ARRAY_SIZE(clks), clks);
++}
++
+ static int macb_clk_init(struct platform_device *pdev, struct clk **pclk,
+                        struct clk **hclk, struct clk **tx_clk,
+                        struct clk **rx_clk, struct clk **tsu_clk)
+@@ -4668,11 +4682,7 @@ err_out_free_netdev:
+       free_netdev(dev);
+ 
+ err_disable_clocks:
+-      clk_disable_unprepare(tx_clk);
+-      clk_disable_unprepare(hclk);
+-      clk_disable_unprepare(pclk);
+-      clk_disable_unprepare(rx_clk);
+-      clk_disable_unprepare(tsu_clk);
++      macb_clks_disable(pclk, hclk, tx_clk, rx_clk, tsu_clk);
+       pm_runtime_disable(&pdev->dev);
+       pm_runtime_set_suspended(&pdev->dev);
+       pm_runtime_dont_use_autosuspend(&pdev->dev);
+@@ -4697,11 +4707,8 @@ static int macb_remove(struct platform_d
+               pm_runtime_disable(&pdev->dev);
+               pm_runtime_dont_use_autosuspend(&pdev->dev);
+               if (!pm_runtime_suspended(&pdev->dev)) {
+-                      clk_disable_unprepare(bp->tx_clk);
+-                      clk_disable_unprepare(bp->hclk);
+-                      clk_disable_unprepare(bp->pclk);
+-                      clk_disable_unprepare(bp->rx_clk);
+-                      clk_disable_unprepare(bp->tsu_clk);
++                      macb_clks_disable(bp->pclk, bp->hclk, bp->tx_clk,
++                                        bp->rx_clk, bp->tsu_clk);
+                       pm_runtime_set_suspended(&pdev->dev);
+               }
+               phylink_destroy(bp->phylink);
+@@ -4880,13 +4887,10 @@ static int __maybe_unused macb_runtime_s
+       struct net_device *netdev = dev_get_drvdata(dev);
+       struct macb *bp = netdev_priv(netdev);
+ 
+-      if (!(device_may_wakeup(dev))) {
+-              clk_disable_unprepare(bp->tx_clk);
+-              clk_disable_unprepare(bp->hclk);
+-              clk_disable_unprepare(bp->pclk);
+-              clk_disable_unprepare(bp->rx_clk);
+-      }
+-      clk_disable_unprepare(bp->tsu_clk);
++      if (!(device_may_wakeup(dev)))
++              macb_clks_disable(bp->pclk, bp->hclk, bp->tx_clk, bp->rx_clk, bp->tsu_clk);
++      else
++              macb_clks_disable(NULL, NULL, NULL, NULL, bp->tsu_clk);
+ 
+       return 0;
+ }