diff options
| author | John Audia <therealgraysky@proton.me> | 2023-04-20 08:53:55 -0400 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2023-04-22 01:15:03 +0200 |
| commit | 126c64df2bb6dec95906c1f68aa37e581ef2550f (patch) | |
| tree | 3bf569ce11a6b5744a6a54394f2617ca36ad962d /target/linux/at91/patches-5.10/117-net-macb-add-function-to-disable-all-macb-clocks.patch | |
| parent | 3887a55909aa26c3366fd0206772280da850ab16 (diff) | |
| download | upstream-126c64df2bb6dec95906c1f68aa37e581ef2550f.tar.gz upstream-126c64df2bb6dec95906c1f68aa37e581ef2550f.tar.bz2 upstream-126c64df2bb6dec95906c1f68aa37e581ef2550f.zip | |
kernel: bump 5.10 to 5.10.178
Removed upstreamed:
backport-5.10/430-v6.3-ubi-Fix-failure-attaching-when-vid_hdr-offset-equals.patch[1]
1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.178&id=0279e82e148407feec88466990de14bcba9e12c0
All other patches automatically rebased.
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 6541d32dd2..337343340c 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 -@@ -3599,6 +3599,20 @@ static void macb_probe_queues(void __iom +@@ -3603,6 +3603,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) -@@ -4661,11 +4675,7 @@ err_out_free_netdev: +@@ -4665,11 +4679,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); -@@ -4690,11 +4700,8 @@ static int macb_remove(struct platform_d +@@ -4694,11 +4704,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); -@@ -4873,13 +4880,10 @@ static int __maybe_unused macb_runtime_s +@@ -4877,13 +4884,10 @@ static int __maybe_unused macb_runtime_s struct net_device *netdev = dev_get_drvdata(dev); struct macb *bp = netdev_priv(netdev); |