git.openwrt.org Git - openwrt/staging/stintel.git/blob

   1 From 0c4c0f14b7d704bcb728d018a74788771dc9286b Mon Sep 17 00:00:00 2001
   2 From: Chukun Pan <amadeus@jmu.edu.cn>
   3 Date: Mon, 10 Feb 2025 15:01:20 +0800
   4 Subject: [PATCH] arm64: dts: qcom: ipq6018: move mp5496 regulator out of soc dtsi
   5
   6 Some IPQ60xx SoCs don't come with the mp5496 pmic chip. The mp5496
   7 pmic was never part of the IPQ60xx SoC, it's optional, so we moved
   8 it out of the soc dtsi.
   9
  10 Signed-off-by: Chukun Pan <amadeus@jmu.edu.cn>
  11 Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
  12 Link: https://lore.kernel.org/r/20250210070122.208842-4-amadeus@jmu.edu.cn
  13 Signed-off-by: Bjorn Andersson <andersson@kernel.org>
  14 ---
  15  arch/arm64/boot/dts/qcom/ipq6018-cp01-c1.dts |  2 +-
  16  arch/arm64/boot/dts/qcom/ipq6018-mp5496.dtsi | 35 ++++++++++++++++++++++++++++
  17  arch/arm64/boot/dts/qcom/ipq6018.dtsi        | 14 -----------
  18  3 files changed, 36 insertions(+), 15 deletions(-)
  19  create mode 100644 arch/arm64/boot/dts/qcom/ipq6018-mp5496.dtsi
  20
  21 --- a/arch/arm64/boot/dts/qcom/ipq6018-cp01-c1.dts
  22 +++ b/arch/arm64/boot/dts/qcom/ipq6018-cp01-c1.dts
  23 @@ -7,7 +7,7 @@
  24
  25  /dts-v1/;
  26
  27 -#include "ipq6018.dtsi"
  28 +#include "ipq6018-mp5496.dtsi"
  29
  30  / {
  31         model = "Qualcomm Technologies, Inc. IPQ6018/AP-CP01-C1";
  32 --- /dev/null
  33 +++ b/arch/arm64/boot/dts/qcom/ipq6018-mp5496.dtsi
  34 @@ -0,0 +1,35 @@
  35 +// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
  36 +/*
  37 + * ipq6018-mp5496.dtsi describes common properties (e.g. regulators) that
  38 + * apply to most devices that make use of the IPQ6018 SoC and MP5496 PMIC.
  39 + */
  40 +
  41 +#include "ipq6018.dtsi"
  42 +
  43 +&cpu0 {
  44 +       cpu-supply = <&ipq6018_s2>;
  45 +};
  46 +
  47 +&cpu1 {
  48 +       cpu-supply = <&ipq6018_s2>;
  49 +};
  50 +
  51 +&cpu2 {
  52 +       cpu-supply = <&ipq6018_s2>;
  53 +};
  54 +
  55 +&cpu3 {
  56 +       cpu-supply = <&ipq6018_s2>;
  57 +};
  58 +
  59 +&rpm_requests {
  60 +       regulators {
  61 +               compatible = "qcom,rpm-mp5496-regulators";
  62 +
  63 +               ipq6018_s2: s2 {
  64 +                       regulator-min-microvolt = <725000>;
  65 +                       regulator-max-microvolt = <1062500>;
  66 +                       regulator-always-on;
  67 +               };
  68 +       };
  69 +};
  70 --- a/arch/arm64/boot/dts/qcom/ipq6018.dtsi
  71 +++ b/arch/arm64/boot/dts/qcom/ipq6018.dtsi
  72 @@ -43,7 +43,6 @@
  73                         clocks = <&apcs_glb APCS_ALIAS0_CORE_CLK>;
  74                         clock-names = "cpu";
  75                         operating-points-v2 = <&cpu_opp_table>;
  76 -                       cpu-supply = <&ipq6018_s2>;
  77                         #cooling-cells = <2>;
  78                 };
  79
  80 @@ -56,7 +55,6 @@
  81                         clocks = <&apcs_glb APCS_ALIAS0_CORE_CLK>;
  82                         clock-names = "cpu";
  83                         operating-points-v2 = <&cpu_opp_table>;
  84 -                       cpu-supply = <&ipq6018_s2>;
  85                         #cooling-cells = <2>;
  86                 };
  87
  88 @@ -69,7 +67,6 @@
  89                         clocks = <&apcs_glb APCS_ALIAS0_CORE_CLK>;
  90                         clock-names = "cpu";
  91                         operating-points-v2 = <&cpu_opp_table>;
  92 -                       cpu-supply = <&ipq6018_s2>;
  93                         #cooling-cells = <2>;
  94                 };
  95
  96 @@ -82,7 +79,6 @@
  97                         clocks = <&apcs_glb APCS_ALIAS0_CORE_CLK>;
  98                         clock-names = "cpu";
  99                         operating-points-v2 = <&cpu_opp_table>;
 100 -                       cpu-supply = <&ipq6018_s2>;
 101                         #cooling-cells = <2>;
 102                 };
 103
 104 @@ -184,16 +180,6 @@
 105                         rpm_requests: rpm-requests {
 106                                 compatible = "qcom,rpm-ipq6018";
 107                                 qcom,glink-channels = "rpm_requests";
 108 -
 109 -                               regulators {
 110 -                                       compatible = "qcom,rpm-mp5496-regulators";
 111 -
 112 -                                       ipq6018_s2: s2 {
 113 -                                               regulator-min-microvolt = <725000>;
 114 -                                               regulator-max-microvolt = <1062500>;
 115 -                                               regulator-always-on;
 116 -                                       };
 117 -                               };
 118                         };
 119                 };
 120         };