Commit 38493da4 authored by Claudiu Beznea's avatar Claudiu Beznea Committed by David S. Miller

net: macb: add function to disable all macb clocks

Add function to disable all macb clocks.
Signed-off-by: default avatarClaudiu Beznea <claudiu.beznea@microchip.com>
Suggested-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent daafa1d3
...@@ -3694,6 +3694,20 @@ static void macb_probe_queues(void __iomem *mem, ...@@ -3694,6 +3694,20 @@ static void macb_probe_queues(void __iomem *mem,
*num_queues = hweight32(*queue_mask); *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, static int macb_clk_init(struct platform_device *pdev, struct clk **pclk,
struct clk **hclk, struct clk **tx_clk, struct clk **hclk, struct clk **tx_clk,
struct clk **rx_clk, struct clk **tsu_clk) struct clk **rx_clk, struct clk **tsu_clk)
...@@ -4755,11 +4769,7 @@ static int macb_probe(struct platform_device *pdev) ...@@ -4755,11 +4769,7 @@ static int macb_probe(struct platform_device *pdev)
free_netdev(dev); free_netdev(dev);
err_disable_clocks: err_disable_clocks:
clk_disable_unprepare(tx_clk); macb_clks_disable(pclk, hclk, tx_clk, rx_clk, tsu_clk);
clk_disable_unprepare(hclk);
clk_disable_unprepare(pclk);
clk_disable_unprepare(rx_clk);
clk_disable_unprepare(tsu_clk);
pm_runtime_disable(&pdev->dev); pm_runtime_disable(&pdev->dev);
pm_runtime_set_suspended(&pdev->dev); pm_runtime_set_suspended(&pdev->dev);
pm_runtime_dont_use_autosuspend(&pdev->dev); pm_runtime_dont_use_autosuspend(&pdev->dev);
...@@ -4784,11 +4794,8 @@ static int macb_remove(struct platform_device *pdev) ...@@ -4784,11 +4794,8 @@ static int macb_remove(struct platform_device *pdev)
pm_runtime_disable(&pdev->dev); pm_runtime_disable(&pdev->dev);
pm_runtime_dont_use_autosuspend(&pdev->dev); pm_runtime_dont_use_autosuspend(&pdev->dev);
if (!pm_runtime_suspended(&pdev->dev)) { if (!pm_runtime_suspended(&pdev->dev)) {
clk_disable_unprepare(bp->tx_clk); macb_clks_disable(bp->pclk, bp->hclk, bp->tx_clk,
clk_disable_unprepare(bp->hclk); bp->rx_clk, bp->tsu_clk);
clk_disable_unprepare(bp->pclk);
clk_disable_unprepare(bp->rx_clk);
clk_disable_unprepare(bp->tsu_clk);
pm_runtime_set_suspended(&pdev->dev); pm_runtime_set_suspended(&pdev->dev);
} }
phylink_destroy(bp->phylink); phylink_destroy(bp->phylink);
...@@ -4967,13 +4974,10 @@ static int __maybe_unused macb_runtime_suspend(struct device *dev) ...@@ -4967,13 +4974,10 @@ static int __maybe_unused macb_runtime_suspend(struct device *dev)
struct net_device *netdev = dev_get_drvdata(dev); struct net_device *netdev = dev_get_drvdata(dev);
struct macb *bp = netdev_priv(netdev); struct macb *bp = netdev_priv(netdev);
if (!(device_may_wakeup(dev))) { if (!(device_may_wakeup(dev)))
clk_disable_unprepare(bp->tx_clk); macb_clks_disable(bp->pclk, bp->hclk, bp->tx_clk, bp->rx_clk, bp->tsu_clk);
clk_disable_unprepare(bp->hclk); else
clk_disable_unprepare(bp->pclk); macb_clks_disable(NULL, NULL, NULL, NULL, bp->tsu_clk);
clk_disable_unprepare(bp->rx_clk);
}
clk_disable_unprepare(bp->tsu_clk);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment