ipq806x: 6.1: drop upstream patch

[openwrt/staging/ansuel.git] / target / linux / ipq806x / patches-6.1 / 118-v6.1-04-clk-qcom-kpss-xcc-convert-to-parent-data-API.patch

diff --git a/target/linux/ipq806x/patches-6.1/118-v6.1-04-clk-qcom-kpss-xcc-convert-to-parent-data-API.patch b/target/linux/ipq806x/patches-6.1/118-v6.1-04-clk-qcom-kpss-xcc-convert-to-parent-data-API.patch
deleted file mode 100644 (file)
index 6c5f5ea..0000000
--- a/target/linux/ipq806x/patches-6.1/118-v6.1-04-clk-qcom-kpss-xcc-convert-to-parent-data-API.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From d08c79b818767f24c3c9cbba585d8a3ec896c1a1 Mon Sep 17 00:00:00 2001
-From: Christian Marangi <ansuelsmth@gmail.com>
-Date: Thu, 17 Feb 2022 22:43:34 +0100
-Subject: [PATCH 4/4] clk: qcom: kpss-xcc: convert to parent data API
-
-Convert the driver to parent data API. From the Documentation pll8_vote
-and pxo should be declared in the DTS so fw_name can be used instead of
-parent_names. Name is still used to save regression on old definition.
-
-Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
----
- drivers/clk/qcom/kpss-xcc.c | 26 +++++++++-----------------
- 1 file changed, 9 insertions(+), 17 deletions(-)
-
---- a/drivers/clk/qcom/kpss-xcc.c
-+++ b/drivers/clk/qcom/kpss-xcc.c
-@@ -12,9 +12,9 @@
- #include <linux/clk.h>
- #include <linux/clk-provider.h>
- 
--static const char *aux_parents[] = {
--      "pll8_vote",
--      "pxo",
-+static const struct clk_parent_data aux_parents[] = {
-+      { .name = "pll8_vote", .fw_name = "pll8_vote" },
-+      { .name = "pxo", .fw_name = "pxo" },
- };
- 
- static unsigned int aux_parent_map[] = {
-@@ -32,9 +32,9 @@ MODULE_DEVICE_TABLE(of, kpss_xcc_match_t
- static int kpss_xcc_driver_probe(struct platform_device *pdev)
- {
-       const struct of_device_id *id;
--      struct clk *clk;
-       struct resource *res;
-       void __iomem *base;
-+      struct clk_hw *hw;
-       const char *name;
- 
-       id = of_match_device(kpss_xcc_match_table, &pdev->dev);
-@@ -57,24 +57,16 @@ static int kpss_xcc_driver_probe(struct
-               base += 0x28;
-       }
- 
--      clk = clk_register_mux_table(&pdev->dev, name, aux_parents,
--                                   ARRAY_SIZE(aux_parents), 0, base, 0, 0x3,
--                                   0, aux_parent_map, NULL);
-+      hw = devm_clk_hw_register_mux_parent_data_table(&pdev->dev, name, aux_parents,
-+                                                      ARRAY_SIZE(aux_parents), 0,
-+                                                      base, 0, 0x3,
-+                                                      0, aux_parent_map, NULL);
- 
--      platform_set_drvdata(pdev, clk);
--
--      return PTR_ERR_OR_ZERO(clk);
--}
--
--static int kpss_xcc_driver_remove(struct platform_device *pdev)
--{
--      clk_unregister_mux(platform_get_drvdata(pdev));
--      return 0;
-+      return PTR_ERR_OR_ZERO(hw);
- }
- 
- static struct platform_driver kpss_xcc_driver = {
-       .probe = kpss_xcc_driver_probe,
--      .remove = kpss_xcc_driver_remove,
-       .driver = {
-               .name = "kpss-xcc",
-               .of_match_table = kpss_xcc_match_table,