Drop other upstream patch.
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
+++ /dev/null
-From 5a8aa766cedac0ceaa4beabc30e9fa62dd9f1ac1 Mon Sep 17 00:00:00 2001
-From: Ansuel Smith <ansuelsmth@gmail.com>
-Date: Fri, 29 Apr 2022 14:23:16 +0200
-Subject: [PATCH v2 1/2] ARM: dts: qcom: replace gcc PXO with pxo_board fixed
- clock
-
-Replace gcc PXO phandle to pxo_board fixed clock declared in the dts.
-gcc driver doesn't provide PXO_SRC as it's a fixed-clock. This cause a
-kernel panic if any driver actually try to use it.
-
-Fixes: 40cf5c884a96 ("ARM: dts: qcom: add L2CC and RPM for IPQ8064")
-Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
----
- arch/arm/boot/dts/qcom-ipq8064.dtsi | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/arch/arm/boot/dts/qcom-ipq8064.dtsi
-+++ b/arch/arm/boot/dts/qcom-ipq8064.dtsi
-@@ -304,7 +304,7 @@
- clock-frequency = <25000000>;
- };
-
-- pxo_board {
-+ pxo_board: pxo_board {
- compatible = "fixed-clock";
- #clock-cells = <0>;
- clock-frequency = <25000000>;
-@@ -782,7 +782,7 @@
- l2cc: clock-controller@2011000 {
- compatible = "qcom,kpss-gcc", "syscon";
- reg = <0x2011000 0x1000>;
-- clocks = <&gcc PLL8_VOTE>, <&gcc PXO_SRC>;
-+ clocks = <&gcc PLL8_VOTE>, <&pxo_board>;
- clock-names = "pll8_vote", "pxo";
- clock-output-names = "acpu_l2_aux";
- };
+++ /dev/null
-From 3a0cf0a2b99fb3d193d72e3804292697d73d3aab Mon Sep 17 00:00:00 2001
-From: Christian Marangi <ansuelsmth@gmail.com>
-Date: Tue, 5 Jul 2022 21:29:01 +0200
-Subject: [PATCH v2 2/4] ARM: DTS: qcom: add rpmcc missing clocks for
- apq/ipq8064 and msm8660
-
-Add missing rpmcc pxo and cxo clock for apq8064, ipq8064 and
-msm8660 dtsi.
-
-Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
-Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
----
- arch/arm/boot/dts/qcom-apq8064.dtsi | 2 ++
- arch/arm/boot/dts/qcom-ipq8064.dtsi | 2 ++
- arch/arm/boot/dts/qcom-msm8660.dtsi | 4 +++-
- 3 files changed, 7 insertions(+), 1 deletion(-)
-
---- a/arch/arm/boot/dts/qcom-apq8064.dtsi
-+++ b/arch/arm/boot/dts/qcom-apq8064.dtsi
-@@ -862,6 +862,8 @@
- rpmcc: clock-controller {
- compatible = "qcom,rpmcc-apq8064", "qcom,rpmcc";
- #clock-cells = <1>;
-+ clocks = <&pxo_board>, <&cxo_board>;
-+ clock-names = "pxo", "cxo";
- };
-
- regulators {
---- a/arch/arm/boot/dts/qcom-ipq8064.dtsi
-+++ b/arch/arm/boot/dts/qcom-ipq8064.dtsi
-@@ -1074,6 +1074,8 @@
- rpmcc: clock-controller {
- compatible = "qcom,rpmcc-ipq806x", "qcom,rpmcc";
- #clock-cells = <1>;
-+ clocks = <&pxo_board>;
-+ clock-names = "pxo";
- };
- };
-
---- a/arch/arm/boot/dts/qcom-msm8660.dtsi
-+++ b/arch/arm/boot/dts/qcom-msm8660.dtsi
-@@ -56,7 +56,7 @@
- clock-frequency = <19200000>;
- };
-
-- pxo_board {
-+ pxo_board: pxo_board {
- compatible = "fixed-clock";
- #clock-cells = <0>;
- clock-frequency = <27000000>;
-@@ -420,6 +420,8 @@
- rpmcc: clock-controller {
- compatible = "qcom,rpmcc-msm8660", "qcom,rpmcc";
- #clock-cells = <1>;
-+ clocks = <&pxo_board>;
-+ clock-names = "pxo";
- };
-
- pm8901-regulators {
+++ /dev/null
-From 3d8c0e94a792ae62fa0495ac940c9850a059afc2 Mon Sep 17 00:00:00 2001
-From: Christian Marangi <ansuelsmth@gmail.com>
-Date: Tue, 5 Jul 2022 21:39:18 +0200
-Subject: [PATCH v2 3/4] 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>
----
- 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), \
- }, \
- }
-