ipq806x: 6.1: drop upstream patch

[openwrt/staging/ldir.git] / target / linux / ipq806x / patches-6.1 / 119-v6.0-03-clk-qcom-clk-rpm-convert-to-parent_data-API.patch

diff --git a/target/linux/ipq806x/patches-6.1/119-v6.0-03-clk-qcom-clk-rpm-convert-to-parent_data-API.patch b/target/linux/ipq806x/patches-6.1/119-v6.0-03-clk-qcom-clk-rpm-convert-to-parent_data-API.patch
deleted file mode 100644 (file)
index 8481b63..0000000
--- a/target/linux/ipq806x/patches-6.1/119-v6.0-03-clk-qcom-clk-rpm-convert-to-parent_data-API.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From 129d9cd9c25041f8b8681fd6e8584fa47c385f3b Mon Sep 17 00:00:00 2001
-From: Christian Marangi <ansuelsmth@gmail.com>
-Date: Thu, 7 Jul 2022 00:53:20 +0200
-Subject: [PATCH] clk: qcom: clk-rpm: convert to parent_data API
-
-Convert clk-rpm driver to parent_data API.
-We keep the old pxo/cxo_board parent naming to keep compatibility with
-old DT and we use the new pxo/cxo for new implementation where these
-clock are defined in DTS.
-
-Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
-Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
-Link: https://lore.kernel.org/r/20220706225321.26215-4-ansuelsmth@gmail.com
----
- drivers/clk/qcom/clk-rpm.c | 24 ++++++++++++++++--------
- 1 file changed, 16 insertions(+), 8 deletions(-)
-
---- a/drivers/clk/qcom/clk-rpm.c
-+++ b/drivers/clk/qcom/clk-rpm.c
-@@ -23,6 +23,14 @@
- #define QCOM_RPM_SCALING_ENABLE_ID                    0x2
- #define QCOM_RPM_XO_MODE_ON                           0x2
- 
-+static const struct clk_parent_data gcc_pxo[] = {
-+      { .fw_name = "pxo", .name = "pxo_board" },
-+};
-+
-+static const struct clk_parent_data gcc_cxo[] = {
-+      { .fw_name = "cxo", .name = "cxo_board" },
-+};
-+
- #define DEFINE_CLK_RPM(_platform, _name, _active, r_id)                             \
-       static struct clk_rpm _platform##_##_active;                          \
-       static struct clk_rpm _platform##_##_name = {                         \
-@@ -32,8 +40,8 @@
-               .hw.init = &(struct clk_init_data){                           \
-                       .ops = &clk_rpm_ops,                                  \
-                       .name = #_name,                                       \
--                      .parent_names = (const char *[]){ "pxo_board" },      \
--                      .num_parents = 1,                                     \
-+                      .parent_data = gcc_pxo,                               \
-+                      .num_parents = ARRAY_SIZE(gcc_pxo),                   \
-               },                                                            \
-       };                                                                    \
-       static struct clk_rpm _platform##_##_active = {                       \
-@@ -44,8 +52,8 @@
-               .hw.init = &(struct clk_init_data){                           \
-                       .ops = &clk_rpm_ops,                                  \
-                       .name = #_active,                                     \
--                      .parent_names = (const char *[]){ "pxo_board" },      \
--                      .num_parents = 1,                                     \
-+                      .parent_data = gcc_pxo,                               \
-+                      .num_parents = ARRAY_SIZE(gcc_pxo),                   \
-               },                                                            \
-       }
- 
-@@ -56,8 +64,8 @@
-               .hw.init = &(struct clk_init_data){                           \
-                       .ops = &clk_rpm_xo_ops,                       \
-                       .name = #_name,                                       \
--                      .parent_names = (const char *[]){ "cxo_board" },      \
--                      .num_parents = 1,                                     \
-+                      .parent_data = gcc_cxo,                               \
-+                      .num_parents = ARRAY_SIZE(gcc_cxo),                   \
-               },                                                            \
-       }
- 
-@@ -68,8 +76,8 @@
-               .hw.init = &(struct clk_init_data){                           \
-                       .ops = &clk_rpm_fixed_ops,                            \
-                       .name = #_name,                                       \
--                      .parent_names = (const char *[]){ "pxo" },            \
--                      .num_parents = 1,                                     \
-+                      .parent_data = gcc_pxo,                               \
-+                      .num_parents = ARRAY_SIZE(gcc_pxo),                   \
-               },                                                            \
-       }
-