diff options
author | John Audia <therealgraysky@proton.me> | 2023-02-01 15:44:56 -0500 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2023-02-03 09:38:11 +0100 |
commit | 50324b949b91cfb70ced3869b09b895e45a5ae37 (patch) | |
tree | ae9e8d1c14d87a493228b42f4065faeb5ee50ed3 /target/linux/at91/patches-5.10/117-net-macb-add-function-to-disable-all-macb-clocks.patch | |
parent | 59fe39f6fcf1407a53ec54cb54d1e27dfa0beca5 (diff) | |
download | upstream-50324b949b91cfb70ced3869b09b895e45a5ae37.tar.gz upstream-50324b949b91cfb70ced3869b09b895e45a5ae37.tar.bz2 upstream-50324b949b91cfb70ced3869b09b895e45a5ae37.zip |
kernel: bump 5.10 to 5.10.166
All patches automatically rebased.
Build system: x86_64
Build-tested: ramips/tplink_archer-a6-v3
Run-tested: ramips/tplink_archer-a6-v3
Signed-off-by: John Audia <therealgraysky@proton.me>
Diffstat (limited to 'target/linux/at91/patches-5.10/117-net-macb-add-function-to-disable-all-macb-clocks.patch')
-rw-r--r-- | target/linux/at91/patches-5.10/117-net-macb-add-function-to-disable-all-macb-clocks.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/at91/patches-5.10/117-net-macb-add-function-to-disable-all-macb-clocks.patch b/target/linux/at91/patches-5.10/117-net-macb-add-function-to-disable-all-macb-clocks.patch index a474f2a405..6541d32dd2 100644 --- a/target/linux/at91/patches-5.10/117-net-macb-add-function-to-disable-all-macb-clocks.patch +++ b/target/linux/at91/patches-5.10/117-net-macb-add-function-to-disable-all-macb-clocks.patch @@ -14,7 +14,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> --- 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 +@@ -3599,6 +3599,20 @@ static void macb_probe_queues(void __iom *num_queues = hweight32(*queue_mask); } @@ -35,7 +35,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> 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: +@@ -4661,11 +4675,7 @@ err_out_free_netdev: free_netdev(dev); err_disable_clocks: @@ -48,7 +48,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> 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 +@@ -4690,11 +4700,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)) { @@ -62,7 +62,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> pm_runtime_set_suspended(&pdev->dev); } phylink_destroy(bp->phylink); -@@ -4880,13 +4887,10 @@ static int __maybe_unused macb_runtime_s +@@ -4873,13 +4880,10 @@ static int __maybe_unused macb_runtime_s struct net_device *netdev = dev_get_drvdata(dev); struct macb *bp = netdev_priv(netdev); |