domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ipq806x: 5.15: refresh target patches

Browse Source 
Refresh ipq806x target patches for kernel 5.15.

Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
This commit is contained in:
Christian Marangi
2022-10-17 00:39:45 +02:00
parent 32ecf4251a
commit 1b147bec1a
12 changed files with 29 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
target/linux/ipq806x/patches-5.15/113-v5.19-02-PM-devfreq-Fix-kernel-panic-with-cpu-based-scaling-t.patch
View File

@@ -20,11 +20,9 @@ Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
drivers/devfreq/governor_passive.c | 3 +-- drivers/devfreq/governor_passive.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-) 1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/devfreq/governor_passive.c b/drivers/devfreq/governor_passive.c
index 72c67979ebe1..091a69e1f487 100644
--- a/drivers/devfreq/governor_passive.c --- a/drivers/devfreq/governor_passive.c
+++ b/drivers/devfreq/governor_passive.c +++ b/drivers/devfreq/governor_passive.c
@@ -407,8 +407,7 @@ static int devfreq_passive_event_handler(struct devfreq *devfreq, @@ -401,8 +401,7 @@ static int devfreq_passive_event_handler
if (!p_data) if (!p_data)
return -EINVAL; return -EINVAL;
@@ -34,6 +32,3 @@ index 72c67979ebe1..091a69e1f487 100644
switch (event) { switch (event) {
case DEVFREQ_GOV_START: case DEVFREQ_GOV_START:
--
2.37.2

13
target/linux/ipq806x/patches-5.15/121-01-clk-qcom-kpss-xcc-register-it-as-clk-provider.patch
View File

@@ -11,17 +11,15 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
drivers/clk/qcom/kpss-xcc.c | 13 +++++++++---- drivers/clk/qcom/kpss-xcc.c | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-) 1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/drivers/clk/qcom/kpss-xcc.c b/drivers/clk/qcom/kpss-xcc.c
index b1b370274ec4..97358c98c6c9 100644
--- a/drivers/clk/qcom/kpss-xcc.c --- a/drivers/clk/qcom/kpss-xcc.c
+++ b/drivers/clk/qcom/kpss-xcc.c +++ b/drivers/clk/qcom/kpss-xcc.c
@@ -31,13 +31,14 @@ MODULE_DEVICE_TABLE(of, kpss_xcc_match_table); @@ -31,13 +31,14 @@ MODULE_DEVICE_TABLE(of, kpss_xcc_match_t
static int kpss_xcc_driver_probe(struct platform_device *pdev) static int kpss_xcc_driver_probe(struct platform_device *pdev)
{ {
+ struct device *dev = &pdev->dev; + struct device *dev = &pdev->dev;
const struct of_device_id *id; const struct of_device_id *id;
struct resource *res; struct resource *res;
void __iomem *base; void __iomem *base;
struct clk_hw *hw; struct clk_hw *hw;
const char *name; const char *name;
@@ -31,7 +29,7 @@ index b1b370274ec4..97358c98c6c9 100644
if (!id) if (!id)
return -ENODEV; return -ENODEV;
@@ -45,7 +46,7 @@ static int kpss_xcc_driver_probe(struct platform_device *pdev) @@ -47,7 +48,7 @@ static int kpss_xcc_driver_probe(struct
return PTR_ERR(base); return PTR_ERR(base);
if (id->data) { if (id->data) {
@@ -40,7 +38,7 @@ index b1b370274ec4..97358c98c6c9 100644
"clock-output-names", "clock-output-names",
0, &name)) 0, &name))
return -ENODEV; return -ENODEV;
@@ -55,12 +56,16 @@ static int kpss_xcc_driver_probe(struct platform_device *pdev) @@ -57,12 +58,16 @@ static int kpss_xcc_driver_probe(struct
base += 0x28; base += 0x28;
} }
@@ -59,6 +57,3 @@ index b1b370274ec4..97358c98c6c9 100644
} }
static struct platform_driver kpss_xcc_driver = { static struct platform_driver kpss_xcc_driver = {
--
2.37.2

17
target/linux/ipq806x/patches-5.15/121-02-clk-qcom-krait-cc-convert-to-parent_data-API.patch
View File

@@ -14,11 +14,9 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
drivers/clk/qcom/krait-cc.c | 126 +++++++++++++++++++----------------- drivers/clk/qcom/krait-cc.c | 126 +++++++++++++++++++-----------------
1 file changed, 66 insertions(+), 60 deletions(-) 1 file changed, 66 insertions(+), 60 deletions(-)
diff --git a/drivers/clk/qcom/krait-cc.c b/drivers/clk/qcom/krait-cc.c
index cfd961d5cc45..84f0048961f5 100644
--- a/drivers/clk/qcom/krait-cc.c --- a/drivers/clk/qcom/krait-cc.c
+++ b/drivers/clk/qcom/krait-cc.c +++ b/drivers/clk/qcom/krait-cc.c
@@ -69,21 +69,22 @@ static int krait_notifier_register(struct device *dev, struct clk *clk, @@ -69,21 +69,22 @@ static int krait_notifier_register(struc
return ret; return ret;
} }
@@ -45,7 +43,7 @@ index cfd961d5cc45..84f0048961f5 100644
div->width = 2; div->width = 2;
div->shift = 6; div->shift = 6;
@@ -93,43 +94,49 @@ krait_add_div(struct device *dev, int id, const char *s, unsigned int offset) @@ -93,43 +94,49 @@ krait_add_div(struct device *dev, int id
init.name = kasprintf(GFP_KERNEL, "hfpll%s_div", s); init.name = kasprintf(GFP_KERNEL, "hfpll%s_div", s);
if (!init.name) if (!init.name)
@@ -109,7 +107,7 @@ index cfd961d5cc45..84f0048961f5 100644
mux->offset = offset; mux->offset = offset;
mux->lpl = id >= 0; mux->lpl = id >= 0;
@@ -149,44 +156,51 @@ krait_add_sec_mux(struct device *dev, int id, const char *s, @@ -149,44 +156,51 @@ krait_add_sec_mux(struct device *dev, in
init.name = kasprintf(GFP_KERNEL, "krait%s_sec_mux", s); init.name = kasprintf(GFP_KERNEL, "krait%s_sec_mux", s);
if (!init.name) if (!init.name)
@@ -173,7 +171,7 @@ index cfd961d5cc45..84f0048961f5 100644
mux = devm_kzalloc(dev, sizeof(*mux), GFP_KERNEL); mux = devm_kzalloc(dev, sizeof(*mux), GFP_KERNEL);
if (!mux) if (!mux)
@@ -204,36 +218,29 @@ krait_add_pri_mux(struct device *dev, int id, const char *s, @@ -204,36 +218,29 @@ krait_add_pri_mux(struct device *dev, in
if (!init.name) if (!init.name)
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
@@ -224,7 +222,7 @@ index cfd961d5cc45..84f0048961f5 100644
kfree(init.name); kfree(init.name);
return clk; return clk;
} }
@@ -241,11 +248,10 @@ krait_add_pri_mux(struct device *dev, int id, const char *s, @@ -241,11 +248,10 @@ err_p0:
/* id < 0 for L2, otherwise id == physical CPU number */ /* id < 0 for L2, otherwise id == physical CPU number */
static struct clk *krait_add_clks(struct device *dev, int id, bool unique_aux) static struct clk *krait_add_clks(struct device *dev, int id, bool unique_aux)
{ {
@@ -237,7 +235,7 @@ index cfd961d5cc45..84f0048961f5 100644
if (id >= 0) { if (id >= 0) {
offset = 0x4501 + (0x1000 * id); offset = 0x4501 + (0x1000 * id);
@@ -257,19 +263,19 @@ static struct clk *krait_add_clks(struct device *dev, int id, bool unique_aux) @@ -257,19 +263,19 @@ static struct clk *krait_add_clks(struct
s = "_l2"; s = "_l2";
} }
@@ -264,6 +262,3 @@ index cfd961d5cc45..84f0048961f5 100644
err: err:
kfree(p); kfree(p);
return clk; return clk;
--
2.37.2

9
target/linux/ipq806x/patches-5.15/121-03-clk-qcom-krait-cc-handle-qsb-clock-defined-in-DTS.patch
View File

@@ -12,11 +12,9 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
drivers/clk/qcom/krait-cc.c | 14 +++++++++++--- drivers/clk/qcom/krait-cc.c | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-) 1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/drivers/clk/qcom/krait-cc.c b/drivers/clk/qcom/krait-cc.c
index 84f0048961f5..f1d64b16cac3 100644
--- a/drivers/clk/qcom/krait-cc.c --- a/drivers/clk/qcom/krait-cc.c
+++ b/drivers/clk/qcom/krait-cc.c +++ b/drivers/clk/qcom/krait-cc.c
@@ -305,7 +305,7 @@ static int krait_cc_probe(struct platform_device *pdev) @@ -305,7 +305,7 @@ static int krait_cc_probe(struct platfor
{ {
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
const struct of_device_id *id; const struct of_device_id *id;
@@ -25,7 +23,7 @@ index 84f0048961f5..f1d64b16cac3 100644
int cpu; int cpu;
struct clk *clk; struct clk *clk;
struct clk **clks; struct clk **clks;
@@ -315,11 +315,19 @@ static int krait_cc_probe(struct platform_device *pdev) @@ -315,11 +315,19 @@ static int krait_cc_probe(struct platfor
if (!id) if (!id)
return -ENODEV; return -ENODEV;
@@ -47,6 +45,3 @@ index 84f0048961f5..f1d64b16cac3 100644
if (!id->data) { if (!id->data) {
clk = clk_register_fixed_factor(dev, "acpu_aux", clk = clk_register_fixed_factor(dev, "acpu_aux",
"gpll0_vote", 0, 1, 2); "gpll0_vote", 0, 1, 2);
--
2.37.2

11
target/linux/ipq806x/patches-5.15/121-04-clk-qcom-krait-cc-register-REAL-qsb-fixed-clock.patch
View File

@@ -14,8 +14,6 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
drivers/clk/qcom/krait-cc.c | 8 +++++--- drivers/clk/qcom/krait-cc.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-) 1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/drivers/clk/qcom/krait-cc.c b/drivers/clk/qcom/krait-cc.c
index f1d64b16cac3..e91275663973 100644
--- a/drivers/clk/qcom/krait-cc.c --- a/drivers/clk/qcom/krait-cc.c
+++ b/drivers/clk/qcom/krait-cc.c +++ b/drivers/clk/qcom/krait-cc.c
@@ -15,6 +15,8 @@ @@ -15,6 +15,8 @@
@@ -27,7 +25,7 @@ index f1d64b16cac3..e91275663973 100644
static unsigned int sec_mux_map[] = { static unsigned int sec_mux_map[] = {
2, 2,
0, 0,
@@ -322,7 +324,7 @@ static int krait_cc_probe(struct platform_device *pdev) @@ -322,7 +324,7 @@ static int krait_cc_probe(struct platfor
*/ */
clk = clk_get(dev, "qsb"); clk = clk_get(dev, "qsb");
if (IS_ERR(clk)) if (IS_ERR(clk))
@@ -36,7 +34,7 @@ index f1d64b16cac3..e91275663973 100644
if (IS_ERR(clk)) if (IS_ERR(clk))
return PTR_ERR(clk); return PTR_ERR(clk);
@@ -378,7 +380,7 @@ static int krait_cc_probe(struct platform_device *pdev) @@ -378,7 +380,7 @@ static int krait_cc_probe(struct platfor
*/ */
cur_rate = clk_get_rate(l2_pri_mux_clk); cur_rate = clk_get_rate(l2_pri_mux_clk);
aux_rate = 384000000; aux_rate = 384000000;
@@ -45,7 +43,7 @@ index f1d64b16cac3..e91275663973 100644
pr_info("L2 @ QSB rate. Forcing new rate.\n"); pr_info("L2 @ QSB rate. Forcing new rate.\n");
cur_rate = aux_rate; cur_rate = aux_rate;
} }
@@ -389,7 +391,7 @@ static int krait_cc_probe(struct platform_device *pdev) @@ -389,7 +391,7 @@ static int krait_cc_probe(struct platfor
for_each_possible_cpu(cpu) { for_each_possible_cpu(cpu) {
clk = clks[cpu]; clk = clks[cpu];
cur_rate = clk_get_rate(clk); cur_rate = clk_get_rate(clk);
@@ -54,6 +52,3 @@ index f1d64b16cac3..e91275663973 100644
pr_info("CPU%d @ QSB rate. Forcing new rate.\n", cpu); pr_info("CPU%d @ QSB rate. Forcing new rate.\n", cpu);
cur_rate = aux_rate; cur_rate = aux_rate;
} }
--
2.37.2

7
target/linux/ipq806x/patches-5.15/121-05-clk-qcom-krait-cc-use-devm-variant-for-clk-notifier-.patch
View File

@@ -12,11 +12,9 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
drivers/clk/qcom/krait-cc.c | 2 +- drivers/clk/qcom/krait-cc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/clk/qcom/krait-cc.c b/drivers/clk/qcom/krait-cc.c
index e91275663973..33a78b7de0bd 100644
--- a/drivers/clk/qcom/krait-cc.c --- a/drivers/clk/qcom/krait-cc.c
+++ b/drivers/clk/qcom/krait-cc.c +++ b/drivers/clk/qcom/krait-cc.c
@@ -64,7 +64,7 @@ static int krait_notifier_register(struct device *dev, struct clk *clk, @@ -64,7 +64,7 @@ static int krait_notifier_register(struc
int ret = 0; int ret = 0;
mux->clk_nb.notifier_call = krait_notifier_cb; mux->clk_nb.notifier_call = krait_notifier_cb;
@@ -25,6 +23,3 @@ index e91275663973..33a78b7de0bd 100644
if (ret) if (ret)
dev_err(dev, "failed to register clock notifier: %d\n", ret); dev_err(dev, "failed to register clock notifier: %d\n", ret);
--
2.37.2

7
target/linux/ipq806x/patches-5.15/121-06-clk-qcom-krait-cc-fix-never-enabled-secondary-mux.patch
View File

@@ -17,8 +17,6 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
drivers/clk/qcom/krait-cc.c | 12 +++++++++++- drivers/clk/qcom/krait-cc.c | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-) 1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/drivers/clk/qcom/krait-cc.c b/drivers/clk/qcom/krait-cc.c
index 33a78b7de0bd..b71067a49ee7 100644
--- a/drivers/clk/qcom/krait-cc.c --- a/drivers/clk/qcom/krait-cc.c
+++ b/drivers/clk/qcom/krait-cc.c +++ b/drivers/clk/qcom/krait-cc.c
@@ -121,7 +121,7 @@ static struct clk * @@ -121,7 +121,7 @@ static struct clk *
@@ -30,7 +28,7 @@ index 33a78b7de0bd..b71067a49ee7 100644
struct krait_mux_clk *mux; struct krait_mux_clk *mux;
static struct clk_parent_data sec_mux_list[2] = { static struct clk_parent_data sec_mux_list[2] = {
{ .name = "qsb", .fw_name = "qsb" }, { .name = "qsb", .fw_name = "qsb" },
@@ -180,6 +180,16 @@ krait_add_sec_mux(struct device *dev, int id, const char *s, @@ -180,6 +180,16 @@ krait_add_sec_mux(struct device *dev, in
if (ret) if (ret)
clk = ERR_PTR(ret); clk = ERR_PTR(ret);
@@ -47,6 +45,3 @@ index 33a78b7de0bd..b71067a49ee7 100644
err_clk: err_clk:
if (unique_aux) if (unique_aux)
kfree(parent_name); kfree(parent_name);
--
2.37.2

7
target/linux/ipq806x/patches-5.15/121-07-clk-qcom-krait-cc-drop-pr_info-and-use-dev_info.patch
View File

@@ -10,11 +10,9 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
drivers/clk/qcom/krait-cc.c | 8 ++++---- drivers/clk/qcom/krait-cc.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-) 1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/clk/qcom/krait-cc.c b/drivers/clk/qcom/krait-cc.c
index b71067a49ee7..e4fb3ff2b5b5 100644
--- a/drivers/clk/qcom/krait-cc.c --- a/drivers/clk/qcom/krait-cc.c
+++ b/drivers/clk/qcom/krait-cc.c +++ b/drivers/clk/qcom/krait-cc.c
@@ -391,25 +391,25 @@ static int krait_cc_probe(struct platform_device *pdev) @@ -391,25 +391,25 @@ static int krait_cc_probe(struct platfor
cur_rate = clk_get_rate(l2_pri_mux_clk); cur_rate = clk_get_rate(l2_pri_mux_clk);
aux_rate = 384000000; aux_rate = 384000000;
if (cur_rate == qsb_rate) { if (cur_rate == qsb_rate) {
@@ -44,6 +42,3 @@ index b71067a49ee7..e4fb3ff2b5b5 100644
} }
of_clk_add_provider(dev->of_node, krait_of_get, clks); of_clk_add_provider(dev->of_node, krait_of_get, clks);
--
2.37.2

13
target/linux/ipq806x/patches-5.15/121-08-clk-qcom-krait-cc-handle-secondary-mux-sourcing-out-.patch
View File

@@ -19,11 +19,9 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
drivers/clk/qcom/krait-cc.c | 19 ++++++++++++++++++- drivers/clk/qcom/krait-cc.c | 19 ++++++++++++++++++-
1 file changed, 18 insertions(+), 1 deletion(-) 1 file changed, 18 insertions(+), 1 deletion(-)
diff --git a/drivers/clk/qcom/krait-cc.c b/drivers/clk/qcom/krait-cc.c
index e4fb3ff2b5b5..717eff44b6a4 100644
--- a/drivers/clk/qcom/krait-cc.c --- a/drivers/clk/qcom/krait-cc.c
+++ b/drivers/clk/qcom/krait-cc.c +++ b/drivers/clk/qcom/krait-cc.c
@@ -317,7 +317,7 @@ static int krait_cc_probe(struct platform_device *pdev) @@ -317,7 +317,7 @@ static int krait_cc_probe(struct platfor
{ {
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
const struct of_device_id *id; const struct of_device_id *id;
@@ -32,7 +30,7 @@ index e4fb3ff2b5b5..717eff44b6a4 100644
int cpu; int cpu;
struct clk *clk; struct clk *clk;
struct clk **clks; struct clk **clks;
@@ -327,6 +327,15 @@ static int krait_cc_probe(struct platform_device *pdev) @@ -327,6 +327,15 @@ static int krait_cc_probe(struct platfor
if (!id) if (!id)
return -ENODEV; return -ENODEV;
@@ -48,7 +46,7 @@ index e4fb3ff2b5b5..717eff44b6a4 100644
/* /*
* Per Documentation qsb should be provided from DTS. * Per Documentation qsb should be provided from DTS.
* To address old implementation, register the fixed clock anyway. * To address old implementation, register the fixed clock anyway.
@@ -394,6 +403,10 @@ static int krait_cc_probe(struct platform_device *pdev) @@ -394,6 +403,10 @@ static int krait_cc_probe(struct platfor
dev_info(dev, "L2 @ QSB rate. Forcing new rate.\n"); dev_info(dev, "L2 @ QSB rate. Forcing new rate.\n");
cur_rate = aux_rate; cur_rate = aux_rate;
} }
@@ -59,7 +57,7 @@ index e4fb3ff2b5b5..717eff44b6a4 100644
clk_set_rate(l2_pri_mux_clk, aux_rate); clk_set_rate(l2_pri_mux_clk, aux_rate);
clk_set_rate(l2_pri_mux_clk, 2); clk_set_rate(l2_pri_mux_clk, 2);
clk_set_rate(l2_pri_mux_clk, cur_rate); clk_set_rate(l2_pri_mux_clk, cur_rate);
@@ -405,6 +418,10 @@ static int krait_cc_probe(struct platform_device *pdev) @@ -405,6 +418,10 @@ static int krait_cc_probe(struct platfor
dev_info(dev, "CPU%d @ QSB rate. Forcing new rate.\n", cpu); dev_info(dev, "CPU%d @ QSB rate. Forcing new rate.\n", cpu);
cur_rate = aux_rate; cur_rate = aux_rate;
} }
@@ -70,6 +68,3 @@ index e4fb3ff2b5b5..717eff44b6a4 100644
clk_set_rate(clk, aux_rate); clk_set_rate(clk, aux_rate);
clk_set_rate(clk, 2); clk_set_rate(clk, 2);
--
2.37.2

9
target/linux/ipq806x/patches-5.15/121-09-clk-qcom-krait-cc-rework-mux-reset-logic-and-reset-h.patch
View File

@@ -17,8 +17,6 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
drivers/clk/qcom/krait-cc.c | 50 +++++++++++++++++-------------------- drivers/clk/qcom/krait-cc.c | 50 +++++++++++++++++--------------------
1 file changed, 23 insertions(+), 27 deletions(-) 1 file changed, 23 insertions(+), 27 deletions(-)
diff --git a/drivers/clk/qcom/krait-cc.c b/drivers/clk/qcom/krait-cc.c
index 717eff44b6a4..90dee71e7c38 100644
--- a/drivers/clk/qcom/krait-cc.c --- a/drivers/clk/qcom/krait-cc.c
+++ b/drivers/clk/qcom/krait-cc.c +++ b/drivers/clk/qcom/krait-cc.c
@@ -15,7 +15,9 @@ @@ -15,7 +15,9 @@
@@ -32,7 +30,7 @@ index 717eff44b6a4..90dee71e7c38 100644
static unsigned int sec_mux_map[] = { static unsigned int sec_mux_map[] = {
2, 2,
@@ -317,7 +319,7 @@ static int krait_cc_probe(struct platform_device *pdev) @@ -317,7 +319,7 @@ static int krait_cc_probe(struct platfor
{ {
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
const struct of_device_id *id; const struct of_device_id *id;
@@ -41,7 +39,7 @@ index 717eff44b6a4..90dee71e7c38 100644
int cpu; int cpu;
struct clk *clk; struct clk *clk;
struct clk **clks; struct clk **clks;
@@ -397,36 +399,30 @@ static int krait_cc_probe(struct platform_device *pdev) @@ -397,36 +399,30 @@ static int krait_cc_probe(struct platfor
* two different rates to force a HFPLL reinit under all * two different rates to force a HFPLL reinit under all
* circumstances. * circumstances.
*/ */
@@ -97,6 +95,3 @@ index 717eff44b6a4..90dee71e7c38 100644
} }
of_clk_add_provider(dev->of_node, krait_of_get, clks); of_clk_add_provider(dev->of_node, krait_of_get, clks);
--
2.37.2

7
target/linux/ipq806x/patches-5.15/122-01-clk-qcom-clk-krait-fix-wrong-div2-functions.patch
View File

@@ -15,11 +15,9 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
drivers/clk/qcom/clk-krait.c | 2 ++ drivers/clk/qcom/clk-krait.c | 2 ++
1 file changed, 2 insertions(+) 1 file changed, 2 insertions(+)
diff --git a/drivers/clk/qcom/clk-krait.c b/drivers/clk/qcom/clk-krait.c
index 45da736bd5f4..293a9dfa7151 100644
--- a/drivers/clk/qcom/clk-krait.c --- a/drivers/clk/qcom/clk-krait.c
+++ b/drivers/clk/qcom/clk-krait.c +++ b/drivers/clk/qcom/clk-krait.c
@@ -114,6 +114,8 @@ static int krait_div2_set_rate(struct clk_hw *hw, unsigned long rate, @@ -114,6 +114,8 @@ static int krait_div2_set_rate(struct cl
if (d->lpl) if (d->lpl)
mask = mask << (d->shift + LPL_SHIFT) | mask << d->shift; mask = mask << (d->shift + LPL_SHIFT) | mask << d->shift;
@@ -28,6 +26,3 @@ index 45da736bd5f4..293a9dfa7151 100644
spin_lock_irqsave(&krait_clock_reg_lock, flags); spin_lock_irqsave(&krait_clock_reg_lock, flags);
val = krait_get_l2_indirect_reg(d->offset); val = krait_get_l2_indirect_reg(d->offset);
--
2.37.2

15
target/linux/ipq806x/patches-5.15/122-02-clk-qcom-clk-krait-generilize-div-functions.patch
View File

@@ -14,11 +14,9 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
drivers/clk/qcom/krait-cc.c | 7 +++-- drivers/clk/qcom/krait-cc.c | 7 +++--
3 files changed, 42 insertions(+), 33 deletions(-) 3 files changed, 42 insertions(+), 33 deletions(-)
diff --git a/drivers/clk/qcom/clk-krait.c b/drivers/clk/qcom/clk-krait.c
index 293a9dfa7151..1d40dd1acb0f 100644
--- a/drivers/clk/qcom/clk-krait.c --- a/drivers/clk/qcom/clk-krait.c
+++ b/drivers/clk/qcom/clk-krait.c +++ b/drivers/clk/qcom/clk-krait.c
@@ -97,53 +97,58 @@ const struct clk_ops krait_mux_clk_ops = { @@ -97,53 +97,58 @@ const struct clk_ops krait_mux_clk_ops =
EXPORT_SYMBOL_GPL(krait_mux_clk_ops); EXPORT_SYMBOL_GPL(krait_mux_clk_ops);
/* The divider can divide by 2, 4, 6 and 8. But we only really need div-2. */ /* The divider can divide by 2, 4, 6 and 8. But we only really need div-2. */
@@ -103,8 +101,6 @@ index 293a9dfa7151..1d40dd1acb0f 100644
}; };
-EXPORT_SYMBOL_GPL(krait_div2_clk_ops); -EXPORT_SYMBOL_GPL(krait_div2_clk_ops);
+EXPORT_SYMBOL_GPL(krait_div_clk_ops); +EXPORT_SYMBOL_GPL(krait_div_clk_ops);
diff --git a/drivers/clk/qcom/clk-krait.h b/drivers/clk/qcom/clk-krait.h
index f930538c539e..94c798f8e834 100644
--- a/drivers/clk/qcom/clk-krait.h --- a/drivers/clk/qcom/clk-krait.h
+++ b/drivers/clk/qcom/clk-krait.h +++ b/drivers/clk/qcom/clk-krait.h
@@ -25,17 +25,20 @@ struct krait_mux_clk { @@ -25,17 +25,20 @@ struct krait_mux_clk {
@@ -132,11 +128,9 @@ index f930538c539e..94c798f8e834 100644
+extern const struct clk_ops krait_div_clk_ops; +extern const struct clk_ops krait_div_clk_ops;
#endif #endif
diff --git a/drivers/clk/qcom/krait-cc.c b/drivers/clk/qcom/krait-cc.c
index 90dee71e7c38..949657186fdb 100644
--- a/drivers/clk/qcom/krait-cc.c --- a/drivers/clk/qcom/krait-cc.c
+++ b/drivers/clk/qcom/krait-cc.c +++ b/drivers/clk/qcom/krait-cc.c
@@ -76,11 +76,11 @@ static int krait_notifier_register(struct device *dev, struct clk *clk, @@ -76,11 +76,11 @@ static int krait_notifier_register(struc
static struct clk * static struct clk *
krait_add_div(struct device *dev, int id, const char *s, unsigned int offset) krait_add_div(struct device *dev, int id, const char *s, unsigned int offset)
{ {
@@ -150,7 +144,7 @@ index 90dee71e7c38..949657186fdb 100644
.flags = CLK_SET_RATE_PARENT, .flags = CLK_SET_RATE_PARENT,
}; };
struct clk *clk; struct clk *clk;
@@ -90,7 +90,8 @@ krait_add_div(struct device *dev, int id, const char *s, unsigned int offset) @@ -90,7 +90,8 @@ krait_add_div(struct device *dev, int id
if (!div) if (!div)
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
@@ -160,6 +154,3 @@ index 90dee71e7c38..949657186fdb 100644
div->shift = 6; div->shift = 6;
div->lpl = id >= 0; div->lpl = id >= 0;
div->offset = offset; div->offset = offset;
--
2.37.2