ipq806x: 6.1: copy patches, files and config from 5.15

[openwrt/staging/ldir.git] / target / linux / ipq806x / patches-6.1 / 120-v6.2-clk-qcom-kpss-xcc-register-it-as-clk-provider.patch

diff --git a/target/linux/ipq806x/patches-6.1/120-v6.2-clk-qcom-kpss-xcc-register-it-as-clk-provider.patch b/target/linux/ipq806x/patches-6.1/120-v6.2-clk-qcom-kpss-xcc-register-it-as-clk-provider.patch
new file mode 100644 (file)
index 0000000..ace3136
--- /dev/null
+++ b/target/linux/ipq806x/patches-6.1/120-v6.2-clk-qcom-kpss-xcc-register-it-as-clk-provider.patch
@@ -0,0 +1,61 @@
+From 09be1a39e685d8c5edd471fd1cac9a8f8280d2de Mon Sep 17 00:00:00 2001
+From: Christian Marangi <ansuelsmth@gmail.com>
+Date: Tue, 8 Nov 2022 22:17:34 +0100
+Subject: [PATCH] clk: qcom: kpss-xcc: register it as clk provider
+
+krait-cc use this driver for the secondary mux. Register it as a clk
+provider to correctly use this clk in other drivers.
+
+Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
+Signed-off-by: Bjorn Andersson <andersson@kernel.org>
+Link: https://lore.kernel.org/r/20221108211734.3707-1-ansuelsmth@gmail.com
+---
+ drivers/clk/qcom/kpss-xcc.c | 13 +++++++++----
+ 1 file changed, 9 insertions(+), 4 deletions(-)
+
+--- a/drivers/clk/qcom/kpss-xcc.c
++++ b/drivers/clk/qcom/kpss-xcc.c
+@@ -31,13 +31,14 @@ MODULE_DEVICE_TABLE(of, kpss_xcc_match_t
+ 
+ static int kpss_xcc_driver_probe(struct platform_device *pdev)
+ {
++      struct device *dev = &pdev->dev;
+       const struct of_device_id *id;
+       struct resource *res;
+       void __iomem *base;
+       struct clk_hw *hw;
+       const char *name;
+ 
+-      id = of_match_device(kpss_xcc_match_table, &pdev->dev);
++      id = of_match_device(kpss_xcc_match_table, dev);
+       if (!id)
+               return -ENODEV;
+ 
+@@ -47,7 +48,7 @@ static int kpss_xcc_driver_probe(struct
+               return PTR_ERR(base);
+ 
+       if (id->data) {
+-              if (of_property_read_string_index(pdev->dev.of_node,
++              if (of_property_read_string_index(dev->of_node,
+                                                 "clock-output-names",
+                                                 0, &name))
+                       return -ENODEV;
+@@ -57,12 +58,16 @@ static int kpss_xcc_driver_probe(struct
+               base += 0x28;
+       }
+ 
+-      hw = devm_clk_hw_register_mux_parent_data_table(&pdev->dev, name, aux_parents,
++      hw = devm_clk_hw_register_mux_parent_data_table(dev, name, aux_parents,
+                                                       ARRAY_SIZE(aux_parents), 0,
+                                                       base, 0, 0x3,
+                                                       0, aux_parent_map, NULL);
++      if (IS_ERR(hw))
++              return PTR_ERR(hw);
+ 
+-      return PTR_ERR_OR_ZERO(hw);
++      of_clk_add_hw_provider(dev->of_node, of_clk_hw_simple_get, hw);
++
++      return 0;
+ }
+ 
+ static struct platform_driver kpss_xcc_driver = {