net: macb: Support clock management for tsu_clk

TSU clock needs to be enabled/disabled as per support in devicetree
and it should also be controlled during suspend/resume (WOL has no
dependency on this clock).

Signed-off-by: Harini Katakam <harini.katakam@xilinx.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/cadence/macb.h b/drivers/net/ethernet/cadence/macb.h
index f51040fedcf5dc250b86a2c89988246d76c27399..acc66a7e7b95e5af618a7fef300957ca3edf2207 100644 (file)
--- a/drivers/net/ethernet/cadence/macb.h
+++ b/drivers/net/ethernet/cadence/macb.h
@@ -1085,7 +1085,7 @@ struct macb_config {
        unsigned int            dma_burst_length;
        int     (*clk_init)(struct platform_device *pdev, struct clk **pclk,
                            struct clk **hclk, struct clk **tx_clk,
-                           struct clk **rx_clk);
+                           struct clk **rx_clk, struct clk **tsu_clk);
        int     (*init)(struct platform_device *pdev);
        int     jumbo_max_len;
 };
@@ -1165,6 +1165,7 @@ struct macb {
        struct clk              *hclk;
        struct clk              *tx_clk;
        struct clk              *rx_clk;
+       struct clk              *tsu_clk;
        struct net_device       *dev;
        union {
                struct macb_stats       macb;

diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c
index a19ed2b62181fbac07ad98cf104b020213e08d25..be10ee4c791fc0880a47a47876f93aaf8b855b42 100644 (file)
--- a/drivers/net/ethernet/cadence/macb_main.c
+++ b/drivers/net/ethernet/cadence/macb_main.c
@@ -3325,7 +3325,7 @@ static void macb_probe_queues(void __iomem *mem,
 
 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 **rx_clk, struct clk **tsu_clk)
 {
        struct macb_platform_data *pdata;
        int err;
@@ -3359,6 +3359,10 @@ static int macb_clk_init(struct platform_device *pdev, struct clk **pclk,
        if (IS_ERR(*rx_clk))
                *rx_clk = NULL;
 
+       *tsu_clk = devm_clk_get(&pdev->dev, "tsu_clk");
+       if (IS_ERR(*tsu_clk))
+               *tsu_clk = NULL;
+
        err = clk_prepare_enable(*pclk);
        if (err) {
                dev_err(&pdev->dev, "failed to enable pclk (%u)\n", err);
@@ -3383,8 +3387,17 @@ static int macb_clk_init(struct platform_device *pdev, struct clk **pclk,
                goto err_disable_txclk;
        }
 
+       err = clk_prepare_enable(*tsu_clk);
+       if (err) {
+               dev_err(&pdev->dev, "failed to enable tsu_clk (%u)\n", err);
+               goto err_disable_rxclk;
+       }
+
        return 0;
 
+err_disable_rxclk:
+       clk_disable_unprepare(*rx_clk);
+
 err_disable_txclk:
        clk_disable_unprepare(*tx_clk);
 
@@ -3835,13 +3848,14 @@ static const struct net_device_ops at91ether_netdev_ops = {
 
 static int at91ether_clk_init(struct platform_device *pdev, struct clk **pclk,
                              struct clk **hclk, struct clk **tx_clk,
-                             struct clk **rx_clk)
+                             struct clk **rx_clk, struct clk **tsu_clk)
 {
        int err;
 
        *hclk = NULL;
        *tx_clk = NULL;
        *rx_clk = NULL;
+       *tsu_clk = NULL;
 
        *pclk = devm_clk_get(&pdev->dev, "ether_clk");
        if (IS_ERR(*pclk))
@@ -3992,11 +4006,12 @@ static int macb_probe(struct platform_device *pdev)
 {
        const struct macb_config *macb_config = &default_gem_config;
        int (*clk_init)(struct platform_device *, struct clk **,
-                       struct clk **, struct clk **,  struct clk **)
-                                             = macb_config->clk_init;
+                       struct clk **, struct clk **,  struct clk **,
+                       struct clk **) = macb_config->clk_init;
        int (*init)(struct platform_device *) = macb_config->init;
        struct device_node *np = pdev->dev.of_node;
        struct clk *pclk, *hclk = NULL, *tx_clk = NULL, *rx_clk = NULL;
+       struct clk *tsu_clk = NULL;
        unsigned int queue_mask, num_queues;
        struct macb_platform_data *pdata;
        bool native_io;
@@ -4024,7 +4039,7 @@ static int macb_probe(struct platform_device *pdev)
                }
        }
 
-       err = clk_init(pdev, &pclk, &hclk, &tx_clk, &rx_clk);
+       err = clk_init(pdev, &pclk, &hclk, &tx_clk, &rx_clk, &tsu_clk);
        if (err)
                return err;
 
@@ -4061,6 +4076,7 @@ static int macb_probe(struct platform_device *pdev)
        bp->hclk = hclk;
        bp->tx_clk = tx_clk;
        bp->rx_clk = rx_clk;
+       bp->tsu_clk = tsu_clk;
        if (macb_config)
                bp->jumbo_max_len = macb_config->jumbo_max_len;
 
@@ -4180,6 +4196,7 @@ err_disable_clocks:
        clk_disable_unprepare(hclk);
        clk_disable_unprepare(pclk);
        clk_disable_unprepare(rx_clk);
+       clk_disable_unprepare(tsu_clk);
 
        return err;
 }
@@ -4207,6 +4224,7 @@ static int macb_remove(struct platform_device *pdev)
                clk_disable_unprepare(bp->hclk);
                clk_disable_unprepare(bp->pclk);
                clk_disable_unprepare(bp->rx_clk);
+               clk_disable_unprepare(bp->tsu_clk);
                of_node_put(bp->phy_node);
                free_netdev(dev);
        }
@@ -4232,6 +4250,7 @@ static int __maybe_unused macb_suspend(struct device *dev)
                clk_disable_unprepare(bp->pclk);
                clk_disable_unprepare(bp->rx_clk);
        }
+       clk_disable_unprepare(bp->tsu_clk);
 
        return 0;
 }
@@ -4251,6 +4270,7 @@ static int __maybe_unused macb_resume(struct device *dev)
                clk_prepare_enable(bp->tx_clk);
                clk_prepare_enable(bp->rx_clk);
        }
+       clk_prepare_enable(bp->tsu_clk);
 
        netif_device_attach(netdev);