diff options
author | Ansuel Smith <ansuelsmth@gmail.com> | 2021-11-04 21:56:41 +0100 |
---|---|---|
committer | Daniel Golle <daniel@makrotopia.org> | 2022-03-27 16:16:07 +0100 |
commit | 3064e76c948570a6f0930e893d25a551449df8ff (patch) | |
tree | 7ce6dd9c663c9121a923f3957c0449f723c8e52e /target/linux/ipq806x/patches-5.15/097-2-ipq806x-lcc-add-missing-reset.patch | |
parent | 26e7c2275730486a5a1201fbafe72ccdac15f6e4 (diff) | |
download | upstream-3064e76c948570a6f0930e893d25a551449df8ff.tar.gz upstream-3064e76c948570a6f0930e893d25a551449df8ff.tar.bz2 upstream-3064e76c948570a6f0930e893d25a551449df8ff.zip |
ipq806x: 5:15: copy config and patch from 5.10
Copy config and patch from kernel 5.10 to kernel 5.15
Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
Diffstat (limited to 'target/linux/ipq806x/patches-5.15/097-2-ipq806x-lcc-add-missing-reset.patch')
-rw-r--r-- | target/linux/ipq806x/patches-5.15/097-2-ipq806x-lcc-add-missing-reset.patch | 59 |
1 files changed, 59 insertions, 0 deletions
diff --git a/target/linux/ipq806x/patches-5.15/097-2-ipq806x-lcc-add-missing-reset.patch b/target/linux/ipq806x/patches-5.15/097-2-ipq806x-lcc-add-missing-reset.patch new file mode 100644 index 0000000000..cd2cb33356 --- /dev/null +++ b/target/linux/ipq806x/patches-5.15/097-2-ipq806x-lcc-add-missing-reset.patch @@ -0,0 +1,59 @@ +From 3a5f1793c0bf4a6b536751886b0a44589fe05f35 Mon Sep 17 00:00:00 2001 +From: Ansuel Smith <ansuelsmth@gmail.com> +Date: Sun, 7 Feb 2021 17:00:07 +0100 +Subject: [PATCH 2/4] ipq806x: lcc: add missing reset + +Add missing reset for ipq806x lcc clk + +Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com> +--- + drivers/clk/qcom/lcc-ipq806x.c | 8 ++++++++ + include/dt-bindings/clock/qcom,lcc-ipq806x.h | 1 + + 2 files changed, 9 insertions(+) + +--- a/drivers/clk/qcom/lcc-ipq806x.c ++++ b/drivers/clk/qcom/lcc-ipq806x.c +@@ -12,6 +12,7 @@ + #include <linux/of_device.h> + #include <linux/clk-provider.h> + #include <linux/regmap.h> ++#include <linux/reset-controller.h> + + #include <dt-bindings/clock/qcom,lcc-ipq806x.h> + +@@ -22,6 +23,7 @@ + #include "clk-branch.h" + #include "clk-regmap-divider.h" + #include "clk-regmap-mux.h" ++#include "reset.h" + + static struct clk_pll pll4 = { + .l_reg = 0x4, +@@ -39,6 +41,10 @@ static struct clk_pll pll4 = { + }, + }; + ++static const struct qcom_reset_map lcc_ipq806x_resets[] = { ++ [LCC_PCM_RESET] = { 0x54, 13 }, ++}; ++ + static const struct pll_config pll4_config = { + .l = 0xf, + .m = 0x91, +@@ -417,6 +423,8 @@ static const struct qcom_cc_desc lcc_ipq + .config = &lcc_ipq806x_regmap_config, + .clks = lcc_ipq806x_clks, + .num_clks = ARRAY_SIZE(lcc_ipq806x_clks), ++ .resets = lcc_ipq806x_resets, ++ .num_resets = ARRAY_SIZE(lcc_ipq806x_resets), + }; + + static const struct of_device_id lcc_ipq806x_match_table[] = { +--- a/include/dt-bindings/clock/qcom,lcc-ipq806x.h ++++ b/include/dt-bindings/clock/qcom,lcc-ipq806x.h +@@ -19,4 +19,5 @@ + #define SPDIF_CLK 10 + #define AHBIX_CLK 11 + ++#define LCC_PCM_RESET 0 + #endif |