aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/at91/patches-5.10
diff options
context:
space:
mode:
authorJohn Audia <therealgraysky@proton.me>2022-05-25 13:09:23 -0400
committerHauke Mehrtens <hauke@hauke-m.de>2022-06-07 22:28:59 +0200
commit49f8a75031c8fb2efc4824166da75f1473cdab6b (patch)
tree8735a6f849807516e7c1cc015616d5c584491a3c /target/linux/at91/patches-5.10
parent3ce3de934c34b8d36012cb687b38e5bcff62f95d (diff)
downloadupstream-49f8a75031c8fb2efc4824166da75f1473cdab6b.tar.gz
upstream-49f8a75031c8fb2efc4824166da75f1473cdab6b.tar.bz2
upstream-49f8a75031c8fb2efc4824166da75f1473cdab6b.zip
kernel: bump 5.10 to 5.10.118
Removed upstreamed: generic-backport/774-v5.15-1-igc-remove-_I_PHY_ID-checking.patch generic-backport/774-v5.15-2-igc-remove-phy-type-checking.patch All patches automatically rebased. Build system: x86_64 Build-tested: ipq806x/R7800 Signed-off-by: John Audia <therealgraysky@proton.me> (cherry picked from commit b789a588b1c55fe1df7e2d6ae1c4f84b96a03a95)
Diffstat (limited to 'target/linux/at91/patches-5.10')
-rw-r--r--target/linux/at91/patches-5.10/234-clk-at91-re-factor-clocks-suspend-resume.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/at91/patches-5.10/234-clk-at91-re-factor-clocks-suspend-resume.patch b/target/linux/at91/patches-5.10/234-clk-at91-re-factor-clocks-suspend-resume.patch
index fc08b1fce6..5d399f6535 100644
--- a/target/linux/at91/patches-5.10/234-clk-at91-re-factor-clocks-suspend-resume.patch
+++ b/target/linux/at91/patches-5.10/234-clk-at91-re-factor-clocks-suspend-resume.patch
@@ -93,7 +93,7 @@ Signed-off-by: Stephen Boyd <sboyd@kernel.org>
return 0;
}
-@@ -245,6 +256,23 @@ static int clk_generated_set_rate(struct
+@@ -249,6 +260,23 @@ static int clk_generated_set_rate(struct
return 0;
}
@@ -117,7 +117,7 @@ Signed-off-by: Stephen Boyd <sboyd@kernel.org>
static const struct clk_ops generated_ops = {
.enable = clk_generated_enable,
.disable = clk_generated_disable,
-@@ -254,6 +282,8 @@ static const struct clk_ops generated_op
+@@ -258,6 +286,8 @@ static const struct clk_ops generated_op
.get_parent = clk_generated_get_parent,
.set_parent = clk_generated_set_parent,
.set_rate = clk_generated_set_rate,
@@ -126,7 +126,7 @@ Signed-off-by: Stephen Boyd <sboyd@kernel.org>
};
/**
-@@ -320,8 +350,6 @@ at91_clk_register_generated(struct regma
+@@ -324,8 +354,6 @@ at91_clk_register_generated(struct regma
if (ret) {
kfree(gck);
hw = ERR_PTR(ret);