* [PATCH 01/15] ARM: dts: qcom: apq8064: correct XOADC register address
2023-06-27 1:24 [PATCH 00/15] ARM: dts: qcom: cleanup PMIC usage Dmitry Baryshkov
@ 2023-06-27 1:24 ` Dmitry Baryshkov
2023-06-27 11:03 ` Konrad Dybcio
2023-06-27 1:24 ` [PATCH 02/15] ARM: dts: qcom: msm8960: introduce label for PMIC keypad Dmitry Baryshkov
` (13 subsequent siblings)
14 siblings, 1 reply; 29+ messages in thread
From: Dmitry Baryshkov @ 2023-06-27 1:24 UTC (permalink / raw)
To: Andy Gross, Bjorn Andersson, Konrad Dybcio, Rob Herring,
Krzysztof Kozlowski
Cc: linux-arm-msm, devicetree
The XOADC is present at the address 0x197 rather than just 197. It
doesn't change a lot (since the driver hardcodes all register
addresses), but the DT should present correct address anyway.
Fixes: c4b70883ee33 ("ARM: dts: add XOADC and IIO HWMON to APQ8064")
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
arch/arm/boot/dts/qcom/qcom-apq8064.dtsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/qcom/qcom-apq8064.dtsi b/arch/arm/boot/dts/qcom/qcom-apq8064.dtsi
index d2289205ff81..4f4393e11580 100644
--- a/arch/arm/boot/dts/qcom/qcom-apq8064.dtsi
+++ b/arch/arm/boot/dts/qcom/qcom-apq8064.dtsi
@@ -766,7 +766,7 @@ pwrkey@1c {
xoadc: xoadc@197 {
compatible = "qcom,pm8921-adc";
- reg = <197>;
+ reg = <0x197>;
interrupts-extended = <&pmicintc 78 IRQ_TYPE_EDGE_RISING>;
#address-cells = <2>;
#size-cells = <0>;
--
2.39.2
^ permalink raw reply related [flat|nested] 29+ messages in thread* Re: [PATCH 01/15] ARM: dts: qcom: apq8064: correct XOADC register address
2023-06-27 1:24 ` [PATCH 01/15] ARM: dts: qcom: apq8064: correct XOADC register address Dmitry Baryshkov
@ 2023-06-27 11:03 ` Konrad Dybcio
0 siblings, 0 replies; 29+ messages in thread
From: Konrad Dybcio @ 2023-06-27 11:03 UTC (permalink / raw)
To: Dmitry Baryshkov, Andy Gross, Bjorn Andersson, Rob Herring,
Krzysztof Kozlowski
Cc: linux-arm-msm, devicetree
On 27.06.2023 03:24, Dmitry Baryshkov wrote:
> The XOADC is present at the address 0x197 rather than just 197. It
> doesn't change a lot (since the driver hardcodes all register
> addresses), but the DT should present correct address anyway.
>
> Fixes: c4b70883ee33 ("ARM: dts: add XOADC and IIO HWMON to APQ8064")
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> ---
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Konrad
> arch/arm/boot/dts/qcom/qcom-apq8064.dtsi | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/arm/boot/dts/qcom/qcom-apq8064.dtsi b/arch/arm/boot/dts/qcom/qcom-apq8064.dtsi
> index d2289205ff81..4f4393e11580 100644
> --- a/arch/arm/boot/dts/qcom/qcom-apq8064.dtsi
> +++ b/arch/arm/boot/dts/qcom/qcom-apq8064.dtsi
> @@ -766,7 +766,7 @@ pwrkey@1c {
>
> xoadc: xoadc@197 {
> compatible = "qcom,pm8921-adc";
> - reg = <197>;
> + reg = <0x197>;
> interrupts-extended = <&pmicintc 78 IRQ_TYPE_EDGE_RISING>;
> #address-cells = <2>;
> #size-cells = <0>;
^ permalink raw reply [flat|nested] 29+ messages in thread
* [PATCH 02/15] ARM: dts: qcom: msm8960: introduce label for PMIC keypad
2023-06-27 1:24 [PATCH 00/15] ARM: dts: qcom: cleanup PMIC usage Dmitry Baryshkov
2023-06-27 1:24 ` [PATCH 01/15] ARM: dts: qcom: apq8064: correct XOADC register address Dmitry Baryshkov
@ 2023-06-27 1:24 ` Dmitry Baryshkov
2023-06-27 11:04 ` Konrad Dybcio
2023-06-27 1:24 ` [PATCH 03/15] ARM: dts: qcom: msm8660-surf: use keypad label directly Dmitry Baryshkov
` (12 subsequent siblings)
14 siblings, 1 reply; 29+ messages in thread
From: Dmitry Baryshkov @ 2023-06-27 1:24 UTC (permalink / raw)
To: Andy Gross, Bjorn Andersson, Konrad Dybcio, Rob Herring,
Krzysztof Kozlowski
Cc: linux-arm-msm, devicetree
To simplify MSM8960 CDP board file, add label to PMIC keypad node.
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
arch/arm/boot/dts/qcom/qcom-msm8960-cdp.dts | 20 +++++++++-----------
arch/arm/boot/dts/qcom/qcom-msm8960.dtsi | 2 +-
2 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/arch/arm/boot/dts/qcom/qcom-msm8960-cdp.dts b/arch/arm/boot/dts/qcom/qcom-msm8960-cdp.dts
index 6c1bc3818883..4641b4f2195d 100644
--- a/arch/arm/boot/dts/qcom/qcom-msm8960-cdp.dts
+++ b/arch/arm/boot/dts/qcom/qcom-msm8960-cdp.dts
@@ -88,17 +88,15 @@ clk-pins {
};
};
-&pmicintc {
- keypad@148 {
- linux,keymap = <
- MATRIX_KEY(0, 0, KEY_VOLUMEUP)
- MATRIX_KEY(0, 1, KEY_VOLUMEDOWN)
- MATRIX_KEY(0, 2, KEY_CAMERA_FOCUS)
- MATRIX_KEY(0, 3, KEY_CAMERA)
- >;
- keypad,num-rows = <1>;
- keypad,num-columns = <5>;
- };
+&pm8921_keypad {
+ linux,keymap = <
+ MATRIX_KEY(0, 0, KEY_VOLUMEUP)
+ MATRIX_KEY(0, 1, KEY_VOLUMEDOWN)
+ MATRIX_KEY(0, 2, KEY_CAMERA_FOCUS)
+ MATRIX_KEY(0, 3, KEY_CAMERA)
+ >;
+ keypad,num-rows = <1>;
+ keypad,num-columns = <5>;
};
&rpm {
diff --git a/arch/arm/boot/dts/qcom/qcom-msm8960.dtsi b/arch/arm/boot/dts/qcom/qcom-msm8960.dtsi
index fa2013388d99..913bc6afd0a1 100644
--- a/arch/arm/boot/dts/qcom/qcom-msm8960.dtsi
+++ b/arch/arm/boot/dts/qcom/qcom-msm8960.dtsi
@@ -283,7 +283,7 @@ pwrkey@1c {
pull-up;
};
- keypad@148 {
+ pm8921_keypad: keypad@148 {
compatible = "qcom,pm8921-keypad";
reg = <0x148>;
interrupt-parent = <&pmicintc>;
--
2.39.2
^ permalink raw reply related [flat|nested] 29+ messages in thread* Re: [PATCH 02/15] ARM: dts: qcom: msm8960: introduce label for PMIC keypad
2023-06-27 1:24 ` [PATCH 02/15] ARM: dts: qcom: msm8960: introduce label for PMIC keypad Dmitry Baryshkov
@ 2023-06-27 11:04 ` Konrad Dybcio
0 siblings, 0 replies; 29+ messages in thread
From: Konrad Dybcio @ 2023-06-27 11:04 UTC (permalink / raw)
To: Dmitry Baryshkov, Andy Gross, Bjorn Andersson, Rob Herring,
Krzysztof Kozlowski
Cc: linux-arm-msm, devicetree
On 27.06.2023 03:24, Dmitry Baryshkov wrote:
> To simplify MSM8960 CDP board file, add label to PMIC keypad node.
>
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> ---
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Konrad
> arch/arm/boot/dts/qcom/qcom-msm8960-cdp.dts | 20 +++++++++-----------
> arch/arm/boot/dts/qcom/qcom-msm8960.dtsi | 2 +-
> 2 files changed, 10 insertions(+), 12 deletions(-)
>
> diff --git a/arch/arm/boot/dts/qcom/qcom-msm8960-cdp.dts b/arch/arm/boot/dts/qcom/qcom-msm8960-cdp.dts
> index 6c1bc3818883..4641b4f2195d 100644
> --- a/arch/arm/boot/dts/qcom/qcom-msm8960-cdp.dts
> +++ b/arch/arm/boot/dts/qcom/qcom-msm8960-cdp.dts
> @@ -88,17 +88,15 @@ clk-pins {
> };
> };
>
> -&pmicintc {
> - keypad@148 {
> - linux,keymap = <
> - MATRIX_KEY(0, 0, KEY_VOLUMEUP)
> - MATRIX_KEY(0, 1, KEY_VOLUMEDOWN)
> - MATRIX_KEY(0, 2, KEY_CAMERA_FOCUS)
> - MATRIX_KEY(0, 3, KEY_CAMERA)
> - >;
> - keypad,num-rows = <1>;
> - keypad,num-columns = <5>;
> - };
> +&pm8921_keypad {
> + linux,keymap = <
> + MATRIX_KEY(0, 0, KEY_VOLUMEUP)
> + MATRIX_KEY(0, 1, KEY_VOLUMEDOWN)
> + MATRIX_KEY(0, 2, KEY_CAMERA_FOCUS)
> + MATRIX_KEY(0, 3, KEY_CAMERA)
> + >;
> + keypad,num-rows = <1>;
> + keypad,num-columns = <5>;
> };
>
> &rpm {
> diff --git a/arch/arm/boot/dts/qcom/qcom-msm8960.dtsi b/arch/arm/boot/dts/qcom/qcom-msm8960.dtsi
> index fa2013388d99..913bc6afd0a1 100644
> --- a/arch/arm/boot/dts/qcom/qcom-msm8960.dtsi
> +++ b/arch/arm/boot/dts/qcom/qcom-msm8960.dtsi
> @@ -283,7 +283,7 @@ pwrkey@1c {
> pull-up;
> };
>
> - keypad@148 {
> + pm8921_keypad: keypad@148 {
> compatible = "qcom,pm8921-keypad";
> reg = <0x148>;
> interrupt-parent = <&pmicintc>;
^ permalink raw reply [flat|nested] 29+ messages in thread
* [PATCH 03/15] ARM: dts: qcom: msm8660-surf: use keypad label directly
2023-06-27 1:24 [PATCH 00/15] ARM: dts: qcom: cleanup PMIC usage Dmitry Baryshkov
2023-06-27 1:24 ` [PATCH 01/15] ARM: dts: qcom: apq8064: correct XOADC register address Dmitry Baryshkov
2023-06-27 1:24 ` [PATCH 02/15] ARM: dts: qcom: msm8960: introduce label for PMIC keypad Dmitry Baryshkov
@ 2023-06-27 1:24 ` Dmitry Baryshkov
2023-06-27 11:05 ` Konrad Dybcio
2023-06-27 1:24 ` [PATCH 04/15] ARM: dts: qcom: apq8064-nexus7: move sdcc1 node to proper place Dmitry Baryshkov
` (11 subsequent siblings)
14 siblings, 1 reply; 29+ messages in thread
From: Dmitry Baryshkov @ 2023-06-27 1:24 UTC (permalink / raw)
To: Andy Gross, Bjorn Andersson, Konrad Dybcio, Rob Herring,
Krzysztof Kozlowski
Cc: linux-arm-msm, devicetree
Directly use pm8058_keypad to declare keypad properties instead of
referencing pm8058 top-level node.
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
arch/arm/boot/dts/qcom/qcom-msm8660-surf.dts | 50 ++++++++++----------
1 file changed, 24 insertions(+), 26 deletions(-)
diff --git a/arch/arm/boot/dts/qcom/qcom-msm8660-surf.dts b/arch/arm/boot/dts/qcom/qcom-msm8660-surf.dts
index be18f1be29a1..86fbb6dfdc2a 100644
--- a/arch/arm/boot/dts/qcom/qcom-msm8660-surf.dts
+++ b/arch/arm/boot/dts/qcom/qcom-msm8660-surf.dts
@@ -34,32 +34,30 @@ &gsbi12_serial {
status = "okay";
};
-&pm8058 {
- keypad@148 {
- linux,keymap = <
- MATRIX_KEY(0, 0, KEY_FN_F1)
- MATRIX_KEY(0, 1, KEY_UP)
- MATRIX_KEY(0, 2, KEY_LEFT)
- MATRIX_KEY(0, 3, KEY_VOLUMEUP)
- MATRIX_KEY(1, 0, KEY_FN_F2)
- MATRIX_KEY(1, 1, KEY_RIGHT)
- MATRIX_KEY(1, 2, KEY_DOWN)
- MATRIX_KEY(1, 3, KEY_VOLUMEDOWN)
- MATRIX_KEY(2, 3, KEY_ENTER)
- MATRIX_KEY(4, 0, KEY_CAMERA_FOCUS)
- MATRIX_KEY(4, 1, KEY_UP)
- MATRIX_KEY(4, 2, KEY_LEFT)
- MATRIX_KEY(4, 3, KEY_HOME)
- MATRIX_KEY(4, 4, KEY_FN_F3)
- MATRIX_KEY(5, 0, KEY_CAMERA)
- MATRIX_KEY(5, 1, KEY_RIGHT)
- MATRIX_KEY(5, 2, KEY_DOWN)
- MATRIX_KEY(5, 3, KEY_BACK)
- MATRIX_KEY(5, 4, KEY_MENU)
- >;
- keypad,num-rows = <6>;
- keypad,num-columns = <5>;
- };
+&pm8058_keypad {
+ linux,keymap = <
+ MATRIX_KEY(0, 0, KEY_FN_F1)
+ MATRIX_KEY(0, 1, KEY_UP)
+ MATRIX_KEY(0, 2, KEY_LEFT)
+ MATRIX_KEY(0, 3, KEY_VOLUMEUP)
+ MATRIX_KEY(1, 0, KEY_FN_F2)
+ MATRIX_KEY(1, 1, KEY_RIGHT)
+ MATRIX_KEY(1, 2, KEY_DOWN)
+ MATRIX_KEY(1, 3, KEY_VOLUMEDOWN)
+ MATRIX_KEY(2, 3, KEY_ENTER)
+ MATRIX_KEY(4, 0, KEY_CAMERA_FOCUS)
+ MATRIX_KEY(4, 1, KEY_UP)
+ MATRIX_KEY(4, 2, KEY_LEFT)
+ MATRIX_KEY(4, 3, KEY_HOME)
+ MATRIX_KEY(4, 4, KEY_FN_F3)
+ MATRIX_KEY(5, 0, KEY_CAMERA)
+ MATRIX_KEY(5, 1, KEY_RIGHT)
+ MATRIX_KEY(5, 2, KEY_DOWN)
+ MATRIX_KEY(5, 3, KEY_BACK)
+ MATRIX_KEY(5, 4, KEY_MENU)
+ >;
+ keypad,num-rows = <6>;
+ keypad,num-columns = <5>;
};
/* eMMC */
--
2.39.2
^ permalink raw reply related [flat|nested] 29+ messages in thread* Re: [PATCH 03/15] ARM: dts: qcom: msm8660-surf: use keypad label directly
2023-06-27 1:24 ` [PATCH 03/15] ARM: dts: qcom: msm8660-surf: use keypad label directly Dmitry Baryshkov
@ 2023-06-27 11:05 ` Konrad Dybcio
0 siblings, 0 replies; 29+ messages in thread
From: Konrad Dybcio @ 2023-06-27 11:05 UTC (permalink / raw)
To: Dmitry Baryshkov, Andy Gross, Bjorn Andersson, Rob Herring,
Krzysztof Kozlowski
Cc: linux-arm-msm, devicetree
On 27.06.2023 03:24, Dmitry Baryshkov wrote:
> Directly use pm8058_keypad to declare keypad properties instead of
> referencing pm8058 top-level node.
>
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> ---
was this board some sort of a laptop?
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Konrad
> arch/arm/boot/dts/qcom/qcom-msm8660-surf.dts | 50 ++++++++++----------
> 1 file changed, 24 insertions(+), 26 deletions(-)
>
> diff --git a/arch/arm/boot/dts/qcom/qcom-msm8660-surf.dts b/arch/arm/boot/dts/qcom/qcom-msm8660-surf.dts
> index be18f1be29a1..86fbb6dfdc2a 100644
> --- a/arch/arm/boot/dts/qcom/qcom-msm8660-surf.dts
> +++ b/arch/arm/boot/dts/qcom/qcom-msm8660-surf.dts
> @@ -34,32 +34,30 @@ &gsbi12_serial {
> status = "okay";
> };
>
> -&pm8058 {
> - keypad@148 {
> - linux,keymap = <
> - MATRIX_KEY(0, 0, KEY_FN_F1)
> - MATRIX_KEY(0, 1, KEY_UP)
> - MATRIX_KEY(0, 2, KEY_LEFT)
> - MATRIX_KEY(0, 3, KEY_VOLUMEUP)
> - MATRIX_KEY(1, 0, KEY_FN_F2)
> - MATRIX_KEY(1, 1, KEY_RIGHT)
> - MATRIX_KEY(1, 2, KEY_DOWN)
> - MATRIX_KEY(1, 3, KEY_VOLUMEDOWN)
> - MATRIX_KEY(2, 3, KEY_ENTER)
> - MATRIX_KEY(4, 0, KEY_CAMERA_FOCUS)
> - MATRIX_KEY(4, 1, KEY_UP)
> - MATRIX_KEY(4, 2, KEY_LEFT)
> - MATRIX_KEY(4, 3, KEY_HOME)
> - MATRIX_KEY(4, 4, KEY_FN_F3)
> - MATRIX_KEY(5, 0, KEY_CAMERA)
> - MATRIX_KEY(5, 1, KEY_RIGHT)
> - MATRIX_KEY(5, 2, KEY_DOWN)
> - MATRIX_KEY(5, 3, KEY_BACK)
> - MATRIX_KEY(5, 4, KEY_MENU)
> - >;
> - keypad,num-rows = <6>;
> - keypad,num-columns = <5>;
> - };
> +&pm8058_keypad {
> + linux,keymap = <
> + MATRIX_KEY(0, 0, KEY_FN_F1)
> + MATRIX_KEY(0, 1, KEY_UP)
> + MATRIX_KEY(0, 2, KEY_LEFT)
> + MATRIX_KEY(0, 3, KEY_VOLUMEUP)
> + MATRIX_KEY(1, 0, KEY_FN_F2)
> + MATRIX_KEY(1, 1, KEY_RIGHT)
> + MATRIX_KEY(1, 2, KEY_DOWN)
> + MATRIX_KEY(1, 3, KEY_VOLUMEDOWN)
> + MATRIX_KEY(2, 3, KEY_ENTER)
> + MATRIX_KEY(4, 0, KEY_CAMERA_FOCUS)
> + MATRIX_KEY(4, 1, KEY_UP)
> + MATRIX_KEY(4, 2, KEY_LEFT)
> + MATRIX_KEY(4, 3, KEY_HOME)
> + MATRIX_KEY(4, 4, KEY_FN_F3)
> + MATRIX_KEY(5, 0, KEY_CAMERA)
> + MATRIX_KEY(5, 1, KEY_RIGHT)
> + MATRIX_KEY(5, 2, KEY_DOWN)
> + MATRIX_KEY(5, 3, KEY_BACK)
> + MATRIX_KEY(5, 4, KEY_MENU)
> + >;
> + keypad,num-rows = <6>;
> + keypad,num-columns = <5>;
> };
>
> /* eMMC */
^ permalink raw reply [flat|nested] 29+ messages in thread
* [PATCH 04/15] ARM: dts: qcom: apq8064-nexus7: move sdcc1 node to proper place
2023-06-27 1:24 [PATCH 00/15] ARM: dts: qcom: cleanup PMIC usage Dmitry Baryshkov
` (2 preceding siblings ...)
2023-06-27 1:24 ` [PATCH 03/15] ARM: dts: qcom: msm8660-surf: use keypad label directly Dmitry Baryshkov
@ 2023-06-27 1:24 ` Dmitry Baryshkov
2023-06-27 11:06 ` Konrad Dybcio
2023-06-27 1:24 ` [PATCH 05/15] ARM: dts: qcom: mdm9615-wp8548-mangoh-green: group include clauses Dmitry Baryshkov
` (10 subsequent siblings)
14 siblings, 1 reply; 29+ messages in thread
From: Dmitry Baryshkov @ 2023-06-27 1:24 UTC (permalink / raw)
To: Andy Gross, Bjorn Andersson, Konrad Dybcio, Rob Herring,
Krzysztof Kozlowski
Cc: linux-arm-msm, devicetree
Move sdcc1 device node to follow the alphanumber sorting order.
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
.../boot/dts/qcom/qcom-apq8064-asus-nexus7-flo.dts | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/arch/arm/boot/dts/qcom/qcom-apq8064-asus-nexus7-flo.dts b/arch/arm/boot/dts/qcom/qcom-apq8064-asus-nexus7-flo.dts
index c57c27cd8a20..0e80a5a8e3c6 100644
--- a/arch/arm/boot/dts/qcom/qcom-apq8064-asus-nexus7-flo.dts
+++ b/arch/arm/boot/dts/qcom/qcom-apq8064-asus-nexus7-flo.dts
@@ -181,13 +181,6 @@ &mdp {
status = "okay";
};
-/* eMMC */
-&sdcc1 {
- vmmc-supply = <&pm8921_l5>;
- vqmmc-supply = <&pm8921_s4>;
- status = "okay";
-};
-
&mdp_dsi1_out {
remote-endpoint = <&dsi0_in>;
};
@@ -336,6 +329,13 @@ lvs7 {
};
};
+/* eMMC */
+&sdcc1 {
+ vmmc-supply = <&pm8921_l5>;
+ vqmmc-supply = <&pm8921_s4>;
+ status = "okay";
+};
+
&usb_hs1_phy {
v3p3-supply = <&pm8921_l3>;
v1p8-supply = <&pm8921_l4>;
--
2.39.2
^ permalink raw reply related [flat|nested] 29+ messages in thread* Re: [PATCH 04/15] ARM: dts: qcom: apq8064-nexus7: move sdcc1 node to proper place
2023-06-27 1:24 ` [PATCH 04/15] ARM: dts: qcom: apq8064-nexus7: move sdcc1 node to proper place Dmitry Baryshkov
@ 2023-06-27 11:06 ` Konrad Dybcio
0 siblings, 0 replies; 29+ messages in thread
From: Konrad Dybcio @ 2023-06-27 11:06 UTC (permalink / raw)
To: Dmitry Baryshkov, Andy Gross, Bjorn Andersson, Rob Herring,
Krzysztof Kozlowski
Cc: linux-arm-msm, devicetree
On 27.06.2023 03:24, Dmitry Baryshkov wrote:
> Move sdcc1 device node to follow the alphanumber
ic
>sorting order.
>
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> ---
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Konrad
> .../boot/dts/qcom/qcom-apq8064-asus-nexus7-flo.dts | 14 +++++++-------
> 1 file changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/arch/arm/boot/dts/qcom/qcom-apq8064-asus-nexus7-flo.dts b/arch/arm/boot/dts/qcom/qcom-apq8064-asus-nexus7-flo.dts
> index c57c27cd8a20..0e80a5a8e3c6 100644
> --- a/arch/arm/boot/dts/qcom/qcom-apq8064-asus-nexus7-flo.dts
> +++ b/arch/arm/boot/dts/qcom/qcom-apq8064-asus-nexus7-flo.dts
> @@ -181,13 +181,6 @@ &mdp {
> status = "okay";
> };
>
> -/* eMMC */
> -&sdcc1 {
> - vmmc-supply = <&pm8921_l5>;
> - vqmmc-supply = <&pm8921_s4>;
> - status = "okay";
> -};
> -
> &mdp_dsi1_out {
> remote-endpoint = <&dsi0_in>;
> };
> @@ -336,6 +329,13 @@ lvs7 {
> };
> };
>
> +/* eMMC */
> +&sdcc1 {
> + vmmc-supply = <&pm8921_l5>;
> + vqmmc-supply = <&pm8921_s4>;
> + status = "okay";
> +};
> +
> &usb_hs1_phy {
> v3p3-supply = <&pm8921_l3>;
> v1p8-supply = <&pm8921_l4>;
^ permalink raw reply [flat|nested] 29+ messages in thread
* [PATCH 05/15] ARM: dts: qcom: mdm9615-wp8548-mangoh-green: group include clauses
2023-06-27 1:24 [PATCH 00/15] ARM: dts: qcom: cleanup PMIC usage Dmitry Baryshkov
` (3 preceding siblings ...)
2023-06-27 1:24 ` [PATCH 04/15] ARM: dts: qcom: apq8064-nexus7: move sdcc1 node to proper place Dmitry Baryshkov
@ 2023-06-27 1:24 ` Dmitry Baryshkov
2023-06-27 11:06 ` Konrad Dybcio
2023-06-27 1:24 ` [PATCH 06/15] ARM: dts: qcom: strip prefix from PMIC files Dmitry Baryshkov
` (9 subsequent siblings)
14 siblings, 1 reply; 29+ messages in thread
From: Dmitry Baryshkov @ 2023-06-27 1:24 UTC (permalink / raw)
To: Andy Gross, Bjorn Andersson, Konrad Dybcio, Rob Herring,
Krzysztof Kozlowski
Cc: linux-arm-msm, devicetree
Group file inclusion to follow contemporary practice.
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
arch/arm/boot/dts/qcom/qcom-mdm9615-wp8548-mangoh-green.dts | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/qcom/qcom-mdm9615-wp8548-mangoh-green.dts b/arch/arm/boot/dts/qcom/qcom-mdm9615-wp8548-mangoh-green.dts
index b269fdca1460..e3b4b93c3d38 100644
--- a/arch/arm/boot/dts/qcom/qcom-mdm9615-wp8548-mangoh-green.dts
+++ b/arch/arm/boot/dts/qcom/qcom-mdm9615-wp8548-mangoh-green.dts
@@ -6,11 +6,11 @@
* Author : Neil Armstrong <narmstrong@baylibre.com>
*/
+#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/input.h>
+#include <dt-bindings/interrupt-controller/irq.h>
#include "qcom-mdm9615-wp8548.dtsi"
-#include <dt-bindings/interrupt-controller/irq.h>
-#include <dt-bindings/gpio/gpio.h>
/ {
model = "MangOH Green with WP8548 Module";
--
2.39.2
^ permalink raw reply related [flat|nested] 29+ messages in thread* Re: [PATCH 05/15] ARM: dts: qcom: mdm9615-wp8548-mangoh-green: group include clauses
2023-06-27 1:24 ` [PATCH 05/15] ARM: dts: qcom: mdm9615-wp8548-mangoh-green: group include clauses Dmitry Baryshkov
@ 2023-06-27 11:06 ` Konrad Dybcio
0 siblings, 0 replies; 29+ messages in thread
From: Konrad Dybcio @ 2023-06-27 11:06 UTC (permalink / raw)
To: Dmitry Baryshkov, Andy Gross, Bjorn Andersson, Rob Herring,
Krzysztof Kozlowski
Cc: linux-arm-msm, devicetree
On 27.06.2023 03:24, Dmitry Baryshkov wrote:
> Group file inclusion to follow contemporary practice.
>
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> ---
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Konrad
> arch/arm/boot/dts/qcom/qcom-mdm9615-wp8548-mangoh-green.dts | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/boot/dts/qcom/qcom-mdm9615-wp8548-mangoh-green.dts b/arch/arm/boot/dts/qcom/qcom-mdm9615-wp8548-mangoh-green.dts
> index b269fdca1460..e3b4b93c3d38 100644
> --- a/arch/arm/boot/dts/qcom/qcom-mdm9615-wp8548-mangoh-green.dts
> +++ b/arch/arm/boot/dts/qcom/qcom-mdm9615-wp8548-mangoh-green.dts
> @@ -6,11 +6,11 @@
> * Author : Neil Armstrong <narmstrong@baylibre.com>
> */
>
> +#include <dt-bindings/gpio/gpio.h>
> #include <dt-bindings/input/input.h>
> +#include <dt-bindings/interrupt-controller/irq.h>
>
> #include "qcom-mdm9615-wp8548.dtsi"
> -#include <dt-bindings/interrupt-controller/irq.h>
> -#include <dt-bindings/gpio/gpio.h>
>
> / {
> model = "MangOH Green with WP8548 Module";
^ permalink raw reply [flat|nested] 29+ messages in thread
* [PATCH 06/15] ARM: dts: qcom: strip prefix from PMIC files
2023-06-27 1:24 [PATCH 00/15] ARM: dts: qcom: cleanup PMIC usage Dmitry Baryshkov
` (4 preceding siblings ...)
2023-06-27 1:24 ` [PATCH 05/15] ARM: dts: qcom: mdm9615-wp8548-mangoh-green: group include clauses Dmitry Baryshkov
@ 2023-06-27 1:24 ` Dmitry Baryshkov
2023-06-27 11:07 ` Konrad Dybcio
2023-06-27 1:24 ` [PATCH 07/15] ARM: dts: qcom: apq8064: split PMICs to separate dtsi files Dmitry Baryshkov
` (8 subsequent siblings)
14 siblings, 1 reply; 29+ messages in thread
From: Dmitry Baryshkov @ 2023-06-27 1:24 UTC (permalink / raw)
To: Andy Gross, Bjorn Andersson, Konrad Dybcio, Rob Herring,
Krzysztof Kozlowski
Cc: linux-arm-msm, devicetree
As the vendor DTS files were moved to per-vendor subdirs, there no need
to use common prefixes. Drop the `qcom-' prefix from PMIC dtsi file.
This makes 32-bit qcom/ dts files closer to arm64 ones.
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
arch/arm/boot/dts/qcom/{qcom-pm8226.dtsi => pm8226.dtsi} | 0
arch/arm/boot/dts/qcom/{qcom-pm8841.dtsi => pm8841.dtsi} | 0
arch/arm/boot/dts/qcom/{qcom-pm8941.dtsi => pm8941.dtsi} | 0
arch/arm/boot/dts/qcom/{qcom-pma8084.dtsi => pma8084.dtsi} | 0
arch/arm/boot/dts/qcom/{qcom-pmx55.dtsi => pmx55.dtsi} | 0
arch/arm/boot/dts/qcom/{qcom-pmx65.dtsi => pmx65.dtsi} | 0
arch/arm/boot/dts/qcom/qcom-apq8026-asus-sparrow.dts | 2 +-
arch/arm/boot/dts/qcom/qcom-apq8026-huawei-sturgeon.dts | 2 +-
arch/arm/boot/dts/qcom/qcom-apq8026-lg-lenok.dts | 2 +-
arch/arm/boot/dts/qcom/qcom-apq8026-samsung-matisse-wifi.dts | 2 +-
arch/arm/boot/dts/qcom/qcom-apq8074-dragonboard.dts | 4 ++--
arch/arm/boot/dts/qcom/qcom-apq8084-ifc6540.dts | 2 +-
arch/arm/boot/dts/qcom/qcom-apq8084-mtp.dts | 2 +-
arch/arm/boot/dts/qcom/qcom-msm8974-lge-nexus5-hammerhead.dts | 4 ++--
arch/arm/boot/dts/qcom/qcom-msm8974-sony-xperia-rhine.dtsi | 4 ++--
arch/arm/boot/dts/qcom/qcom-msm8974pro-fairphone-fp2.dts | 4 ++--
arch/arm/boot/dts/qcom/qcom-msm8974pro-oneplus-bacon.dts | 4 ++--
arch/arm/boot/dts/qcom/qcom-msm8974pro-samsung-klte.dts | 2 +-
.../dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts | 4 ++--
arch/arm/boot/dts/qcom/qcom-sdx55-mtp.dts | 2 +-
arch/arm/boot/dts/qcom/qcom-sdx55-t55.dts | 2 +-
arch/arm/boot/dts/qcom/qcom-sdx55-telit-fn980-tlb.dts | 2 +-
arch/arm/boot/dts/qcom/qcom-sdx65-mtp.dts | 2 +-
23 files changed, 23 insertions(+), 23 deletions(-)
rename arch/arm/boot/dts/qcom/{qcom-pm8226.dtsi => pm8226.dtsi} (100%)
rename arch/arm/boot/dts/qcom/{qcom-pm8841.dtsi => pm8841.dtsi} (100%)
rename arch/arm/boot/dts/qcom/{qcom-pm8941.dtsi => pm8941.dtsi} (100%)
rename arch/arm/boot/dts/qcom/{qcom-pma8084.dtsi => pma8084.dtsi} (100%)
rename arch/arm/boot/dts/qcom/{qcom-pmx55.dtsi => pmx55.dtsi} (100%)
rename arch/arm/boot/dts/qcom/{qcom-pmx65.dtsi => pmx65.dtsi} (100%)
diff --git a/arch/arm/boot/dts/qcom/qcom-pm8226.dtsi b/arch/arm/boot/dts/qcom/pm8226.dtsi
similarity index 100%
rename from arch/arm/boot/dts/qcom/qcom-pm8226.dtsi
rename to arch/arm/boot/dts/qcom/pm8226.dtsi
diff --git a/arch/arm/boot/dts/qcom/qcom-pm8841.dtsi b/arch/arm/boot/dts/qcom/pm8841.dtsi
similarity index 100%
rename from arch/arm/boot/dts/qcom/qcom-pm8841.dtsi
rename to arch/arm/boot/dts/qcom/pm8841.dtsi
diff --git a/arch/arm/boot/dts/qcom/qcom-pm8941.dtsi b/arch/arm/boot/dts/qcom/pm8941.dtsi
similarity index 100%
rename from arch/arm/boot/dts/qcom/qcom-pm8941.dtsi
rename to arch/arm/boot/dts/qcom/pm8941.dtsi
diff --git a/arch/arm/boot/dts/qcom/qcom-pma8084.dtsi b/arch/arm/boot/dts/qcom/pma8084.dtsi
similarity index 100%
rename from arch/arm/boot/dts/qcom/qcom-pma8084.dtsi
rename to arch/arm/boot/dts/qcom/pma8084.dtsi
diff --git a/arch/arm/boot/dts/qcom/qcom-pmx55.dtsi b/arch/arm/boot/dts/qcom/pmx55.dtsi
similarity index 100%
rename from arch/arm/boot/dts/qcom/qcom-pmx55.dtsi
rename to arch/arm/boot/dts/qcom/pmx55.dtsi
diff --git a/arch/arm/boot/dts/qcom/qcom-pmx65.dtsi b/arch/arm/boot/dts/qcom/pmx65.dtsi
similarity index 100%
rename from arch/arm/boot/dts/qcom/qcom-pmx65.dtsi
rename to arch/arm/boot/dts/qcom/pmx65.dtsi
diff --git a/arch/arm/boot/dts/qcom/qcom-apq8026-asus-sparrow.dts b/arch/arm/boot/dts/qcom/qcom-apq8026-asus-sparrow.dts
index aa0e0e8d2a97..a39f5a161b03 100644
--- a/arch/arm/boot/dts/qcom/qcom-apq8026-asus-sparrow.dts
+++ b/arch/arm/boot/dts/qcom/qcom-apq8026-asus-sparrow.dts
@@ -6,7 +6,7 @@
/dts-v1/;
#include "qcom-msm8226.dtsi"
-#include "qcom-pm8226.dtsi"
+#include "pm8226.dtsi"
/delete-node/ &adsp_region;
diff --git a/arch/arm/boot/dts/qcom/qcom-apq8026-huawei-sturgeon.dts b/arch/arm/boot/dts/qcom/qcom-apq8026-huawei-sturgeon.dts
index de19640efe55..59b218042d32 100644
--- a/arch/arm/boot/dts/qcom/qcom-apq8026-huawei-sturgeon.dts
+++ b/arch/arm/boot/dts/qcom/qcom-apq8026-huawei-sturgeon.dts
@@ -6,7 +6,7 @@
/dts-v1/;
#include "qcom-msm8226.dtsi"
-#include "qcom-pm8226.dtsi"
+#include "pm8226.dtsi"
#include <dt-bindings/input/ti-drv260x.h>
/delete-node/ &adsp_region;
diff --git a/arch/arm/boot/dts/qcom/qcom-apq8026-lg-lenok.dts b/arch/arm/boot/dts/qcom/qcom-apq8026-lg-lenok.dts
index b887e5361ec3..feb78afef3a6 100644
--- a/arch/arm/boot/dts/qcom/qcom-apq8026-lg-lenok.dts
+++ b/arch/arm/boot/dts/qcom/qcom-apq8026-lg-lenok.dts
@@ -6,7 +6,7 @@
/dts-v1/;
#include "qcom-msm8226.dtsi"
-#include "qcom-pm8226.dtsi"
+#include "pm8226.dtsi"
/delete-node/ &adsp_region;
diff --git a/arch/arm/boot/dts/qcom/qcom-apq8026-samsung-matisse-wifi.dts b/arch/arm/boot/dts/qcom/qcom-apq8026-samsung-matisse-wifi.dts
index 884d99297d4c..42d3867dca42 100644
--- a/arch/arm/boot/dts/qcom/qcom-apq8026-samsung-matisse-wifi.dts
+++ b/arch/arm/boot/dts/qcom/qcom-apq8026-samsung-matisse-wifi.dts
@@ -7,7 +7,7 @@
#include <dt-bindings/input/input.h>
#include "qcom-msm8226.dtsi"
-#include "qcom-pm8226.dtsi"
+#include "pm8226.dtsi"
/delete-node/ &adsp_region;
/delete-node/ &smem_region;
diff --git a/arch/arm/boot/dts/qcom/qcom-apq8074-dragonboard.dts b/arch/arm/boot/dts/qcom/qcom-apq8074-dragonboard.dts
index e0679436000b..5a8af16bf02d 100644
--- a/arch/arm/boot/dts/qcom/qcom-apq8074-dragonboard.dts
+++ b/arch/arm/boot/dts/qcom/qcom-apq8074-dragonboard.dts
@@ -4,8 +4,8 @@
#include <dt-bindings/leds/common.h>
#include <dt-bindings/pinctrl/qcom,pmic-gpio.h>
#include "qcom-msm8974.dtsi"
-#include "qcom-pm8841.dtsi"
-#include "qcom-pm8941.dtsi"
+#include "pm8841.dtsi"
+#include "pm8941.dtsi"
/delete-node/ &mpss_region;
diff --git a/arch/arm/boot/dts/qcom/qcom-apq8084-ifc6540.dts b/arch/arm/boot/dts/qcom/qcom-apq8084-ifc6540.dts
index 116e59a3b76d..1df24c922be9 100644
--- a/arch/arm/boot/dts/qcom/qcom-apq8084-ifc6540.dts
+++ b/arch/arm/boot/dts/qcom/qcom-apq8084-ifc6540.dts
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0
#include "qcom-apq8084.dtsi"
-#include "qcom-pma8084.dtsi"
+#include "pma8084.dtsi"
/ {
model = "Qualcomm APQ8084/IFC6540";
diff --git a/arch/arm/boot/dts/qcom/qcom-apq8084-mtp.dts b/arch/arm/boot/dts/qcom/qcom-apq8084-mtp.dts
index c6b6680248a6..d4e6aee034af 100644
--- a/arch/arm/boot/dts/qcom/qcom-apq8084-mtp.dts
+++ b/arch/arm/boot/dts/qcom/qcom-apq8084-mtp.dts
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0
#include "qcom-apq8084.dtsi"
-#include "qcom-pma8084.dtsi"
+#include "pma8084.dtsi"
/ {
model = "Qualcomm APQ 8084-MTP";
diff --git a/arch/arm/boot/dts/qcom/qcom-msm8974-lge-nexus5-hammerhead.dts b/arch/arm/boot/dts/qcom/qcom-msm8974-lge-nexus5-hammerhead.dts
index 60bdfddeae69..da99f770d4f5 100644
--- a/arch/arm/boot/dts/qcom/qcom-msm8974-lge-nexus5-hammerhead.dts
+++ b/arch/arm/boot/dts/qcom/qcom-msm8974-lge-nexus5-hammerhead.dts
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: GPL-2.0
#include "qcom-msm8974.dtsi"
-#include "qcom-pm8841.dtsi"
-#include "qcom-pm8941.dtsi"
+#include "pm8841.dtsi"
+#include "pm8941.dtsi"
#include <dt-bindings/input/input.h>
#include <dt-bindings/leds/common.h>
#include <dt-bindings/pinctrl/qcom,pmic-gpio.h>
diff --git a/arch/arm/boot/dts/qcom/qcom-msm8974-sony-xperia-rhine.dtsi b/arch/arm/boot/dts/qcom/qcom-msm8974-sony-xperia-rhine.dtsi
index 68a2f9094e53..23ae474698aa 100644
--- a/arch/arm/boot/dts/qcom/qcom-msm8974-sony-xperia-rhine.dtsi
+++ b/arch/arm/boot/dts/qcom/qcom-msm8974-sony-xperia-rhine.dtsi
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: GPL-2.0
#include "qcom-msm8974.dtsi"
-#include "qcom-pm8841.dtsi"
-#include "qcom-pm8941.dtsi"
+#include "pm8841.dtsi"
+#include "pm8941.dtsi"
#include <dt-bindings/input/input.h>
#include <dt-bindings/leds/common.h>
#include <dt-bindings/pinctrl/qcom,pmic-gpio.h>
diff --git a/arch/arm/boot/dts/qcom/qcom-msm8974pro-fairphone-fp2.dts b/arch/arm/boot/dts/qcom/qcom-msm8974pro-fairphone-fp2.dts
index f531d2679f6c..24f9521a0be6 100644
--- a/arch/arm/boot/dts/qcom/qcom-msm8974pro-fairphone-fp2.dts
+++ b/arch/arm/boot/dts/qcom/qcom-msm8974pro-fairphone-fp2.dts
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: GPL-2.0
#include "qcom-msm8974pro.dtsi"
-#include "qcom-pm8841.dtsi"
-#include "qcom-pm8941.dtsi"
+#include "pm8841.dtsi"
+#include "pm8941.dtsi"
#include <dt-bindings/input/input.h>
#include <dt-bindings/leds/common.h>
#include <dt-bindings/pinctrl/qcom,pmic-gpio.h>
diff --git a/arch/arm/boot/dts/qcom/qcom-msm8974pro-oneplus-bacon.dts b/arch/arm/boot/dts/qcom/qcom-msm8974pro-oneplus-bacon.dts
index 8230d0e1d95d..c0ca264d8140 100644
--- a/arch/arm/boot/dts/qcom/qcom-msm8974pro-oneplus-bacon.dts
+++ b/arch/arm/boot/dts/qcom/qcom-msm8974pro-oneplus-bacon.dts
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: GPL-2.0
#include "qcom-msm8974pro.dtsi"
-#include "qcom-pm8841.dtsi"
-#include "qcom-pm8941.dtsi"
+#include "pm8841.dtsi"
+#include "pm8941.dtsi"
#include <dt-bindings/input/input.h>
#include <dt-bindings/pinctrl/qcom,pmic-gpio.h>
diff --git a/arch/arm/boot/dts/qcom/qcom-msm8974pro-samsung-klte.dts b/arch/arm/boot/dts/qcom/qcom-msm8974pro-samsung-klte.dts
index 3e2c86591ee2..325feb89b343 100644
--- a/arch/arm/boot/dts/qcom/qcom-msm8974pro-samsung-klte.dts
+++ b/arch/arm/boot/dts/qcom/qcom-msm8974pro-samsung-klte.dts
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0
#include "qcom-msm8974pro.dtsi"
-#include "qcom-pma8084.dtsi"
+#include "pma8084.dtsi"
#include <dt-bindings/input/input.h>
#include <dt-bindings/pinctrl/qcom,pmic-gpio.h>
#include <dt-bindings/leds/common.h>
diff --git a/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts b/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts
index 154639d56f35..efe21289c9fe 100644
--- a/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts
+++ b/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: GPL-2.0
#include "qcom-msm8974pro.dtsi"
-#include "qcom-pm8841.dtsi"
-#include "qcom-pm8941.dtsi"
+#include "pm8841.dtsi"
+#include "pm8941.dtsi"
#include <dt-bindings/input/input.h>
#include <dt-bindings/leds/common.h>
#include <dt-bindings/pinctrl/qcom,pmic-gpio.h>
diff --git a/arch/arm/boot/dts/qcom/qcom-sdx55-mtp.dts b/arch/arm/boot/dts/qcom/qcom-sdx55-mtp.dts
index 7e97ad5803d8..247069361909 100644
--- a/arch/arm/boot/dts/qcom/qcom-sdx55-mtp.dts
+++ b/arch/arm/boot/dts/qcom/qcom-sdx55-mtp.dts
@@ -9,7 +9,7 @@
#include "qcom-sdx55.dtsi"
#include <dt-bindings/regulator/qcom,rpmh-regulator.h>
#include <arm64/qcom/pm8150b.dtsi>
-#include "qcom-pmx55.dtsi"
+#include "pmx55.dtsi"
/ {
model = "Qualcomm Technologies, Inc. SDX55 MTP";
diff --git a/arch/arm/boot/dts/qcom/qcom-sdx55-t55.dts b/arch/arm/boot/dts/qcom/qcom-sdx55-t55.dts
index 51058b065279..082f7ed1a01f 100644
--- a/arch/arm/boot/dts/qcom/qcom-sdx55-t55.dts
+++ b/arch/arm/boot/dts/qcom/qcom-sdx55-t55.dts
@@ -8,7 +8,7 @@
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/regulator/qcom,rpmh-regulator.h>
#include "qcom-sdx55.dtsi"
-#include "qcom-pmx55.dtsi"
+#include "pmx55.dtsi"
/ {
model = "Thundercomm T55 Development Kit";
diff --git a/arch/arm/boot/dts/qcom/qcom-sdx55-telit-fn980-tlb.dts b/arch/arm/boot/dts/qcom/qcom-sdx55-telit-fn980-tlb.dts
index 8fadc6e70692..e336a15b45c4 100644
--- a/arch/arm/boot/dts/qcom/qcom-sdx55-telit-fn980-tlb.dts
+++ b/arch/arm/boot/dts/qcom/qcom-sdx55-telit-fn980-tlb.dts
@@ -8,7 +8,7 @@
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/regulator/qcom,rpmh-regulator.h>
#include "qcom-sdx55.dtsi"
-#include "qcom-pmx55.dtsi"
+#include "pmx55.dtsi"
/ {
model = "Telit FN980 TLB";
diff --git a/arch/arm/boot/dts/qcom/qcom-sdx65-mtp.dts b/arch/arm/boot/dts/qcom/qcom-sdx65-mtp.dts
index 02d8d6e241ae..5385d9782f8e 100644
--- a/arch/arm/boot/dts/qcom/qcom-sdx65-mtp.dts
+++ b/arch/arm/boot/dts/qcom/qcom-sdx65-mtp.dts
@@ -8,7 +8,7 @@
#include <dt-bindings/regulator/qcom,rpmh-regulator.h>
#include <arm64/qcom/pmk8350.dtsi>
#include <arm64/qcom/pm8150b.dtsi>
-#include "qcom-pmx65.dtsi"
+#include "pmx65.dtsi"
/ {
model = "Qualcomm Technologies, Inc. SDX65 MTP";
--
2.39.2
^ permalink raw reply related [flat|nested] 29+ messages in thread* Re: [PATCH 06/15] ARM: dts: qcom: strip prefix from PMIC files
2023-06-27 1:24 ` [PATCH 06/15] ARM: dts: qcom: strip prefix from PMIC files Dmitry Baryshkov
@ 2023-06-27 11:07 ` Konrad Dybcio
0 siblings, 0 replies; 29+ messages in thread
From: Konrad Dybcio @ 2023-06-27 11:07 UTC (permalink / raw)
To: Dmitry Baryshkov, Andy Gross, Bjorn Andersson, Rob Herring,
Krzysztof Kozlowski
Cc: linux-arm-msm, devicetree
On 27.06.2023 03:24, Dmitry Baryshkov wrote:
> As the vendor DTS files were moved to per-vendor subdirs, there no need
> to use common prefixes. Drop the `qcom-' prefix from PMIC dtsi file.
> This makes 32-bit qcom/ dts files closer to arm64 ones.
>
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> ---
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Konrad
> arch/arm/boot/dts/qcom/{qcom-pm8226.dtsi => pm8226.dtsi} | 0
> arch/arm/boot/dts/qcom/{qcom-pm8841.dtsi => pm8841.dtsi} | 0
> arch/arm/boot/dts/qcom/{qcom-pm8941.dtsi => pm8941.dtsi} | 0
> arch/arm/boot/dts/qcom/{qcom-pma8084.dtsi => pma8084.dtsi} | 0
> arch/arm/boot/dts/qcom/{qcom-pmx55.dtsi => pmx55.dtsi} | 0
> arch/arm/boot/dts/qcom/{qcom-pmx65.dtsi => pmx65.dtsi} | 0
> arch/arm/boot/dts/qcom/qcom-apq8026-asus-sparrow.dts | 2 +-
> arch/arm/boot/dts/qcom/qcom-apq8026-huawei-sturgeon.dts | 2 +-
> arch/arm/boot/dts/qcom/qcom-apq8026-lg-lenok.dts | 2 +-
> arch/arm/boot/dts/qcom/qcom-apq8026-samsung-matisse-wifi.dts | 2 +-
> arch/arm/boot/dts/qcom/qcom-apq8074-dragonboard.dts | 4 ++--
> arch/arm/boot/dts/qcom/qcom-apq8084-ifc6540.dts | 2 +-
> arch/arm/boot/dts/qcom/qcom-apq8084-mtp.dts | 2 +-
> arch/arm/boot/dts/qcom/qcom-msm8974-lge-nexus5-hammerhead.dts | 4 ++--
> arch/arm/boot/dts/qcom/qcom-msm8974-sony-xperia-rhine.dtsi | 4 ++--
> arch/arm/boot/dts/qcom/qcom-msm8974pro-fairphone-fp2.dts | 4 ++--
> arch/arm/boot/dts/qcom/qcom-msm8974pro-oneplus-bacon.dts | 4 ++--
> arch/arm/boot/dts/qcom/qcom-msm8974pro-samsung-klte.dts | 2 +-
> .../dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts | 4 ++--
> arch/arm/boot/dts/qcom/qcom-sdx55-mtp.dts | 2 +-
> arch/arm/boot/dts/qcom/qcom-sdx55-t55.dts | 2 +-
> arch/arm/boot/dts/qcom/qcom-sdx55-telit-fn980-tlb.dts | 2 +-
> arch/arm/boot/dts/qcom/qcom-sdx65-mtp.dts | 2 +-
> 23 files changed, 23 insertions(+), 23 deletions(-)
> rename arch/arm/boot/dts/qcom/{qcom-pm8226.dtsi => pm8226.dtsi} (100%)
> rename arch/arm/boot/dts/qcom/{qcom-pm8841.dtsi => pm8841.dtsi} (100%)
> rename arch/arm/boot/dts/qcom/{qcom-pm8941.dtsi => pm8941.dtsi} (100%)
> rename arch/arm/boot/dts/qcom/{qcom-pma8084.dtsi => pma8084.dtsi} (100%)
> rename arch/arm/boot/dts/qcom/{qcom-pmx55.dtsi => pmx55.dtsi} (100%)
> rename arch/arm/boot/dts/qcom/{qcom-pmx65.dtsi => pmx65.dtsi} (100%)
>
> diff --git a/arch/arm/boot/dts/qcom/qcom-pm8226.dtsi b/arch/arm/boot/dts/qcom/pm8226.dtsi
> similarity index 100%
> rename from arch/arm/boot/dts/qcom/qcom-pm8226.dtsi
> rename to arch/arm/boot/dts/qcom/pm8226.dtsi
> diff --git a/arch/arm/boot/dts/qcom/qcom-pm8841.dtsi b/arch/arm/boot/dts/qcom/pm8841.dtsi
> similarity index 100%
> rename from arch/arm/boot/dts/qcom/qcom-pm8841.dtsi
> rename to arch/arm/boot/dts/qcom/pm8841.dtsi
> diff --git a/arch/arm/boot/dts/qcom/qcom-pm8941.dtsi b/arch/arm/boot/dts/qcom/pm8941.dtsi
> similarity index 100%
> rename from arch/arm/boot/dts/qcom/qcom-pm8941.dtsi
> rename to arch/arm/boot/dts/qcom/pm8941.dtsi
> diff --git a/arch/arm/boot/dts/qcom/qcom-pma8084.dtsi b/arch/arm/boot/dts/qcom/pma8084.dtsi
> similarity index 100%
> rename from arch/arm/boot/dts/qcom/qcom-pma8084.dtsi
> rename to arch/arm/boot/dts/qcom/pma8084.dtsi
> diff --git a/arch/arm/boot/dts/qcom/qcom-pmx55.dtsi b/arch/arm/boot/dts/qcom/pmx55.dtsi
> similarity index 100%
> rename from arch/arm/boot/dts/qcom/qcom-pmx55.dtsi
> rename to arch/arm/boot/dts/qcom/pmx55.dtsi
> diff --git a/arch/arm/boot/dts/qcom/qcom-pmx65.dtsi b/arch/arm/boot/dts/qcom/pmx65.dtsi
> similarity index 100%
> rename from arch/arm/boot/dts/qcom/qcom-pmx65.dtsi
> rename to arch/arm/boot/dts/qcom/pmx65.dtsi
> diff --git a/arch/arm/boot/dts/qcom/qcom-apq8026-asus-sparrow.dts b/arch/arm/boot/dts/qcom/qcom-apq8026-asus-sparrow.dts
> index aa0e0e8d2a97..a39f5a161b03 100644
> --- a/arch/arm/boot/dts/qcom/qcom-apq8026-asus-sparrow.dts
> +++ b/arch/arm/boot/dts/qcom/qcom-apq8026-asus-sparrow.dts
> @@ -6,7 +6,7 @@
> /dts-v1/;
>
> #include "qcom-msm8226.dtsi"
> -#include "qcom-pm8226.dtsi"
> +#include "pm8226.dtsi"
>
> /delete-node/ &adsp_region;
>
> diff --git a/arch/arm/boot/dts/qcom/qcom-apq8026-huawei-sturgeon.dts b/arch/arm/boot/dts/qcom/qcom-apq8026-huawei-sturgeon.dts
> index de19640efe55..59b218042d32 100644
> --- a/arch/arm/boot/dts/qcom/qcom-apq8026-huawei-sturgeon.dts
> +++ b/arch/arm/boot/dts/qcom/qcom-apq8026-huawei-sturgeon.dts
> @@ -6,7 +6,7 @@
> /dts-v1/;
>
> #include "qcom-msm8226.dtsi"
> -#include "qcom-pm8226.dtsi"
> +#include "pm8226.dtsi"
> #include <dt-bindings/input/ti-drv260x.h>
>
> /delete-node/ &adsp_region;
> diff --git a/arch/arm/boot/dts/qcom/qcom-apq8026-lg-lenok.dts b/arch/arm/boot/dts/qcom/qcom-apq8026-lg-lenok.dts
> index b887e5361ec3..feb78afef3a6 100644
> --- a/arch/arm/boot/dts/qcom/qcom-apq8026-lg-lenok.dts
> +++ b/arch/arm/boot/dts/qcom/qcom-apq8026-lg-lenok.dts
> @@ -6,7 +6,7 @@
> /dts-v1/;
>
> #include "qcom-msm8226.dtsi"
> -#include "qcom-pm8226.dtsi"
> +#include "pm8226.dtsi"
>
> /delete-node/ &adsp_region;
>
> diff --git a/arch/arm/boot/dts/qcom/qcom-apq8026-samsung-matisse-wifi.dts b/arch/arm/boot/dts/qcom/qcom-apq8026-samsung-matisse-wifi.dts
> index 884d99297d4c..42d3867dca42 100644
> --- a/arch/arm/boot/dts/qcom/qcom-apq8026-samsung-matisse-wifi.dts
> +++ b/arch/arm/boot/dts/qcom/qcom-apq8026-samsung-matisse-wifi.dts
> @@ -7,7 +7,7 @@
>
> #include <dt-bindings/input/input.h>
> #include "qcom-msm8226.dtsi"
> -#include "qcom-pm8226.dtsi"
> +#include "pm8226.dtsi"
>
> /delete-node/ &adsp_region;
> /delete-node/ &smem_region;
> diff --git a/arch/arm/boot/dts/qcom/qcom-apq8074-dragonboard.dts b/arch/arm/boot/dts/qcom/qcom-apq8074-dragonboard.dts
> index e0679436000b..5a8af16bf02d 100644
> --- a/arch/arm/boot/dts/qcom/qcom-apq8074-dragonboard.dts
> +++ b/arch/arm/boot/dts/qcom/qcom-apq8074-dragonboard.dts
> @@ -4,8 +4,8 @@
> #include <dt-bindings/leds/common.h>
> #include <dt-bindings/pinctrl/qcom,pmic-gpio.h>
> #include "qcom-msm8974.dtsi"
> -#include "qcom-pm8841.dtsi"
> -#include "qcom-pm8941.dtsi"
> +#include "pm8841.dtsi"
> +#include "pm8941.dtsi"
>
> /delete-node/ &mpss_region;
>
> diff --git a/arch/arm/boot/dts/qcom/qcom-apq8084-ifc6540.dts b/arch/arm/boot/dts/qcom/qcom-apq8084-ifc6540.dts
> index 116e59a3b76d..1df24c922be9 100644
> --- a/arch/arm/boot/dts/qcom/qcom-apq8084-ifc6540.dts
> +++ b/arch/arm/boot/dts/qcom/qcom-apq8084-ifc6540.dts
> @@ -1,6 +1,6 @@
> // SPDX-License-Identifier: GPL-2.0
> #include "qcom-apq8084.dtsi"
> -#include "qcom-pma8084.dtsi"
> +#include "pma8084.dtsi"
>
> / {
> model = "Qualcomm APQ8084/IFC6540";
> diff --git a/arch/arm/boot/dts/qcom/qcom-apq8084-mtp.dts b/arch/arm/boot/dts/qcom/qcom-apq8084-mtp.dts
> index c6b6680248a6..d4e6aee034af 100644
> --- a/arch/arm/boot/dts/qcom/qcom-apq8084-mtp.dts
> +++ b/arch/arm/boot/dts/qcom/qcom-apq8084-mtp.dts
> @@ -1,6 +1,6 @@
> // SPDX-License-Identifier: GPL-2.0
> #include "qcom-apq8084.dtsi"
> -#include "qcom-pma8084.dtsi"
> +#include "pma8084.dtsi"
>
> / {
> model = "Qualcomm APQ 8084-MTP";
> diff --git a/arch/arm/boot/dts/qcom/qcom-msm8974-lge-nexus5-hammerhead.dts b/arch/arm/boot/dts/qcom/qcom-msm8974-lge-nexus5-hammerhead.dts
> index 60bdfddeae69..da99f770d4f5 100644
> --- a/arch/arm/boot/dts/qcom/qcom-msm8974-lge-nexus5-hammerhead.dts
> +++ b/arch/arm/boot/dts/qcom/qcom-msm8974-lge-nexus5-hammerhead.dts
> @@ -1,7 +1,7 @@
> // SPDX-License-Identifier: GPL-2.0
> #include "qcom-msm8974.dtsi"
> -#include "qcom-pm8841.dtsi"
> -#include "qcom-pm8941.dtsi"
> +#include "pm8841.dtsi"
> +#include "pm8941.dtsi"
> #include <dt-bindings/input/input.h>
> #include <dt-bindings/leds/common.h>
> #include <dt-bindings/pinctrl/qcom,pmic-gpio.h>
> diff --git a/arch/arm/boot/dts/qcom/qcom-msm8974-sony-xperia-rhine.dtsi b/arch/arm/boot/dts/qcom/qcom-msm8974-sony-xperia-rhine.dtsi
> index 68a2f9094e53..23ae474698aa 100644
> --- a/arch/arm/boot/dts/qcom/qcom-msm8974-sony-xperia-rhine.dtsi
> +++ b/arch/arm/boot/dts/qcom/qcom-msm8974-sony-xperia-rhine.dtsi
> @@ -1,7 +1,7 @@
> // SPDX-License-Identifier: GPL-2.0
> #include "qcom-msm8974.dtsi"
> -#include "qcom-pm8841.dtsi"
> -#include "qcom-pm8941.dtsi"
> +#include "pm8841.dtsi"
> +#include "pm8941.dtsi"
> #include <dt-bindings/input/input.h>
> #include <dt-bindings/leds/common.h>
> #include <dt-bindings/pinctrl/qcom,pmic-gpio.h>
> diff --git a/arch/arm/boot/dts/qcom/qcom-msm8974pro-fairphone-fp2.dts b/arch/arm/boot/dts/qcom/qcom-msm8974pro-fairphone-fp2.dts
> index f531d2679f6c..24f9521a0be6 100644
> --- a/arch/arm/boot/dts/qcom/qcom-msm8974pro-fairphone-fp2.dts
> +++ b/arch/arm/boot/dts/qcom/qcom-msm8974pro-fairphone-fp2.dts
> @@ -1,7 +1,7 @@
> // SPDX-License-Identifier: GPL-2.0
> #include "qcom-msm8974pro.dtsi"
> -#include "qcom-pm8841.dtsi"
> -#include "qcom-pm8941.dtsi"
> +#include "pm8841.dtsi"
> +#include "pm8941.dtsi"
> #include <dt-bindings/input/input.h>
> #include <dt-bindings/leds/common.h>
> #include <dt-bindings/pinctrl/qcom,pmic-gpio.h>
> diff --git a/arch/arm/boot/dts/qcom/qcom-msm8974pro-oneplus-bacon.dts b/arch/arm/boot/dts/qcom/qcom-msm8974pro-oneplus-bacon.dts
> index 8230d0e1d95d..c0ca264d8140 100644
> --- a/arch/arm/boot/dts/qcom/qcom-msm8974pro-oneplus-bacon.dts
> +++ b/arch/arm/boot/dts/qcom/qcom-msm8974pro-oneplus-bacon.dts
> @@ -1,7 +1,7 @@
> // SPDX-License-Identifier: GPL-2.0
> #include "qcom-msm8974pro.dtsi"
> -#include "qcom-pm8841.dtsi"
> -#include "qcom-pm8941.dtsi"
> +#include "pm8841.dtsi"
> +#include "pm8941.dtsi"
> #include <dt-bindings/input/input.h>
> #include <dt-bindings/pinctrl/qcom,pmic-gpio.h>
>
> diff --git a/arch/arm/boot/dts/qcom/qcom-msm8974pro-samsung-klte.dts b/arch/arm/boot/dts/qcom/qcom-msm8974pro-samsung-klte.dts
> index 3e2c86591ee2..325feb89b343 100644
> --- a/arch/arm/boot/dts/qcom/qcom-msm8974pro-samsung-klte.dts
> +++ b/arch/arm/boot/dts/qcom/qcom-msm8974pro-samsung-klte.dts
> @@ -1,6 +1,6 @@
> // SPDX-License-Identifier: GPL-2.0
> #include "qcom-msm8974pro.dtsi"
> -#include "qcom-pma8084.dtsi"
> +#include "pma8084.dtsi"
> #include <dt-bindings/input/input.h>
> #include <dt-bindings/pinctrl/qcom,pmic-gpio.h>
> #include <dt-bindings/leds/common.h>
> diff --git a/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts b/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts
> index 154639d56f35..efe21289c9fe 100644
> --- a/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts
> +++ b/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts
> @@ -1,7 +1,7 @@
> // SPDX-License-Identifier: GPL-2.0
> #include "qcom-msm8974pro.dtsi"
> -#include "qcom-pm8841.dtsi"
> -#include "qcom-pm8941.dtsi"
> +#include "pm8841.dtsi"
> +#include "pm8941.dtsi"
> #include <dt-bindings/input/input.h>
> #include <dt-bindings/leds/common.h>
> #include <dt-bindings/pinctrl/qcom,pmic-gpio.h>
> diff --git a/arch/arm/boot/dts/qcom/qcom-sdx55-mtp.dts b/arch/arm/boot/dts/qcom/qcom-sdx55-mtp.dts
> index 7e97ad5803d8..247069361909 100644
> --- a/arch/arm/boot/dts/qcom/qcom-sdx55-mtp.dts
> +++ b/arch/arm/boot/dts/qcom/qcom-sdx55-mtp.dts
> @@ -9,7 +9,7 @@
> #include "qcom-sdx55.dtsi"
> #include <dt-bindings/regulator/qcom,rpmh-regulator.h>
> #include <arm64/qcom/pm8150b.dtsi>
> -#include "qcom-pmx55.dtsi"
> +#include "pmx55.dtsi"
>
> / {
> model = "Qualcomm Technologies, Inc. SDX55 MTP";
> diff --git a/arch/arm/boot/dts/qcom/qcom-sdx55-t55.dts b/arch/arm/boot/dts/qcom/qcom-sdx55-t55.dts
> index 51058b065279..082f7ed1a01f 100644
> --- a/arch/arm/boot/dts/qcom/qcom-sdx55-t55.dts
> +++ b/arch/arm/boot/dts/qcom/qcom-sdx55-t55.dts
> @@ -8,7 +8,7 @@
> #include <dt-bindings/gpio/gpio.h>
> #include <dt-bindings/regulator/qcom,rpmh-regulator.h>
> #include "qcom-sdx55.dtsi"
> -#include "qcom-pmx55.dtsi"
> +#include "pmx55.dtsi"
>
> / {
> model = "Thundercomm T55 Development Kit";
> diff --git a/arch/arm/boot/dts/qcom/qcom-sdx55-telit-fn980-tlb.dts b/arch/arm/boot/dts/qcom/qcom-sdx55-telit-fn980-tlb.dts
> index 8fadc6e70692..e336a15b45c4 100644
> --- a/arch/arm/boot/dts/qcom/qcom-sdx55-telit-fn980-tlb.dts
> +++ b/arch/arm/boot/dts/qcom/qcom-sdx55-telit-fn980-tlb.dts
> @@ -8,7 +8,7 @@
> #include <dt-bindings/gpio/gpio.h>
> #include <dt-bindings/regulator/qcom,rpmh-regulator.h>
> #include "qcom-sdx55.dtsi"
> -#include "qcom-pmx55.dtsi"
> +#include "pmx55.dtsi"
>
> / {
> model = "Telit FN980 TLB";
> diff --git a/arch/arm/boot/dts/qcom/qcom-sdx65-mtp.dts b/arch/arm/boot/dts/qcom/qcom-sdx65-mtp.dts
> index 02d8d6e241ae..5385d9782f8e 100644
> --- a/arch/arm/boot/dts/qcom/qcom-sdx65-mtp.dts
> +++ b/arch/arm/boot/dts/qcom/qcom-sdx65-mtp.dts
> @@ -8,7 +8,7 @@
> #include <dt-bindings/regulator/qcom,rpmh-regulator.h>
> #include <arm64/qcom/pmk8350.dtsi>
> #include <arm64/qcom/pm8150b.dtsi>
> -#include "qcom-pmx65.dtsi"
> +#include "pmx65.dtsi"
>
> / {
> model = "Qualcomm Technologies, Inc. SDX65 MTP";
^ permalink raw reply [flat|nested] 29+ messages in thread
* [PATCH 07/15] ARM: dts: qcom: apq8064: split PMICs to separate dtsi files
2023-06-27 1:24 [PATCH 00/15] ARM: dts: qcom: cleanup PMIC usage Dmitry Baryshkov
` (5 preceding siblings ...)
2023-06-27 1:24 ` [PATCH 06/15] ARM: dts: qcom: strip prefix from PMIC files Dmitry Baryshkov
@ 2023-06-27 1:24 ` Dmitry Baryshkov
2023-06-27 11:12 ` Konrad Dybcio
2023-06-27 1:24 ` [PATCH 08/15] ARM: dts: qcom: mdm9615: split PMIC " Dmitry Baryshkov
` (7 subsequent siblings)
14 siblings, 1 reply; 29+ messages in thread
From: Dmitry Baryshkov @ 2023-06-27 1:24 UTC (permalink / raw)
To: Andy Gross, Bjorn Andersson, Konrad Dybcio, Rob Herring,
Krzysztof Kozlowski
Cc: linux-arm-msm, devicetree
The PMICs are not a part of the SoC, so move PMICs to separate files and
include them from the board files.
Suggested-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
arch/arm/boot/dts/qcom/pm8821.dtsi | 22 +++
arch/arm/boot/dts/qcom/pm8921.dtsi | 126 +++++++++++++++++
.../dts/qcom/qcom-apq8064-asus-nexus7-flo.dts | 6 +-
.../boot/dts/qcom/qcom-apq8064-cm-qs600.dts | 5 +-
.../boot/dts/qcom/qcom-apq8064-ifc6410.dts | 5 +-
.../qcom-apq8064-sony-xperia-lagan-yuga.dts | 5 +-
arch/arm/boot/dts/qcom/qcom-apq8064.dtsi | 132 +-----------------
7 files changed, 169 insertions(+), 132 deletions(-)
create mode 100644 arch/arm/boot/dts/qcom/pm8821.dtsi
create mode 100644 arch/arm/boot/dts/qcom/pm8921.dtsi
diff --git a/arch/arm/boot/dts/qcom/pm8821.dtsi b/arch/arm/boot/dts/qcom/pm8821.dtsi
new file mode 100644
index 000000000000..064e3ba54e18
--- /dev/null
+++ b/arch/arm/boot/dts/qcom/pm8821.dtsi
@@ -0,0 +1,22 @@
+// SPDX-License-Identifier: GPL-2.0
+
+/* This PMIC is used on a secondary SSBI bus */
+&ssbi2 {
+ pm8821: pmic {
+ compatible = "qcom,pm8821";
+ interrupt-controller;
+ #interrupt-cells = <2>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ pm8821_mpps: mpps@50 {
+ compatible = "qcom,pm8821-mpp", "qcom,ssbi-mpp";
+ reg = <0x50>;
+ gpio-controller;
+ #gpio-cells = <2>;
+ gpio-ranges = <&pm8821_mpps 0 0 4>;
+ interrupt-controller;
+ #interrupt-cells = <2>;
+ };
+ };
+};
diff --git a/arch/arm/boot/dts/qcom/pm8921.dtsi b/arch/arm/boot/dts/qcom/pm8921.dtsi
new file mode 100644
index 000000000000..63e95b56dcf1
--- /dev/null
+++ b/arch/arm/boot/dts/qcom/pm8921.dtsi
@@ -0,0 +1,126 @@
+// SPDX-License-Identifier: GPL-2.0
+
+&ssbi {
+ pm8921: pmic {
+ compatible = "qcom,pm8921";
+ interrupt-controller;
+ #interrupt-cells = <2>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ pwrkey@1c {
+ compatible = "qcom,pm8921-pwrkey";
+ reg = <0x1c>;
+ interrupt-parent = <&pm8921>;
+ interrupts = <50 IRQ_TYPE_EDGE_RISING>,
+ <51 IRQ_TYPE_EDGE_RISING>;
+ debounce = <15625>;
+ pull-up;
+ };
+
+ pm8921_mpps: mpps@50 {
+ compatible = "qcom,pm8921-mpp",
+ "qcom,ssbi-mpp";
+ reg = <0x50>;
+ gpio-controller;
+ #gpio-cells = <2>;
+ gpio-ranges = <&pm8921_mpps 0 0 12>;
+ interrupt-controller;
+ #interrupt-cells = <2>;
+ };
+
+ rtc@11d {
+ compatible = "qcom,pm8921-rtc";
+ reg = <0x11d>;
+ interrupt-parent = <&pm8921>;
+ interrupts = <39 IRQ_TYPE_EDGE_RISING>;
+ allow-set-time;
+ };
+
+ pm8921_gpio: gpio@150 {
+ compatible = "qcom,pm8921-gpio",
+ "qcom,ssbi-gpio";
+ reg = <0x150>;
+ gpio-controller;
+ #gpio-cells = <2>;
+ gpio-ranges = <&pm8921_gpio 0 0 44>;
+ interrupt-controller;
+ #interrupt-cells = <2>;
+ };
+
+ pm8921_xoadc: xoadc@197 {
+ compatible = "qcom,pm8921-adc";
+ reg = <0x197>;
+ interrupts-extended = <&pm8921 78 IRQ_TYPE_EDGE_RISING>;
+ #address-cells = <2>;
+ #size-cells = <0>;
+ #io-channel-cells = <2>;
+
+ vcoin: adc-channel@0 {
+ reg = <0x00 0x00>;
+ };
+
+ vbat: adc-channel@1 {
+ reg = <0x00 0x01>;
+ };
+
+ dcin: adc-channel@2 {
+ reg = <0x00 0x02>;
+ };
+
+ vph_pwr: adc-channel@4 {
+ reg = <0x00 0x04>;
+ };
+
+ batt_therm: adc-channel@8 {
+ reg = <0x00 0x08>;
+ };
+
+ batt_id: adc-channel@9 {
+ reg = <0x00 0x09>;
+ };
+
+ usb_vbus: adc-channel@a {
+ reg = <0x00 0x0a>;
+ };
+
+ die_temp: adc-channel@b {
+ reg = <0x00 0x0b>;
+ };
+
+ ref_625mv: adc-channel@c {
+ reg = <0x00 0x0c>;
+ };
+
+ ref_1250mv: adc-channel@d {
+ reg = <0x00 0x0d>;
+ };
+
+ chg_temp: adc-channel@e {
+ reg = <0x00 0x0e>;
+ };
+
+ ref_muxoff: adc-channel@f {
+ reg = <0x00 0x0f>;
+ };
+ };
+ };
+};
+
+/ {
+ /*
+ * These channels from the ADC are simply hardware monitors.
+ * That is why the ADC is referred to as "HKADC" - HouseKeeping
+ * ADC.
+ */
+ iio-hwmon {
+ compatible = "iio-hwmon";
+ io-channels = <&pm8921_xoadc 0x00 0x01>, /* Battery */
+ <&pm8921_xoadc 0x00 0x02>, /* DC in (charger) */
+ <&pm8921_xoadc 0x00 0x04>, /* VPH the main system voltage */
+ <&pm8921_xoadc 0x00 0x0b>, /* Die temperature */
+ <&pm8921_xoadc 0x00 0x0c>, /* Reference voltage 1.25V */
+ <&pm8921_xoadc 0x00 0x0d>, /* Reference voltage 0.625V */
+ <&pm8921_xoadc 0x00 0x0e>; /* Charger temperature */
+ };
+};
diff --git a/arch/arm/boot/dts/qcom/qcom-apq8064-asus-nexus7-flo.dts b/arch/arm/boot/dts/qcom/qcom-apq8064-asus-nexus7-flo.dts
index 0e80a5a8e3c6..d5dee70620c2 100644
--- a/arch/arm/boot/dts/qcom/qcom-apq8064-asus-nexus7-flo.dts
+++ b/arch/arm/boot/dts/qcom/qcom-apq8064-asus-nexus7-flo.dts
@@ -1,8 +1,12 @@
// SPDX-License-Identifier: GPL-2.0
-#include "qcom-apq8064-v2.0.dtsi"
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/input.h>
#include <dt-bindings/pinctrl/qcom,pmic-gpio.h>
+
+#include "qcom-apq8064-v2.0.dtsi"
+#include "pm8821.dtsi"
+#include "pm8921.dtsi"
+
/ {
model = "Asus Nexus7(flo)";
compatible = "asus,nexus7-flo", "qcom,apq8064";
diff --git a/arch/arm/boot/dts/qcom/qcom-apq8064-cm-qs600.dts b/arch/arm/boot/dts/qcom/qcom-apq8064-cm-qs600.dts
index d6ecfd8addb7..ffd654ab0b57 100644
--- a/arch/arm/boot/dts/qcom/qcom-apq8064-cm-qs600.dts
+++ b/arch/arm/boot/dts/qcom/qcom-apq8064-cm-qs600.dts
@@ -1,8 +1,11 @@
// SPDX-License-Identifier: GPL-2.0
-#include "qcom-apq8064-v2.0.dtsi"
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/pinctrl/qcom,pmic-gpio.h>
+#include "qcom-apq8064-v2.0.dtsi"
+#include "pm8821.dtsi"
+#include "pm8921.dtsi"
+
/ {
model = "CompuLab CM-QS600";
compatible = "qcom,apq8064-cm-qs600", "qcom,apq8064";
diff --git a/arch/arm/boot/dts/qcom/qcom-apq8064-ifc6410.dts b/arch/arm/boot/dts/qcom/qcom-apq8064-ifc6410.dts
index 96307550523a..12bf8ea3fb93 100644
--- a/arch/arm/boot/dts/qcom/qcom-apq8064-ifc6410.dts
+++ b/arch/arm/boot/dts/qcom/qcom-apq8064-ifc6410.dts
@@ -1,9 +1,12 @@
// SPDX-License-Identifier: GPL-2.0
-#include "qcom-apq8064-v2.0.dtsi"
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/leds/common.h>
#include <dt-bindings/pinctrl/qcom,pmic-gpio.h>
+#include "qcom-apq8064-v2.0.dtsi"
+#include "pm8821.dtsi"
+#include "pm8921.dtsi"
+
/ {
model = "Qualcomm APQ8064/IFC6410";
compatible = "qcom,apq8064-ifc6410", "qcom,apq8064";
diff --git a/arch/arm/boot/dts/qcom/qcom-apq8064-sony-xperia-lagan-yuga.dts b/arch/arm/boot/dts/qcom/qcom-apq8064-sony-xperia-lagan-yuga.dts
index 9244512b74d1..53dd9d79556f 100644
--- a/arch/arm/boot/dts/qcom/qcom-apq8064-sony-xperia-lagan-yuga.dts
+++ b/arch/arm/boot/dts/qcom/qcom-apq8064-sony-xperia-lagan-yuga.dts
@@ -1,10 +1,13 @@
// SPDX-License-Identifier: GPL-2.0
-#include "qcom-apq8064-v2.0.dtsi"
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/input.h>
#include <dt-bindings/mfd/qcom-rpm.h>
#include <dt-bindings/pinctrl/qcom,pmic-gpio.h>
+#include "qcom-apq8064-v2.0.dtsi"
+#include "pm8821.dtsi"
+#include "pm8921.dtsi"
+
/ {
model = "Sony Xperia Z";
compatible = "sony,xperia-yuga", "qcom,apq8064";
diff --git a/arch/arm/boot/dts/qcom/qcom-apq8064.dtsi b/arch/arm/boot/dts/qcom/qcom-apq8064.dtsi
index 4f4393e11580..2a5a3b2fb8e9 100644
--- a/arch/arm/boot/dts/qcom/qcom-apq8064.dtsi
+++ b/arch/arm/boot/dts/qcom/qcom-apq8064.dtsi
@@ -324,23 +324,6 @@ scm {
};
};
-
- /*
- * These channels from the ADC are simply hardware monitors.
- * That is why the ADC is referred to as "HKADC" - HouseKeeping
- * ADC.
- */
- iio-hwmon {
- compatible = "iio-hwmon";
- io-channels = <&xoadc 0x00 0x01>, /* Battery */
- <&xoadc 0x00 0x02>, /* DC in (charger) */
- <&xoadc 0x00 0x04>, /* VPH the main system voltage */
- <&xoadc 0x00 0x0b>, /* Die temperature */
- <&xoadc 0x00 0x0c>, /* Reference voltage 1.25V */
- <&xoadc 0x00 0x0d>, /* Reference voltage 0.625V */
- <&xoadc 0x00 0x0e>; /* Charger temperature */
- };
-
soc: soc {
#address-cells = <1>;
#size-cells = <1>;
@@ -683,132 +666,25 @@ rng@1a500000 {
clock-names = "core";
};
- ssbi@c00000 {
+ ssbi2: ssbi@c00000 {
compatible = "qcom,ssbi";
reg = <0x00c00000 0x1000>;
qcom,controller-type = "pmic-arbiter";
- pm8821: pmic {
- compatible = "qcom,pm8821";
+ pmic {
interrupt-parent = <&tlmm_pinmux>;
interrupts = <76 IRQ_TYPE_LEVEL_LOW>;
- #interrupt-cells = <2>;
- interrupt-controller;
- #address-cells = <1>;
- #size-cells = <0>;
-
- pm8821_mpps: mpps@50 {
- compatible = "qcom,pm8821-mpp", "qcom,ssbi-mpp";
- reg = <0x50>;
- interrupt-controller;
- #interrupt-cells = <2>;
- gpio-controller;
- #gpio-cells = <2>;
- gpio-ranges = <&pm8821_mpps 0 0 4>;
- };
};
};
- ssbi@500000 {
+ ssbi: ssbi@500000 {
compatible = "qcom,ssbi";
reg = <0x00500000 0x1000>;
qcom,controller-type = "pmic-arbiter";
- pmicintc: pmic {
- compatible = "qcom,pm8921";
+ pmic {
interrupt-parent = <&tlmm_pinmux>;
interrupts = <74 8>;
- #interrupt-cells = <2>;
- interrupt-controller;
- #address-cells = <1>;
- #size-cells = <0>;
-
- pm8921_gpio: gpio@150 {
-
- compatible = "qcom,pm8921-gpio",
- "qcom,ssbi-gpio";
- reg = <0x150>;
- interrupt-controller;
- #interrupt-cells = <2>;
- gpio-controller;
- gpio-ranges = <&pm8921_gpio 0 0 44>;
- #gpio-cells = <2>;
-
- };
-
- pm8921_mpps: mpps@50 {
- compatible = "qcom,pm8921-mpp",
- "qcom,ssbi-mpp";
- reg = <0x50>;
- gpio-controller;
- #gpio-cells = <2>;
- gpio-ranges = <&pm8921_mpps 0 0 12>;
- interrupt-controller;
- #interrupt-cells = <2>;
- };
-
- rtc@11d {
- compatible = "qcom,pm8921-rtc";
- interrupt-parent = <&pmicintc>;
- interrupts = <39 1>;
- reg = <0x11d>;
- allow-set-time;
- };
-
- pwrkey@1c {
- compatible = "qcom,pm8921-pwrkey";
- reg = <0x1c>;
- interrupt-parent = <&pmicintc>;
- interrupts = <50 1>, <51 1>;
- debounce = <15625>;
- pull-up;
- };
-
- xoadc: xoadc@197 {
- compatible = "qcom,pm8921-adc";
- reg = <0x197>;
- interrupts-extended = <&pmicintc 78 IRQ_TYPE_EDGE_RISING>;
- #address-cells = <2>;
- #size-cells = <0>;
- #io-channel-cells = <2>;
-
- vcoin: adc-channel@0 {
- reg = <0x00 0x00>;
- };
- vbat: adc-channel@1 {
- reg = <0x00 0x01>;
- };
- dcin: adc-channel@2 {
- reg = <0x00 0x02>;
- };
- vph_pwr: adc-channel@4 {
- reg = <0x00 0x04>;
- };
- batt_therm: adc-channel@8 {
- reg = <0x00 0x08>;
- };
- batt_id: adc-channel@9 {
- reg = <0x00 0x09>;
- };
- usb_vbus: adc-channel@a {
- reg = <0x00 0x0a>;
- };
- die_temp: adc-channel@b {
- reg = <0x00 0x0b>;
- };
- ref_625mv: adc-channel@c {
- reg = <0x00 0x0c>;
- };
- ref_1250mv: adc-channel@d {
- reg = <0x00 0x0d>;
- };
- chg_temp: adc-channel@e {
- reg = <0x00 0x0e>;
- };
- ref_muxoff: adc-channel@f {
- reg = <0x00 0x0f>;
- };
- };
};
};
--
2.39.2
^ permalink raw reply related [flat|nested] 29+ messages in thread* Re: [PATCH 07/15] ARM: dts: qcom: apq8064: split PMICs to separate dtsi files
2023-06-27 1:24 ` [PATCH 07/15] ARM: dts: qcom: apq8064: split PMICs to separate dtsi files Dmitry Baryshkov
@ 2023-06-27 11:12 ` Konrad Dybcio
0 siblings, 0 replies; 29+ messages in thread
From: Konrad Dybcio @ 2023-06-27 11:12 UTC (permalink / raw)
To: Dmitry Baryshkov, Andy Gross, Bjorn Andersson, Rob Herring,
Krzysztof Kozlowski
Cc: linux-arm-msm, devicetree
On 27.06.2023 03:24, Dmitry Baryshkov wrote:
> The PMICs are not a part of the SoC, so move PMICs to separate files and
> include them from the board files.
>
> Suggested-by: Konrad Dybcio <konrad.dybcio@linaro.org>
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> ---
Please split moving and cleaning up into separate patches.
Also, please consider using interrupts-extended
Konrad
> arch/arm/boot/dts/qcom/pm8821.dtsi | 22 +++
> arch/arm/boot/dts/qcom/pm8921.dtsi | 126 +++++++++++++++++
> .../dts/qcom/qcom-apq8064-asus-nexus7-flo.dts | 6 +-
> .../boot/dts/qcom/qcom-apq8064-cm-qs600.dts | 5 +-
> .../boot/dts/qcom/qcom-apq8064-ifc6410.dts | 5 +-
> .../qcom-apq8064-sony-xperia-lagan-yuga.dts | 5 +-
> arch/arm/boot/dts/qcom/qcom-apq8064.dtsi | 132 +-----------------
> 7 files changed, 169 insertions(+), 132 deletions(-)
> create mode 100644 arch/arm/boot/dts/qcom/pm8821.dtsi
> create mode 100644 arch/arm/boot/dts/qcom/pm8921.dtsi
>
> diff --git a/arch/arm/boot/dts/qcom/pm8821.dtsi b/arch/arm/boot/dts/qcom/pm8821.dtsi
> new file mode 100644
> index 000000000000..064e3ba54e18
> --- /dev/null
> +++ b/arch/arm/boot/dts/qcom/pm8821.dtsi
> @@ -0,0 +1,22 @@
> +// SPDX-License-Identifier: GPL-2.0
> +
> +/* This PMIC is used on a secondary SSBI bus */
> +&ssbi2 {
> + pm8821: pmic {
> + compatible = "qcom,pm8821";
> + interrupt-controller;
> + #interrupt-cells = <2>;
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + pm8821_mpps: mpps@50 {
> + compatible = "qcom,pm8821-mpp", "qcom,ssbi-mpp";
> + reg = <0x50>;
> + gpio-controller;
> + #gpio-cells = <2>;
> + gpio-ranges = <&pm8821_mpps 0 0 4>;
> + interrupt-controller;
> + #interrupt-cells = <2>;
> + };
> + };
> +};
> diff --git a/arch/arm/boot/dts/qcom/pm8921.dtsi b/arch/arm/boot/dts/qcom/pm8921.dtsi
> new file mode 100644
> index 000000000000..63e95b56dcf1
> --- /dev/null
> +++ b/arch/arm/boot/dts/qcom/pm8921.dtsi
> @@ -0,0 +1,126 @@
> +// SPDX-License-Identifier: GPL-2.0
> +
> +&ssbi {
> + pm8921: pmic {
> + compatible = "qcom,pm8921";
> + interrupt-controller;
> + #interrupt-cells = <2>;
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + pwrkey@1c {
> + compatible = "qcom,pm8921-pwrkey";
> + reg = <0x1c>;
> + interrupt-parent = <&pm8921>;
> + interrupts = <50 IRQ_TYPE_EDGE_RISING>,
> + <51 IRQ_TYPE_EDGE_RISING>;
> + debounce = <15625>;
> + pull-up;
> + };
> +
> + pm8921_mpps: mpps@50 {
> + compatible = "qcom,pm8921-mpp",
> + "qcom,ssbi-mpp";
> + reg = <0x50>;
> + gpio-controller;
> + #gpio-cells = <2>;
> + gpio-ranges = <&pm8921_mpps 0 0 12>;
> + interrupt-controller;
> + #interrupt-cells = <2>;
> + };
> +
> + rtc@11d {
> + compatible = "qcom,pm8921-rtc";
> + reg = <0x11d>;
> + interrupt-parent = <&pm8921>;
> + interrupts = <39 IRQ_TYPE_EDGE_RISING>;
> + allow-set-time;
> + };
> +
> + pm8921_gpio: gpio@150 {
> + compatible = "qcom,pm8921-gpio",
> + "qcom,ssbi-gpio";
> + reg = <0x150>;
> + gpio-controller;
> + #gpio-cells = <2>;
> + gpio-ranges = <&pm8921_gpio 0 0 44>;
> + interrupt-controller;
> + #interrupt-cells = <2>;
> + };
> +
> + pm8921_xoadc: xoadc@197 {
> + compatible = "qcom,pm8921-adc";
> + reg = <0x197>;
> + interrupts-extended = <&pm8921 78 IRQ_TYPE_EDGE_RISING>;
> + #address-cells = <2>;
> + #size-cells = <0>;
> + #io-channel-cells = <2>;
> +
> + vcoin: adc-channel@0 {
> + reg = <0x00 0x00>;
> + };
> +
> + vbat: adc-channel@1 {
> + reg = <0x00 0x01>;
> + };
> +
> + dcin: adc-channel@2 {
> + reg = <0x00 0x02>;
> + };
> +
> + vph_pwr: adc-channel@4 {
> + reg = <0x00 0x04>;
> + };
> +
> + batt_therm: adc-channel@8 {
> + reg = <0x00 0x08>;
> + };
> +
> + batt_id: adc-channel@9 {
> + reg = <0x00 0x09>;
> + };
> +
> + usb_vbus: adc-channel@a {
> + reg = <0x00 0x0a>;
> + };
> +
> + die_temp: adc-channel@b {
> + reg = <0x00 0x0b>;
> + };
> +
> + ref_625mv: adc-channel@c {
> + reg = <0x00 0x0c>;
> + };
> +
> + ref_1250mv: adc-channel@d {
> + reg = <0x00 0x0d>;
> + };
> +
> + chg_temp: adc-channel@e {
> + reg = <0x00 0x0e>;
> + };
> +
> + ref_muxoff: adc-channel@f {
> + reg = <0x00 0x0f>;
> + };
> + };
> + };
> +};
> +
> +/ {
> + /*
> + * These channels from the ADC are simply hardware monitors.
> + * That is why the ADC is referred to as "HKADC" - HouseKeeping
> + * ADC.
> + */
> + iio-hwmon {
> + compatible = "iio-hwmon";
> + io-channels = <&pm8921_xoadc 0x00 0x01>, /* Battery */
> + <&pm8921_xoadc 0x00 0x02>, /* DC in (charger) */
> + <&pm8921_xoadc 0x00 0x04>, /* VPH the main system voltage */
> + <&pm8921_xoadc 0x00 0x0b>, /* Die temperature */
> + <&pm8921_xoadc 0x00 0x0c>, /* Reference voltage 1.25V */
> + <&pm8921_xoadc 0x00 0x0d>, /* Reference voltage 0.625V */
> + <&pm8921_xoadc 0x00 0x0e>; /* Charger temperature */
> + };
> +};
> diff --git a/arch/arm/boot/dts/qcom/qcom-apq8064-asus-nexus7-flo.dts b/arch/arm/boot/dts/qcom/qcom-apq8064-asus-nexus7-flo.dts
> index 0e80a5a8e3c6..d5dee70620c2 100644
> --- a/arch/arm/boot/dts/qcom/qcom-apq8064-asus-nexus7-flo.dts
> +++ b/arch/arm/boot/dts/qcom/qcom-apq8064-asus-nexus7-flo.dts
> @@ -1,8 +1,12 @@
> // SPDX-License-Identifier: GPL-2.0
> -#include "qcom-apq8064-v2.0.dtsi"
> #include <dt-bindings/gpio/gpio.h>
> #include <dt-bindings/input/input.h>
> #include <dt-bindings/pinctrl/qcom,pmic-gpio.h>
> +
> +#include "qcom-apq8064-v2.0.dtsi"
> +#include "pm8821.dtsi"
> +#include "pm8921.dtsi"
> +
> / {
> model = "Asus Nexus7(flo)";
> compatible = "asus,nexus7-flo", "qcom,apq8064";
> diff --git a/arch/arm/boot/dts/qcom/qcom-apq8064-cm-qs600.dts b/arch/arm/boot/dts/qcom/qcom-apq8064-cm-qs600.dts
> index d6ecfd8addb7..ffd654ab0b57 100644
> --- a/arch/arm/boot/dts/qcom/qcom-apq8064-cm-qs600.dts
> +++ b/arch/arm/boot/dts/qcom/qcom-apq8064-cm-qs600.dts
> @@ -1,8 +1,11 @@
> // SPDX-License-Identifier: GPL-2.0
> -#include "qcom-apq8064-v2.0.dtsi"
> #include <dt-bindings/gpio/gpio.h>
> #include <dt-bindings/pinctrl/qcom,pmic-gpio.h>
>
> +#include "qcom-apq8064-v2.0.dtsi"
> +#include "pm8821.dtsi"
> +#include "pm8921.dtsi"
> +
> / {
> model = "CompuLab CM-QS600";
> compatible = "qcom,apq8064-cm-qs600", "qcom,apq8064";
> diff --git a/arch/arm/boot/dts/qcom/qcom-apq8064-ifc6410.dts b/arch/arm/boot/dts/qcom/qcom-apq8064-ifc6410.dts
> index 96307550523a..12bf8ea3fb93 100644
> --- a/arch/arm/boot/dts/qcom/qcom-apq8064-ifc6410.dts
> +++ b/arch/arm/boot/dts/qcom/qcom-apq8064-ifc6410.dts
> @@ -1,9 +1,12 @@
> // SPDX-License-Identifier: GPL-2.0
> -#include "qcom-apq8064-v2.0.dtsi"
> #include <dt-bindings/gpio/gpio.h>
> #include <dt-bindings/leds/common.h>
> #include <dt-bindings/pinctrl/qcom,pmic-gpio.h>
>
> +#include "qcom-apq8064-v2.0.dtsi"
> +#include "pm8821.dtsi"
> +#include "pm8921.dtsi"
> +
> / {
> model = "Qualcomm APQ8064/IFC6410";
> compatible = "qcom,apq8064-ifc6410", "qcom,apq8064";
> diff --git a/arch/arm/boot/dts/qcom/qcom-apq8064-sony-xperia-lagan-yuga.dts b/arch/arm/boot/dts/qcom/qcom-apq8064-sony-xperia-lagan-yuga.dts
> index 9244512b74d1..53dd9d79556f 100644
> --- a/arch/arm/boot/dts/qcom/qcom-apq8064-sony-xperia-lagan-yuga.dts
> +++ b/arch/arm/boot/dts/qcom/qcom-apq8064-sony-xperia-lagan-yuga.dts
> @@ -1,10 +1,13 @@
> // SPDX-License-Identifier: GPL-2.0
> -#include "qcom-apq8064-v2.0.dtsi"
> #include <dt-bindings/gpio/gpio.h>
> #include <dt-bindings/input/input.h>
> #include <dt-bindings/mfd/qcom-rpm.h>
> #include <dt-bindings/pinctrl/qcom,pmic-gpio.h>
>
> +#include "qcom-apq8064-v2.0.dtsi"
> +#include "pm8821.dtsi"
> +#include "pm8921.dtsi"
> +
> / {
> model = "Sony Xperia Z";
> compatible = "sony,xperia-yuga", "qcom,apq8064";
> diff --git a/arch/arm/boot/dts/qcom/qcom-apq8064.dtsi b/arch/arm/boot/dts/qcom/qcom-apq8064.dtsi
> index 4f4393e11580..2a5a3b2fb8e9 100644
> --- a/arch/arm/boot/dts/qcom/qcom-apq8064.dtsi
> +++ b/arch/arm/boot/dts/qcom/qcom-apq8064.dtsi
> @@ -324,23 +324,6 @@ scm {
> };
> };
>
> -
> - /*
> - * These channels from the ADC are simply hardware monitors.
> - * That is why the ADC is referred to as "HKADC" - HouseKeeping
> - * ADC.
> - */
> - iio-hwmon {
> - compatible = "iio-hwmon";
> - io-channels = <&xoadc 0x00 0x01>, /* Battery */
> - <&xoadc 0x00 0x02>, /* DC in (charger) */
> - <&xoadc 0x00 0x04>, /* VPH the main system voltage */
> - <&xoadc 0x00 0x0b>, /* Die temperature */
> - <&xoadc 0x00 0x0c>, /* Reference voltage 1.25V */
> - <&xoadc 0x00 0x0d>, /* Reference voltage 0.625V */
> - <&xoadc 0x00 0x0e>; /* Charger temperature */
> - };
> -
> soc: soc {
> #address-cells = <1>;
> #size-cells = <1>;
> @@ -683,132 +666,25 @@ rng@1a500000 {
> clock-names = "core";
> };
>
> - ssbi@c00000 {
> + ssbi2: ssbi@c00000 {
> compatible = "qcom,ssbi";
> reg = <0x00c00000 0x1000>;
> qcom,controller-type = "pmic-arbiter";
>
> - pm8821: pmic {
> - compatible = "qcom,pm8821";
> + pmic {
> interrupt-parent = <&tlmm_pinmux>;
> interrupts = <76 IRQ_TYPE_LEVEL_LOW>;
> - #interrupt-cells = <2>;
> - interrupt-controller;
> - #address-cells = <1>;
> - #size-cells = <0>;
> -
> - pm8821_mpps: mpps@50 {
> - compatible = "qcom,pm8821-mpp", "qcom,ssbi-mpp";
> - reg = <0x50>;
> - interrupt-controller;
> - #interrupt-cells = <2>;
> - gpio-controller;
> - #gpio-cells = <2>;
> - gpio-ranges = <&pm8821_mpps 0 0 4>;
> - };
> };
> };
>
> - ssbi@500000 {
> + ssbi: ssbi@500000 {
> compatible = "qcom,ssbi";
> reg = <0x00500000 0x1000>;
> qcom,controller-type = "pmic-arbiter";
>
> - pmicintc: pmic {
> - compatible = "qcom,pm8921";
> + pmic {
> interrupt-parent = <&tlmm_pinmux>;
> interrupts = <74 8>;
> - #interrupt-cells = <2>;
> - interrupt-controller;
> - #address-cells = <1>;
> - #size-cells = <0>;
> -
> - pm8921_gpio: gpio@150 {
> -
> - compatible = "qcom,pm8921-gpio",
> - "qcom,ssbi-gpio";
> - reg = <0x150>;
> - interrupt-controller;
> - #interrupt-cells = <2>;
> - gpio-controller;
> - gpio-ranges = <&pm8921_gpio 0 0 44>;
> - #gpio-cells = <2>;
> -
> - };
> -
> - pm8921_mpps: mpps@50 {
> - compatible = "qcom,pm8921-mpp",
> - "qcom,ssbi-mpp";
> - reg = <0x50>;
> - gpio-controller;
> - #gpio-cells = <2>;
> - gpio-ranges = <&pm8921_mpps 0 0 12>;
> - interrupt-controller;
> - #interrupt-cells = <2>;
> - };
> -
> - rtc@11d {
> - compatible = "qcom,pm8921-rtc";
> - interrupt-parent = <&pmicintc>;
> - interrupts = <39 1>;
> - reg = <0x11d>;
> - allow-set-time;
> - };
> -
> - pwrkey@1c {
> - compatible = "qcom,pm8921-pwrkey";
> - reg = <0x1c>;
> - interrupt-parent = <&pmicintc>;
> - interrupts = <50 1>, <51 1>;
> - debounce = <15625>;
> - pull-up;
> - };
> -
> - xoadc: xoadc@197 {
> - compatible = "qcom,pm8921-adc";
> - reg = <0x197>;
> - interrupts-extended = <&pmicintc 78 IRQ_TYPE_EDGE_RISING>;
> - #address-cells = <2>;
> - #size-cells = <0>;
> - #io-channel-cells = <2>;
> -
> - vcoin: adc-channel@0 {
> - reg = <0x00 0x00>;
> - };
> - vbat: adc-channel@1 {
> - reg = <0x00 0x01>;
> - };
> - dcin: adc-channel@2 {
> - reg = <0x00 0x02>;
> - };
> - vph_pwr: adc-channel@4 {
> - reg = <0x00 0x04>;
> - };
> - batt_therm: adc-channel@8 {
> - reg = <0x00 0x08>;
> - };
> - batt_id: adc-channel@9 {
> - reg = <0x00 0x09>;
> - };
> - usb_vbus: adc-channel@a {
> - reg = <0x00 0x0a>;
> - };
> - die_temp: adc-channel@b {
> - reg = <0x00 0x0b>;
> - };
> - ref_625mv: adc-channel@c {
> - reg = <0x00 0x0c>;
> - };
> - ref_1250mv: adc-channel@d {
> - reg = <0x00 0x0d>;
> - };
> - chg_temp: adc-channel@e {
> - reg = <0x00 0x0e>;
> - };
> - ref_muxoff: adc-channel@f {
> - reg = <0x00 0x0f>;
> - };
> - };
> };
> };
>
^ permalink raw reply [flat|nested] 29+ messages in thread
* [PATCH 08/15] ARM: dts: qcom: mdm9615: split PMIC to separate dtsi files
2023-06-27 1:24 [PATCH 00/15] ARM: dts: qcom: cleanup PMIC usage Dmitry Baryshkov
` (6 preceding siblings ...)
2023-06-27 1:24 ` [PATCH 07/15] ARM: dts: qcom: apq8064: split PMICs to separate dtsi files Dmitry Baryshkov
@ 2023-06-27 1:24 ` Dmitry Baryshkov
2023-06-27 14:08 ` Neil Armstrong
2023-06-27 1:24 ` [PATCH 09/15] ARM: dts: qcom: msm8660: " Dmitry Baryshkov
` (6 subsequent siblings)
14 siblings, 1 reply; 29+ messages in thread
From: Dmitry Baryshkov @ 2023-06-27 1:24 UTC (permalink / raw)
To: Andy Gross, Bjorn Andersson, Konrad Dybcio, Rob Herring,
Krzysztof Kozlowski
Cc: linux-arm-msm, devicetree
The PMIC is not a part of the SoC, so move PMIC to a separate file and
include it from the board files.
Suggested-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
arch/arm/boot/dts/qcom/pm8018.dtsi | 57 +++++++++++++++++++
.../boot/dts/qcom/qcom-mdm9615-wp8548.dtsi | 3 +-
arch/arm/boot/dts/qcom/qcom-mdm9615.dtsi | 46 +--------------
3 files changed, 61 insertions(+), 45 deletions(-)
create mode 100644 arch/arm/boot/dts/qcom/pm8018.dtsi
diff --git a/arch/arm/boot/dts/qcom/pm8018.dtsi b/arch/arm/boot/dts/qcom/pm8018.dtsi
new file mode 100644
index 000000000000..81c0ad29fe60
--- /dev/null
+++ b/arch/arm/boot/dts/qcom/pm8018.dtsi
@@ -0,0 +1,57 @@
+// SPDX-License-Identifier: GPL-2.0+ OR MIT
+/*
+ * Device Tree Source for Qualcomm PM8018
+ *
+ * Copyright (C) 2016 BayLibre, SAS.
+ * Author : Neil Armstrong <narmstrong@baylibre.com>
+ */
+
+&ssbi {
+ pm8018: pmic {
+ compatible = "qcom,pm8018", "qcom,pm8921";
+ interrupt-controller;
+ #interrupt-cells = <2>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ pwrkey@1c {
+ compatible = "qcom,pm8018-pwrkey",
+ "qcom,pm8921-pwrkey";
+ reg = <0x1c>;
+ interrupt-parent = <&pm8018>;
+ interrupts = <50 IRQ_TYPE_EDGE_RISING>,
+ <51 IRQ_TYPE_EDGE_RISING>;
+ debounce = <15625>;
+ pull-up;
+ };
+
+ pm8018_mpps: mpps@50 {
+ compatible = "qcom,pm8018-mpp", "qcom,ssbi-mpp";
+ reg = <0x50>;
+ gpio-controller;
+ #gpio-cells = <2>;
+ gpio-ranges = <&pm8018_mpps 0 0 6>;
+ interrupt-controller;
+ #interrupt-cells = <2>;
+ };
+
+ rtc@11d {
+ compatible = "qcom,pm8018-rtc", "qcom,pm8921-rtc";
+ reg = <0x11d>;
+ interrupt-parent = <&pm8018>;
+ interrupts = <39 IRQ_TYPE_EDGE_RISING>;
+ allow-set-time;
+ };
+
+ pm8018_gpio: gpio@150 {
+ compatible = "qcom,pm8058-gpio",
+ "qcom,ssbi-gpio";
+ reg = <0x150>;
+ gpio-controller;
+ #gpio-cells = <2>;
+ gpio-ranges = <&pm8018_gpio 0 0 6>;
+ interrupt-controller;
+ #interrupt-cells = <2>;
+ };
+ };
+};
diff --git a/arch/arm/boot/dts/qcom/qcom-mdm9615-wp8548.dtsi b/arch/arm/boot/dts/qcom/qcom-mdm9615-wp8548.dtsi
index 92c8003dac25..cc264861afe5 100644
--- a/arch/arm/boot/dts/qcom/qcom-mdm9615-wp8548.dtsi
+++ b/arch/arm/boot/dts/qcom/qcom-mdm9615-wp8548.dtsi
@@ -7,6 +7,7 @@
*/
#include "qcom-mdm9615.dtsi"
+#include "pm8018.dtsi"
/ {
model = "Sierra Wireless WP8548 Module";
@@ -76,7 +77,7 @@ reset-out-pins {
};
};
-&pmicgpio {
+&pm8018_gpio {
usb_vbus_5v_pins: usb-vbus-5v-state {
pins = "gpio4";
function = "normal";
diff --git a/arch/arm/boot/dts/qcom/qcom-mdm9615.dtsi b/arch/arm/boot/dts/qcom/qcom-mdm9615.dtsi
index b40c52ddf9b4..ac2327bc4ec5 100644
--- a/arch/arm/boot/dts/qcom/qcom-mdm9615.dtsi
+++ b/arch/arm/boot/dts/qcom/qcom-mdm9615.dtsi
@@ -241,56 +241,14 @@ gsbi5_serial: serial@16440000 {
};
};
- qcom,ssbi@500000 {
+ ssbi: qcom,ssbi@500000 {
compatible = "qcom,ssbi";
reg = <0x500000 0x1000>;
qcom,controller-type = "pmic-arbiter";
- pmicintc: pmic {
- compatible = "qcom,pm8018", "qcom,pm8921";
+ pmic {
interrupts = <GIC_PPI 226 IRQ_TYPE_LEVEL_HIGH>;
#interrupt-cells = <2>;
- interrupt-controller;
- #address-cells = <1>;
- #size-cells = <0>;
-
- pwrkey@1c {
- compatible = "qcom,pm8018-pwrkey", "qcom,pm8921-pwrkey";
- reg = <0x1c>;
- interrupt-parent = <&pmicintc>;
- interrupts = <50 IRQ_TYPE_EDGE_RISING>,
- <51 IRQ_TYPE_EDGE_RISING>;
- debounce = <15625>;
- pull-up;
- };
-
- pmicmpp: mpps@50 {
- compatible = "qcom,pm8018-mpp", "qcom,ssbi-mpp";
- interrupt-controller;
- #interrupt-cells = <2>;
- reg = <0x50>;
- gpio-controller;
- #gpio-cells = <2>;
- gpio-ranges = <&pmicmpp 0 0 6>;
- };
-
- rtc@11d {
- compatible = "qcom,pm8018-rtc", "qcom,pm8921-rtc";
- interrupt-parent = <&pmicintc>;
- interrupts = <39 IRQ_TYPE_EDGE_RISING>;
- reg = <0x11d>;
- allow-set-time;
- };
-
- pmicgpio: gpio@150 {
- compatible = "qcom,pm8018-gpio", "qcom,ssbi-gpio";
- reg = <0x150>;
- interrupt-controller;
- #interrupt-cells = <2>;
- gpio-controller;
- gpio-ranges = <&pmicgpio 0 0 6>;
- #gpio-cells = <2>;
- };
};
};
--
2.39.2
^ permalink raw reply related [flat|nested] 29+ messages in thread* Re: [PATCH 08/15] ARM: dts: qcom: mdm9615: split PMIC to separate dtsi files
2023-06-27 1:24 ` [PATCH 08/15] ARM: dts: qcom: mdm9615: split PMIC " Dmitry Baryshkov
@ 2023-06-27 14:08 ` Neil Armstrong
0 siblings, 0 replies; 29+ messages in thread
From: Neil Armstrong @ 2023-06-27 14:08 UTC (permalink / raw)
To: Dmitry Baryshkov, Andy Gross, Bjorn Andersson, Konrad Dybcio,
Rob Herring, Krzysztof Kozlowski
Cc: linux-arm-msm, devicetree
On 27/06/2023 03:24, Dmitry Baryshkov wrote:
> The PMIC is not a part of the SoC, so move PMIC to a separate file and
> include it from the board files.
>
> Suggested-by: Konrad Dybcio <konrad.dybcio@linaro.org>
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> ---
> arch/arm/boot/dts/qcom/pm8018.dtsi | 57 +++++++++++++++++++
> .../boot/dts/qcom/qcom-mdm9615-wp8548.dtsi | 3 +-
> arch/arm/boot/dts/qcom/qcom-mdm9615.dtsi | 46 +--------------
> 3 files changed, 61 insertions(+), 45 deletions(-)
> create mode 100644 arch/arm/boot/dts/qcom/pm8018.dtsi
>
> diff --git a/arch/arm/boot/dts/qcom/pm8018.dtsi b/arch/arm/boot/dts/qcom/pm8018.dtsi
> new file mode 100644
> index 000000000000..81c0ad29fe60
> --- /dev/null
> +++ b/arch/arm/boot/dts/qcom/pm8018.dtsi
> @@ -0,0 +1,57 @@
> +// SPDX-License-Identifier: GPL-2.0+ OR MIT
> +/*
> + * Device Tree Source for Qualcomm PM8018
> + *
> + * Copyright (C) 2016 BayLibre, SAS.
> + * Author : Neil Armstrong <narmstrong@baylibre.com>
> + */
> +
> +&ssbi {
> + pm8018: pmic {
> + compatible = "qcom,pm8018", "qcom,pm8921";
> + interrupt-controller;
> + #interrupt-cells = <2>;
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + pwrkey@1c {
> + compatible = "qcom,pm8018-pwrkey",
> + "qcom,pm8921-pwrkey";
> + reg = <0x1c>;
> + interrupt-parent = <&pm8018>;
> + interrupts = <50 IRQ_TYPE_EDGE_RISING>,
> + <51 IRQ_TYPE_EDGE_RISING>;
> + debounce = <15625>;
> + pull-up;
> + };
> +
> + pm8018_mpps: mpps@50 {
> + compatible = "qcom,pm8018-mpp", "qcom,ssbi-mpp";
> + reg = <0x50>;
> + gpio-controller;
> + #gpio-cells = <2>;
> + gpio-ranges = <&pm8018_mpps 0 0 6>;
> + interrupt-controller;
> + #interrupt-cells = <2>;
> + };
> +
> + rtc@11d {
> + compatible = "qcom,pm8018-rtc", "qcom,pm8921-rtc";
> + reg = <0x11d>;
> + interrupt-parent = <&pm8018>;
> + interrupts = <39 IRQ_TYPE_EDGE_RISING>;
> + allow-set-time;
> + };
> +
> + pm8018_gpio: gpio@150 {
> + compatible = "qcom,pm8058-gpio",
> + "qcom,ssbi-gpio";
> + reg = <0x150>;
> + gpio-controller;
> + #gpio-cells = <2>;
> + gpio-ranges = <&pm8018_gpio 0 0 6>;
> + interrupt-controller;
> + #interrupt-cells = <2>;
> + };
> + };
> +};
> diff --git a/arch/arm/boot/dts/qcom/qcom-mdm9615-wp8548.dtsi b/arch/arm/boot/dts/qcom/qcom-mdm9615-wp8548.dtsi
> index 92c8003dac25..cc264861afe5 100644
> --- a/arch/arm/boot/dts/qcom/qcom-mdm9615-wp8548.dtsi
> +++ b/arch/arm/boot/dts/qcom/qcom-mdm9615-wp8548.dtsi
> @@ -7,6 +7,7 @@
> */
>
> #include "qcom-mdm9615.dtsi"
> +#include "pm8018.dtsi"
>
> / {
> model = "Sierra Wireless WP8548 Module";
> @@ -76,7 +77,7 @@ reset-out-pins {
> };
> };
>
> -&pmicgpio {
> +&pm8018_gpio {
> usb_vbus_5v_pins: usb-vbus-5v-state {
> pins = "gpio4";
> function = "normal";
> diff --git a/arch/arm/boot/dts/qcom/qcom-mdm9615.dtsi b/arch/arm/boot/dts/qcom/qcom-mdm9615.dtsi
> index b40c52ddf9b4..ac2327bc4ec5 100644
> --- a/arch/arm/boot/dts/qcom/qcom-mdm9615.dtsi
> +++ b/arch/arm/boot/dts/qcom/qcom-mdm9615.dtsi
> @@ -241,56 +241,14 @@ gsbi5_serial: serial@16440000 {
> };
> };
>
> - qcom,ssbi@500000 {
> + ssbi: qcom,ssbi@500000 {
> compatible = "qcom,ssbi";
> reg = <0x500000 0x1000>;
> qcom,controller-type = "pmic-arbiter";
>
> - pmicintc: pmic {
> - compatible = "qcom,pm8018", "qcom,pm8921";
> + pmic {
> interrupts = <GIC_PPI 226 IRQ_TYPE_LEVEL_HIGH>;
> #interrupt-cells = <2>;
> - interrupt-controller;
> - #address-cells = <1>;
> - #size-cells = <0>;
> -
> - pwrkey@1c {
> - compatible = "qcom,pm8018-pwrkey", "qcom,pm8921-pwrkey";
> - reg = <0x1c>;
> - interrupt-parent = <&pmicintc>;
> - interrupts = <50 IRQ_TYPE_EDGE_RISING>,
> - <51 IRQ_TYPE_EDGE_RISING>;
> - debounce = <15625>;
> - pull-up;
> - };
> -
> - pmicmpp: mpps@50 {
> - compatible = "qcom,pm8018-mpp", "qcom,ssbi-mpp";
> - interrupt-controller;
> - #interrupt-cells = <2>;
> - reg = <0x50>;
> - gpio-controller;
> - #gpio-cells = <2>;
> - gpio-ranges = <&pmicmpp 0 0 6>;
> - };
> -
> - rtc@11d {
> - compatible = "qcom,pm8018-rtc", "qcom,pm8921-rtc";
> - interrupt-parent = <&pmicintc>;
> - interrupts = <39 IRQ_TYPE_EDGE_RISING>;
> - reg = <0x11d>;
> - allow-set-time;
> - };
> -
> - pmicgpio: gpio@150 {
> - compatible = "qcom,pm8018-gpio", "qcom,ssbi-gpio";
> - reg = <0x150>;
> - interrupt-controller;
> - #interrupt-cells = <2>;
> - gpio-controller;
> - gpio-ranges = <&pmicgpio 0 0 6>;
> - #gpio-cells = <2>;
> - };
> };
> };
>
Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
^ permalink raw reply [flat|nested] 29+ messages in thread
* [PATCH 09/15] ARM: dts: qcom: msm8660: split PMIC to separate dtsi files
2023-06-27 1:24 [PATCH 00/15] ARM: dts: qcom: cleanup PMIC usage Dmitry Baryshkov
` (7 preceding siblings ...)
2023-06-27 1:24 ` [PATCH 08/15] ARM: dts: qcom: mdm9615: split PMIC " Dmitry Baryshkov
@ 2023-06-27 1:24 ` Dmitry Baryshkov
2023-06-27 1:24 ` [PATCH 10/15] ARM: dts: qcom: msm8960: " Dmitry Baryshkov
` (5 subsequent siblings)
14 siblings, 0 replies; 29+ messages in thread
From: Dmitry Baryshkov @ 2023-06-27 1:24 UTC (permalink / raw)
To: Andy Gross, Bjorn Andersson, Konrad Dybcio, Rob Herring,
Krzysztof Kozlowski
Cc: linux-arm-msm, devicetree
The PMIC is not a part of the SoC, so move PMIC to a separate file and
include it from the board files.
Suggested-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
arch/arm/boot/dts/qcom/pm8058.dtsi | 162 ++++++++++++++++++
.../dts/qcom/qcom-apq8060-dragonboard.dts | 5 +-
arch/arm/boot/dts/qcom/qcom-msm8660-surf.dts | 1 +
arch/arm/boot/dts/qcom/qcom-msm8660.dtsi | 148 +---------------
4 files changed, 168 insertions(+), 148 deletions(-)
create mode 100644 arch/arm/boot/dts/qcom/pm8058.dtsi
diff --git a/arch/arm/boot/dts/qcom/pm8058.dtsi b/arch/arm/boot/dts/qcom/pm8058.dtsi
new file mode 100644
index 000000000000..f5a41e654981
--- /dev/null
+++ b/arch/arm/boot/dts/qcom/pm8058.dtsi
@@ -0,0 +1,162 @@
+// SPDX-License-Identifier: GPL-2.0
+
+&ssbi {
+ pm8058: pmic {
+ compatible = "qcom,pm8058";
+ interrupt-controller;
+ #interrupt-cells = <2>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ pwrkey@1c {
+ compatible = "qcom,pm8058-pwrkey";
+ reg = <0x1c>;
+ interrupt-parent = <&pm8058>;
+ interrupts = <50 IRQ_TYPE_EDGE_RISING>,
+ <51 IRQ_TYPE_EDGE_RISING>;
+ debounce = <15625>;
+ pull-up;
+ };
+
+ pm8058_led48: led@48 {
+ compatible = "qcom,pm8058-keypad-led";
+ reg = <0x48>;
+ status = "disabled";
+ };
+
+ vibrator@4a {
+ compatible = "qcom,pm8058-vib";
+ reg = <0x4a>;
+ };
+
+ pm8058_mpps: mpps@50 {
+ compatible = "qcom,pm8058-mpp",
+ "qcom,ssbi-mpp";
+ reg = <0x50>;
+ gpio-controller;
+ #gpio-cells = <2>;
+ gpio-ranges = <&pm8058_mpps 0 0 12>;
+ interrupt-controller;
+ #interrupt-cells = <2>;
+ };
+
+ pm8058_led131: led@131 {
+ compatible = "qcom,pm8058-led";
+ reg = <0x131>;
+ status = "disabled";
+ };
+
+ pm8058_led132: led@132 {
+ compatible = "qcom,pm8058-led";
+ reg = <0x132>;
+ status = "disabled";
+ };
+
+ pm8058_led133: led@133 {
+ compatible = "qcom,pm8058-led";
+ reg = <0x133>;
+ status = "disabled";
+ };
+
+ pm8058_keypad: keypad@148 {
+ compatible = "qcom,pm8058-keypad";
+ reg = <0x148>;
+ interrupt-parent = <&pm8058>;
+ interrupts = <74 IRQ_TYPE_EDGE_RISING>,
+ <75 IRQ_TYPE_EDGE_RISING>;
+ debounce = <15>;
+ scan-delay = <32>;
+ row-hold = <91500>;
+ };
+
+ pm8058_gpio: gpio@150 {
+ compatible = "qcom,pm8058-gpio",
+ "qcom,ssbi-gpio";
+ reg = <0x150>;
+ gpio-controller;
+ #gpio-cells = <2>;
+ gpio-ranges = <&pm8058_gpio 0 0 44>;
+ interrupt-controller;
+ #interrupt-cells = <2>;
+ };
+
+ pm8058_xoadc: xoadc@197 {
+ compatible = "qcom,pm8058-adc";
+ reg = <0x197>;
+ interrupts-extended = <&pm8058 76 IRQ_TYPE_EDGE_RISING>;
+ #address-cells = <2>;
+ #size-cells = <0>;
+ #io-channel-cells = <2>;
+
+ vcoin: adc-channel@0 {
+ reg = <0x00 0x00>;
+ };
+
+ vbat: adc-channel@1 {
+ reg = <0x00 0x01>;
+ };
+
+ dcin: adc-channel@2 {
+ reg = <0x00 0x02>;
+ };
+
+ ichg: adc-channel@3 {
+ reg = <0x00 0x03>;
+ };
+
+ vph_pwr: adc-channel@4 {
+ reg = <0x00 0x04>;
+ };
+
+ usb_vbus: adc-channel@a {
+ reg = <0x00 0x0a>;
+ };
+
+ die_temp: adc-channel@b {
+ reg = <0x00 0x0b>;
+ };
+
+ ref_625mv: adc-channel@c {
+ reg = <0x00 0x0c>;
+ };
+
+ ref_1250mv: adc-channel@d {
+ reg = <0x00 0x0d>;
+ };
+
+ ref_325mv: adc-channel@e {
+ reg = <0x00 0x0e>;
+ };
+
+ ref_muxoff: adc-channel@f {
+ reg = <0x00 0x0f>;
+ };
+ };
+
+ rtc@1e8 {
+ compatible = "qcom,pm8058-rtc";
+ reg = <0x1e8>;
+ interrupt-parent = <&pm8058>;
+ interrupts = <39 IRQ_TYPE_EDGE_RISING>;
+ allow-set-time;
+ };
+ };
+};
+
+/ {
+ /*
+ * These channels from the ADC are simply hardware monitors.
+ * That is why the ADC is referred to as "HKADC" - HouseKeeping
+ * ADC.
+ */
+ iio-hwmon {
+ compatible = "iio-hwmon";
+ io-channels = <&pm8058_xoadc 0x00 0x01>, /* Battery */
+ <&pm8058_xoadc 0x00 0x02>, /* DC in (charger) */
+ <&pm8058_xoadc 0x00 0x04>, /* VPH the main system voltage */
+ <&pm8058_xoadc 0x00 0x0b>, /* Die temperature */
+ <&pm8058_xoadc 0x00 0x0c>, /* Reference voltage 1.25V */
+ <&pm8058_xoadc 0x00 0x0d>, /* Reference voltage 0.625V */
+ <&pm8058_xoadc 0x00 0x0e>; /* Reference voltage 0.325V */
+ };
+};
diff --git a/arch/arm/boot/dts/qcom/qcom-apq8060-dragonboard.dts b/arch/arm/boot/dts/qcom/qcom-apq8060-dragonboard.dts
index db4c791b2e2f..20de516a8deb 100644
--- a/arch/arm/boot/dts/qcom/qcom-apq8060-dragonboard.dts
+++ b/arch/arm/boot/dts/qcom/qcom-apq8060-dragonboard.dts
@@ -5,6 +5,7 @@
#include <dt-bindings/pinctrl/qcom,pmic-gpio.h>
#include <dt-bindings/pinctrl/qcom,pmic-mpp.h>
#include "qcom-msm8660.dtsi"
+#include "pm8058.dtsi"
/ {
model = "Qualcomm APQ8060 Dragonboard";
@@ -72,7 +73,7 @@ cm3605 {
/* Trig on both edges - getting close or far away */
interrupts-extended = <&pm8058_gpio 34 IRQ_TYPE_EDGE_BOTH>;
/* MPP05 analog input to the XOADC */
- io-channels = <&xoadc 0x00 0x05>;
+ io-channels = <&pm8058_xoadc 0x00 0x05>;
io-channel-names = "aout";
pinctrl-names = "default";
pinctrl-0 = <&dragon_cm3605_gpios>, <&dragon_cm3605_mpps>;
@@ -945,7 +946,7 @@ irq-pins {
};
};
-&xoadc {
+&pm8058_xoadc {
/* Reference voltage 2.2 V */
xoadc-ref-supply = <&pm8058_l18>;
diff --git a/arch/arm/boot/dts/qcom/qcom-msm8660-surf.dts b/arch/arm/boot/dts/qcom/qcom-msm8660-surf.dts
index 86fbb6dfdc2a..04dca0c93971 100644
--- a/arch/arm/boot/dts/qcom/qcom-msm8660-surf.dts
+++ b/arch/arm/boot/dts/qcom/qcom-msm8660-surf.dts
@@ -2,6 +2,7 @@
#include <dt-bindings/input/input.h>
#include "qcom-msm8660.dtsi"
+#include "pm8058.dtsi"
/ {
model = "Qualcomm MSM8660 SURF";
diff --git a/arch/arm/boot/dts/qcom/qcom-msm8660.dtsi b/arch/arm/boot/dts/qcom/qcom-msm8660.dtsi
index 78023ed2fdf7..b8094b7c09fc 100644
--- a/arch/arm/boot/dts/qcom/qcom-msm8660.dtsi
+++ b/arch/arm/boot/dts/qcom/qcom-msm8660.dtsi
@@ -73,22 +73,6 @@ sleep-clk {
};
};
- /*
- * These channels from the ADC are simply hardware monitors.
- * That is why the ADC is referred to as "HKADC" - HouseKeeping
- * ADC.
- */
- iio-hwmon {
- compatible = "iio-hwmon";
- io-channels = <&xoadc 0x00 0x01>, /* Battery */
- <&xoadc 0x00 0x02>, /* DC in (charger) */
- <&xoadc 0x00 0x04>, /* VPH the main system voltage */
- <&xoadc 0x00 0x0b>, /* Die temperature */
- <&xoadc 0x00 0x0c>, /* Reference voltage 1.25V */
- <&xoadc 0x00 0x0d>, /* Reference voltage 0.625V */
- <&xoadc 0x00 0x0e>; /* Reference voltage 0.325V */
- };
-
soc: soc {
#address-cells = <1>;
#size-cells = <1>;
@@ -334,142 +318,14 @@ ebi2: external-bus@1a100000 {
status = "disabled";
};
- ssbi@500000 {
+ ssbi: ssbi@500000 {
compatible = "qcom,ssbi";
reg = <0x500000 0x1000>;
qcom,controller-type = "pmic-arbiter";
- pm8058: pmic {
- compatible = "qcom,pm8058";
+ pmic {
interrupt-parent = <&tlmm>;
interrupts = <88 8>;
- #interrupt-cells = <2>;
- interrupt-controller;
- #address-cells = <1>;
- #size-cells = <0>;
-
- pm8058_gpio: gpio@150 {
- compatible = "qcom,pm8058-gpio",
- "qcom,ssbi-gpio";
- reg = <0x150>;
- interrupt-controller;
- #interrupt-cells = <2>;
- gpio-controller;
- gpio-ranges = <&pm8058_gpio 0 0 44>;
- #gpio-cells = <2>;
-
- };
-
- pm8058_mpps: mpps@50 {
- compatible = "qcom,pm8058-mpp",
- "qcom,ssbi-mpp";
- reg = <0x50>;
- gpio-controller;
- #gpio-cells = <2>;
- gpio-ranges = <&pm8058_mpps 0 0 12>;
- interrupt-controller;
- #interrupt-cells = <2>;
- };
-
- pwrkey@1c {
- compatible = "qcom,pm8058-pwrkey";
- reg = <0x1c>;
- interrupt-parent = <&pm8058>;
- interrupts = <50 1>, <51 1>;
- debounce = <15625>;
- pull-up;
- };
-
- pm8058_keypad: keypad@148 {
- compatible = "qcom,pm8058-keypad";
- reg = <0x148>;
- interrupt-parent = <&pm8058>;
- interrupts = <74 1>, <75 1>;
- debounce = <15>;
- scan-delay = <32>;
- row-hold = <91500>;
- };
-
- xoadc: xoadc@197 {
- compatible = "qcom,pm8058-adc";
- reg = <0x197>;
- interrupts-extended = <&pm8058 76 IRQ_TYPE_EDGE_RISING>;
- #address-cells = <2>;
- #size-cells = <0>;
- #io-channel-cells = <2>;
-
- vcoin: adc-channel@0 {
- reg = <0x00 0x00>;
- };
- vbat: adc-channel@1 {
- reg = <0x00 0x01>;
- };
- dcin: adc-channel@2 {
- reg = <0x00 0x02>;
- };
- ichg: adc-channel@3 {
- reg = <0x00 0x03>;
- };
- vph_pwr: adc-channel@4 {
- reg = <0x00 0x04>;
- };
- usb_vbus: adc-channel@a {
- reg = <0x00 0x0a>;
- };
- die_temp: adc-channel@b {
- reg = <0x00 0x0b>;
- };
- ref_625mv: adc-channel@c {
- reg = <0x00 0x0c>;
- };
- ref_1250mv: adc-channel@d {
- reg = <0x00 0x0d>;
- };
- ref_325mv: adc-channel@e {
- reg = <0x00 0x0e>;
- };
- ref_muxoff: adc-channel@f {
- reg = <0x00 0x0f>;
- };
- };
-
- rtc@1e8 {
- compatible = "qcom,pm8058-rtc";
- reg = <0x1e8>;
- interrupt-parent = <&pm8058>;
- interrupts = <39 1>;
- allow-set-time;
- };
-
- vibrator@4a {
- compatible = "qcom,pm8058-vib";
- reg = <0x4a>;
- };
-
- pm8058_led48: led@48 {
- compatible = "qcom,pm8058-keypad-led";
- reg = <0x48>;
- status = "disabled";
- };
-
- pm8058_led131: led@131 {
- compatible = "qcom,pm8058-led";
- reg = <0x131>;
- status = "disabled";
- };
-
- pm8058_led132: led@132 {
- compatible = "qcom,pm8058-led";
- reg = <0x132>;
- status = "disabled";
- };
-
- pm8058_led133: led@133 {
- compatible = "qcom,pm8058-led";
- reg = <0x133>;
- status = "disabled";
- };
-
};
};
--
2.39.2
^ permalink raw reply related [flat|nested] 29+ messages in thread* [PATCH 10/15] ARM: dts: qcom: msm8960: split PMIC to separate dtsi files
2023-06-27 1:24 [PATCH 00/15] ARM: dts: qcom: cleanup PMIC usage Dmitry Baryshkov
` (8 preceding siblings ...)
2023-06-27 1:24 ` [PATCH 09/15] ARM: dts: qcom: msm8660: " Dmitry Baryshkov
@ 2023-06-27 1:24 ` Dmitry Baryshkov
2023-06-27 1:24 ` [PATCH 11/15] ARM: dts: qcom: msm8974: move vreg-boost GPIO to board files Dmitry Baryshkov
` (4 subsequent siblings)
14 siblings, 0 replies; 29+ messages in thread
From: Dmitry Baryshkov @ 2023-06-27 1:24 UTC (permalink / raw)
To: Andy Gross, Bjorn Andersson, Konrad Dybcio, Rob Herring,
Krzysztof Kozlowski
Cc: linux-arm-msm, devicetree
The PMIC is not a part of the SoC, so move PMIC to a separate file and
include it from the board files.
Suggested-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
arch/arm/boot/dts/qcom/pm8921.dtsi | 11 ++++++
arch/arm/boot/dts/qcom/qcom-msm8960-cdp.dts | 1 +
.../qcom/qcom-msm8960-samsung-expressatt.dts | 3 +-
arch/arm/boot/dts/qcom/qcom-msm8960.dtsi | 38 +------------------
4 files changed, 16 insertions(+), 37 deletions(-)
diff --git a/arch/arm/boot/dts/qcom/pm8921.dtsi b/arch/arm/boot/dts/qcom/pm8921.dtsi
index 63e95b56dcf1..06fa32c444fa 100644
--- a/arch/arm/boot/dts/qcom/pm8921.dtsi
+++ b/arch/arm/boot/dts/qcom/pm8921.dtsi
@@ -37,6 +37,17 @@ rtc@11d {
allow-set-time;
};
+ pm8921_keypad: keypad@148 {
+ compatible = "qcom,pm8921-keypad";
+ reg = <0x148>;
+ interrupt-parent = <&pm8921>;
+ interrupts = <74 IRQ_TYPE_EDGE_RISING>,
+ <75 IRQ_TYPE_EDGE_RISING>;
+ debounce = <15>;
+ scan-delay = <32>;
+ row-hold = <91500>;
+ };
+
pm8921_gpio: gpio@150 {
compatible = "qcom,pm8921-gpio",
"qcom,ssbi-gpio";
diff --git a/arch/arm/boot/dts/qcom/qcom-msm8960-cdp.dts b/arch/arm/boot/dts/qcom/qcom-msm8960-cdp.dts
index 4641b4f2195d..414881d34c60 100644
--- a/arch/arm/boot/dts/qcom/qcom-msm8960-cdp.dts
+++ b/arch/arm/boot/dts/qcom/qcom-msm8960-cdp.dts
@@ -2,6 +2,7 @@
#include <dt-bindings/input/input.h>
#include "qcom-msm8960.dtsi"
+#include "pm8921.dtsi"
/ {
model = "Qualcomm MSM8960 CDP";
diff --git a/arch/arm/boot/dts/qcom/qcom-msm8960-samsung-expressatt.dts b/arch/arm/boot/dts/qcom/qcom-msm8960-samsung-expressatt.dts
index 13e85c287498..2e7d98e132be 100644
--- a/arch/arm/boot/dts/qcom/qcom-msm8960-samsung-expressatt.dts
+++ b/arch/arm/boot/dts/qcom/qcom-msm8960-samsung-expressatt.dts
@@ -1,8 +1,9 @@
// SPDX-License-Identifier: GPL-2.0
#include <dt-bindings/input/input.h>
+#include <dt-bindings/reset/qcom,gcc-msm8960.h>
#include "qcom-msm8960.dtsi"
-#include <dt-bindings/reset/qcom,gcc-msm8960.h>
+#include "pm8921.dtsi"
/ {
model = "Samsung Galaxy Express SGH-I437";
diff --git a/arch/arm/boot/dts/qcom/qcom-msm8960.dtsi b/arch/arm/boot/dts/qcom/qcom-msm8960.dtsi
index 913bc6afd0a1..8157236f249d 100644
--- a/arch/arm/boot/dts/qcom/qcom-msm8960.dtsi
+++ b/arch/arm/boot/dts/qcom/qcom-msm8960.dtsi
@@ -259,48 +259,14 @@ gsbi5_serial: serial@16440000 {
};
};
- ssbi@500000 {
+ ssbi: ssbi@500000 {
compatible = "qcom,ssbi";
reg = <0x500000 0x1000>;
qcom,controller-type = "pmic-arbiter";
- pmicintc: pmic {
- compatible = "qcom,pm8921";
+ pmic {
interrupt-parent = <&msmgpio>;
interrupts = <104 IRQ_TYPE_LEVEL_LOW>;
- #interrupt-cells = <2>;
- interrupt-controller;
- #address-cells = <1>;
- #size-cells = <0>;
-
- pwrkey@1c {
- compatible = "qcom,pm8921-pwrkey";
- reg = <0x1c>;
- interrupt-parent = <&pmicintc>;
- interrupts = <50 IRQ_TYPE_EDGE_RISING>,
- <51 IRQ_TYPE_EDGE_RISING>;
- debounce = <15625>;
- pull-up;
- };
-
- pm8921_keypad: keypad@148 {
- compatible = "qcom,pm8921-keypad";
- reg = <0x148>;
- interrupt-parent = <&pmicintc>;
- interrupts = <74 IRQ_TYPE_EDGE_RISING>,
- <75 IRQ_TYPE_EDGE_RISING>;
- debounce = <15>;
- scan-delay = <32>;
- row-hold = <91500>;
- };
-
- rtc@11d {
- compatible = "qcom,pm8921-rtc";
- interrupt-parent = <&pmicintc>;
- interrupts = <39 IRQ_TYPE_EDGE_RISING>;
- reg = <0x11d>;
- allow-set-time;
- };
};
};
--
2.39.2
^ permalink raw reply related [flat|nested] 29+ messages in thread* [PATCH 11/15] ARM: dts: qcom: msm8974: move vreg-boost GPIO to board files
2023-06-27 1:24 [PATCH 00/15] ARM: dts: qcom: cleanup PMIC usage Dmitry Baryshkov
` (9 preceding siblings ...)
2023-06-27 1:24 ` [PATCH 10/15] ARM: dts: qcom: msm8960: " Dmitry Baryshkov
@ 2023-06-27 1:24 ` Dmitry Baryshkov
2023-06-27 11:15 ` Konrad Dybcio
2023-06-27 1:24 ` [PATCH 12/15] ARM: dts: qcom: apq8064: move RPM regulators " Dmitry Baryshkov
` (3 subsequent siblings)
14 siblings, 1 reply; 29+ messages in thread
From: Dmitry Baryshkov @ 2023-06-27 1:24 UTC (permalink / raw)
To: Andy Gross, Bjorn Andersson, Konrad Dybcio, Rob Herring,
Krzysztof Kozlowski
Cc: linux-arm-msm, devicetree
The controlling GPIO for the regulator (even if it is unified by design)
is not a property of SoC, so move it to board files.
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
arch/arm/boot/dts/qcom/qcom-msm8974-lge-nexus5-hammerhead.dts | 4 ++++
arch/arm/boot/dts/qcom/qcom-msm8974-sony-xperia-rhine.dtsi | 4 ++++
arch/arm/boot/dts/qcom/qcom-msm8974.dtsi | 1 -
arch/arm/boot/dts/qcom/qcom-msm8974pro-fairphone-fp2.dts | 4 ++++
arch/arm/boot/dts/qcom/qcom-msm8974pro-oneplus-bacon.dts | 4 ++++
.../dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts | 4 ++++
6 files changed, 20 insertions(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/qcom/qcom-msm8974-lge-nexus5-hammerhead.dts b/arch/arm/boot/dts/qcom/qcom-msm8974-lge-nexus5-hammerhead.dts
index da99f770d4f5..eccd8f536bce 100644
--- a/arch/arm/boot/dts/qcom/qcom-msm8974-lge-nexus5-hammerhead.dts
+++ b/arch/arm/boot/dts/qcom/qcom-msm8974-lge-nexus5-hammerhead.dts
@@ -694,3 +694,7 @@ &usb_hs1_phy {
qcom,init-seq = /bits/ 8 <0x1 0x64>;
};
+
+&vreg_boost {
+ gpio = <&pm8941_gpios 21 GPIO_ACTIVE_HIGH>;
+};
diff --git a/arch/arm/boot/dts/qcom/qcom-msm8974-sony-xperia-rhine.dtsi b/arch/arm/boot/dts/qcom/qcom-msm8974-sony-xperia-rhine.dtsi
index 23ae474698aa..c8f914c4ebc4 100644
--- a/arch/arm/boot/dts/qcom/qcom-msm8974-sony-xperia-rhine.dtsi
+++ b/arch/arm/boot/dts/qcom/qcom-msm8974-sony-xperia-rhine.dtsi
@@ -493,3 +493,7 @@ &usb_hs1_phy {
extcon = <&smbb>;
qcom,init-seq = /bits/ 8 <0x1 0x64>;
};
+
+&vreg_boost {
+ gpio = <&pm8941_gpios 21 GPIO_ACTIVE_HIGH>;
+};
diff --git a/arch/arm/boot/dts/qcom/qcom-msm8974.dtsi b/arch/arm/boot/dts/qcom/qcom-msm8974.dtsi
index aeca504918a0..a8f1c5d76bcd 100644
--- a/arch/arm/boot/dts/qcom/qcom-msm8974.dtsi
+++ b/arch/arm/boot/dts/qcom/qcom-msm8974.dtsi
@@ -2387,7 +2387,6 @@ vreg_boost: vreg-boost {
regulator-always-on;
regulator-boot-on;
- gpio = <&pm8941_gpios 21 GPIO_ACTIVE_HIGH>;
enable-active-high;
pinctrl-names = "default";
diff --git a/arch/arm/boot/dts/qcom/qcom-msm8974pro-fairphone-fp2.dts b/arch/arm/boot/dts/qcom/qcom-msm8974pro-fairphone-fp2.dts
index 24f9521a0be6..ba94186792d5 100644
--- a/arch/arm/boot/dts/qcom/qcom-msm8974pro-fairphone-fp2.dts
+++ b/arch/arm/boot/dts/qcom/qcom-msm8974pro-fairphone-fp2.dts
@@ -461,3 +461,7 @@ &usb_hs1_phy {
extcon = <&smbb>;
qcom,init-seq = /bits/ 8 <0x1 0x64>;
};
+
+&vreg_boost {
+ gpio = <&pm8941_gpios 21 GPIO_ACTIVE_HIGH>;
+};
diff --git a/arch/arm/boot/dts/qcom/qcom-msm8974pro-oneplus-bacon.dts b/arch/arm/boot/dts/qcom/qcom-msm8974pro-oneplus-bacon.dts
index c0ca264d8140..b95fd5f2a481 100644
--- a/arch/arm/boot/dts/qcom/qcom-msm8974pro-oneplus-bacon.dts
+++ b/arch/arm/boot/dts/qcom/qcom-msm8974pro-oneplus-bacon.dts
@@ -510,3 +510,7 @@ &usb_hs1_phy {
extcon = <&smbb>;
qcom,init-seq = /bits/ 8 <0x1 0x64>;
};
+
+&vreg_boost {
+ gpio = <&pm8941_gpios 21 GPIO_ACTIVE_HIGH>;
+};
diff --git a/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts b/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts
index efe21289c9fe..09514324d444 100644
--- a/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts
+++ b/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts
@@ -672,3 +672,7 @@ &usb_hs1_phy {
extcon = <&smbb>;
qcom,init-seq = /bits/ 8 <0x1 0x64>;
};
+
+&vreg_boost {
+ gpio = <&pm8941_gpios 21 GPIO_ACTIVE_HIGH>;
+};
--
2.39.2
^ permalink raw reply related [flat|nested] 29+ messages in thread* Re: [PATCH 11/15] ARM: dts: qcom: msm8974: move vreg-boost GPIO to board files
2023-06-27 1:24 ` [PATCH 11/15] ARM: dts: qcom: msm8974: move vreg-boost GPIO to board files Dmitry Baryshkov
@ 2023-06-27 11:15 ` Konrad Dybcio
0 siblings, 0 replies; 29+ messages in thread
From: Konrad Dybcio @ 2023-06-27 11:15 UTC (permalink / raw)
To: Dmitry Baryshkov, Andy Gross, Bjorn Andersson, Rob Herring,
Krzysztof Kozlowski
Cc: linux-arm-msm, devicetree
On 27.06.2023 03:24, Dmitry Baryshkov wrote:
> The controlling GPIO for the regulator (even if it is unified by design)
> is not a property of SoC, so move it to board files.
>
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> ---
You missed the dragonboard and klte
Konrad
> arch/arm/boot/dts/qcom/qcom-msm8974-lge-nexus5-hammerhead.dts | 4 ++++
> arch/arm/boot/dts/qcom/qcom-msm8974-sony-xperia-rhine.dtsi | 4 ++++
> arch/arm/boot/dts/qcom/qcom-msm8974.dtsi | 1 -
> arch/arm/boot/dts/qcom/qcom-msm8974pro-fairphone-fp2.dts | 4 ++++
> arch/arm/boot/dts/qcom/qcom-msm8974pro-oneplus-bacon.dts | 4 ++++
> .../dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts | 4 ++++
> 6 files changed, 20 insertions(+), 1 deletion(-)
>
> diff --git a/arch/arm/boot/dts/qcom/qcom-msm8974-lge-nexus5-hammerhead.dts b/arch/arm/boot/dts/qcom/qcom-msm8974-lge-nexus5-hammerhead.dts
> index da99f770d4f5..eccd8f536bce 100644
> --- a/arch/arm/boot/dts/qcom/qcom-msm8974-lge-nexus5-hammerhead.dts
> +++ b/arch/arm/boot/dts/qcom/qcom-msm8974-lge-nexus5-hammerhead.dts
> @@ -694,3 +694,7 @@ &usb_hs1_phy {
>
> qcom,init-seq = /bits/ 8 <0x1 0x64>;
> };
> +
> +&vreg_boost {
> + gpio = <&pm8941_gpios 21 GPIO_ACTIVE_HIGH>;
> +};
> diff --git a/arch/arm/boot/dts/qcom/qcom-msm8974-sony-xperia-rhine.dtsi b/arch/arm/boot/dts/qcom/qcom-msm8974-sony-xperia-rhine.dtsi
> index 23ae474698aa..c8f914c4ebc4 100644
> --- a/arch/arm/boot/dts/qcom/qcom-msm8974-sony-xperia-rhine.dtsi
> +++ b/arch/arm/boot/dts/qcom/qcom-msm8974-sony-xperia-rhine.dtsi
> @@ -493,3 +493,7 @@ &usb_hs1_phy {
> extcon = <&smbb>;
> qcom,init-seq = /bits/ 8 <0x1 0x64>;
> };
> +
> +&vreg_boost {
> + gpio = <&pm8941_gpios 21 GPIO_ACTIVE_HIGH>;
> +};
> diff --git a/arch/arm/boot/dts/qcom/qcom-msm8974.dtsi b/arch/arm/boot/dts/qcom/qcom-msm8974.dtsi
> index aeca504918a0..a8f1c5d76bcd 100644
> --- a/arch/arm/boot/dts/qcom/qcom-msm8974.dtsi
> +++ b/arch/arm/boot/dts/qcom/qcom-msm8974.dtsi
> @@ -2387,7 +2387,6 @@ vreg_boost: vreg-boost {
> regulator-always-on;
> regulator-boot-on;
>
> - gpio = <&pm8941_gpios 21 GPIO_ACTIVE_HIGH>;
> enable-active-high;
>
> pinctrl-names = "default";
> diff --git a/arch/arm/boot/dts/qcom/qcom-msm8974pro-fairphone-fp2.dts b/arch/arm/boot/dts/qcom/qcom-msm8974pro-fairphone-fp2.dts
> index 24f9521a0be6..ba94186792d5 100644
> --- a/arch/arm/boot/dts/qcom/qcom-msm8974pro-fairphone-fp2.dts
> +++ b/arch/arm/boot/dts/qcom/qcom-msm8974pro-fairphone-fp2.dts
> @@ -461,3 +461,7 @@ &usb_hs1_phy {
> extcon = <&smbb>;
> qcom,init-seq = /bits/ 8 <0x1 0x64>;
> };
> +
> +&vreg_boost {
> + gpio = <&pm8941_gpios 21 GPIO_ACTIVE_HIGH>;
> +};
> diff --git a/arch/arm/boot/dts/qcom/qcom-msm8974pro-oneplus-bacon.dts b/arch/arm/boot/dts/qcom/qcom-msm8974pro-oneplus-bacon.dts
> index c0ca264d8140..b95fd5f2a481 100644
> --- a/arch/arm/boot/dts/qcom/qcom-msm8974pro-oneplus-bacon.dts
> +++ b/arch/arm/boot/dts/qcom/qcom-msm8974pro-oneplus-bacon.dts
> @@ -510,3 +510,7 @@ &usb_hs1_phy {
> extcon = <&smbb>;
> qcom,init-seq = /bits/ 8 <0x1 0x64>;
> };
> +
> +&vreg_boost {
> + gpio = <&pm8941_gpios 21 GPIO_ACTIVE_HIGH>;
> +};
> diff --git a/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts b/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts
> index efe21289c9fe..09514324d444 100644
> --- a/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts
> +++ b/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts
> @@ -672,3 +672,7 @@ &usb_hs1_phy {
> extcon = <&smbb>;
> qcom,init-seq = /bits/ 8 <0x1 0x64>;
> };
> +
> +&vreg_boost {
> + gpio = <&pm8941_gpios 21 GPIO_ACTIVE_HIGH>;
> +};
^ permalink raw reply [flat|nested] 29+ messages in thread
* [PATCH 12/15] ARM: dts: qcom: apq8064: move RPM regulators to board files
2023-06-27 1:24 [PATCH 00/15] ARM: dts: qcom: cleanup PMIC usage Dmitry Baryshkov
` (10 preceding siblings ...)
2023-06-27 1:24 ` [PATCH 11/15] ARM: dts: qcom: msm8974: move vreg-boost GPIO to board files Dmitry Baryshkov
@ 2023-06-27 1:24 ` Dmitry Baryshkov
2023-06-27 11:19 ` Konrad Dybcio
2023-06-27 1:24 ` [PATCH 13/15] ARM: dts: qcom: mdm9615: " Dmitry Baryshkov
` (2 subsequent siblings)
14 siblings, 1 reply; 29+ messages in thread
From: Dmitry Baryshkov @ 2023-06-27 1:24 UTC (permalink / raw)
To: Andy Gross, Bjorn Andersson, Konrad Dybcio, Rob Herring,
Krzysztof Kozlowski
Cc: linux-arm-msm, devicetree
The set of regulators available over the RPM requests is not a property
of the SoC. Move them to board files.
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
.../dts/qcom/qcom-apq8064-asus-nexus7-flo.dts | 49 ++++----
.../boot/dts/qcom/qcom-apq8064-cm-qs600.dts | 26 ++---
.../boot/dts/qcom/qcom-apq8064-ifc6410.dts | 33 +++---
.../qcom-apq8064-sony-xperia-lagan-yuga.dts | 105 ++++++++++--------
arch/arm/boot/dts/qcom/qcom-apq8064.dtsi | 63 -----------
5 files changed, 115 insertions(+), 161 deletions(-)
diff --git a/arch/arm/boot/dts/qcom/qcom-apq8064-asus-nexus7-flo.dts b/arch/arm/boot/dts/qcom/qcom-apq8064-asus-nexus7-flo.dts
index d5dee70620c2..1caa73e20bc9 100644
--- a/arch/arm/boot/dts/qcom/qcom-apq8064-asus-nexus7-flo.dts
+++ b/arch/arm/boot/dts/qcom/qcom-apq8064-asus-nexus7-flo.dts
@@ -192,22 +192,20 @@ &mdp_dsi1_out {
&rpm {
regulators {
vdd_l1_l2_l12_l18-supply = <&pm8921_s4>;
- vin_lvs1_3_6-supply = <&pm8921_s4>;
- vin_lvs4_5_7-supply = <&pm8921_s4>;
-
-
vdd_l24-supply = <&pm8921_s1>;
vdd_l25-supply = <&pm8921_s1>;
- vin_lvs2-supply = <&pm8921_s1>;
-
vdd_l26-supply = <&pm8921_s7>;
vdd_l27-supply = <&pm8921_s7>;
vdd_l28-supply = <&pm8921_s7>;
+ vin_lvs1_3_6-supply = <&pm8921_s4>;
+ vin_lvs2-supply = <&pm8921_s1>;
+ vin_lvs4_5_7-supply = <&pm8921_s4>;
+
vdd_ncp-supply = <&pm8921_l6>;
/* Buck SMPS */
- s1 {
+ pm8921_s1: s1 {
regulator-always-on;
regulator-min-microvolt = <1225000>;
regulator-max-microvolt = <1225000>;
@@ -216,7 +214,7 @@ s1 {
};
/* msm otg HSUSB_VDDCX */
- s3 {
+ pm8921_s3: s3 {
regulator-min-microvolt = <500000>;
regulator-max-microvolt = <1150000>;
qcom,switch-mode-frequency = <4800000>;
@@ -229,55 +227,58 @@ s3 {
* tabla2x-slim-CDC_VDD_CP
* tabla2x-slim-VDDIO_CDC
*/
- s4 {
+ pm8921_s4: s4 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
qcom,switch-mode-frequency = <3200000>;
regulator-always-on;
};
- s7 {
+ pm8921_s7: s7 {
regulator-min-microvolt = <1300000>;
regulator-max-microvolt = <1300000>;
qcom,switch-mode-frequency = <3200000>;
};
/* mipi_dsi.1-dsi1_pll_vdda */
- l2 {
+ pm8921_l2: l2 {
regulator-min-microvolt = <1200000>;
regulator-max-microvolt = <1200000>;
regulator-always-on;
};
/* msm_otg-HSUSB_3p3 */
- l3 {
+ pm8921_l3: l3 {
regulator-min-microvolt = <3075000>;
regulator-max-microvolt = <3075000>;
bias-pull-down;
};
/* msm_otg-HSUSB_1p8 */
- l4 {
+ pm8921_l4: l4 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
bias-pull-down;
};
/* msm_sdcc.1-sdc_vdd */
- l5 {
+ pm8921_l5: l5 {
regulator-min-microvolt = <2950000>;
regulator-max-microvolt = <2950000>;
regulator-always-on;
bias-pull-down;
};
- l6 {
+ pm8921_l6: l6 {
regulator-min-microvolt = <2950000>;
regulator-max-microvolt = <2950000>;
};
+ pm8921_l8: l8 {
+ };
+
/* mipi_dsi.1-dsi1_avdd */
- l11 {
+ pm8921_l11: l11 {
regulator-min-microvolt = <3000000>;
regulator-max-microvolt = <3000000>;
bias-pull-down;
@@ -285,14 +286,14 @@ l11 {
};
/* pwm_power for backlight */
- l17 {
+ pm8921_l17: l17 {
regulator-min-microvolt = <3000000>;
regulator-max-microvolt = <3000000>;
regulator-always-on;
};
/* camera, qdsp6 */
- l23 {
+ pm8921_l23: l23 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
bias-pull-down;
@@ -302,32 +303,32 @@ l23 {
* tabla2x-slim-CDC_VDDA_A_1P2V
* tabla2x-slim-VDDD_CDC_D
*/
- l25 {
+ pm8921_l25: l25 {
regulator-min-microvolt = <1250000>;
regulator-max-microvolt = <1250000>;
bias-pull-down;
};
- lvs1 {
+ pm8921_lvs1: lvs1 {
bias-pull-down;
};
- lvs4 {
+ pm8921_lvs4: lvs4 {
bias-pull-down;
};
- lvs5 {
+ pm8921_lvs5: lvs5 {
bias-pull-down;
};
- lvs6 {
+ pm8921_lvs6: lvs6 {
bias-pull-down;
};
/*
* mipi_dsi.1-dsi1_vddio
* pil_riva-pll_vdd
*/
- lvs7 {
+ pm8921_lvs7: lvs7 {
bias-pull-down;
};
};
diff --git a/arch/arm/boot/dts/qcom/qcom-apq8064-cm-qs600.dts b/arch/arm/boot/dts/qcom/qcom-apq8064-cm-qs600.dts
index ffd654ab0b57..6472277d1c6d 100644
--- a/arch/arm/boot/dts/qcom/qcom-apq8064-cm-qs600.dts
+++ b/arch/arm/boot/dts/qcom/qcom-apq8064-cm-qs600.dts
@@ -85,10 +85,6 @@ pinconf {
&rpm {
regulators {
- vin_lvs1_3_6-supply = <&pm8921_s4>;
- vin_lvs2-supply = <&pm8921_s1>;
- vin_lvs4_5_7-supply = <&pm8921_s4>;
-
vdd_l1_l2_l12_l18-supply = <&pm8921_s4>;
vdd_l24-supply = <&pm8921_s1>;
vdd_l25-supply = <&pm8921_s1>;
@@ -96,9 +92,12 @@ regulators {
vdd_l27-supply = <&pm8921_s7>;
vdd_l28-supply = <&pm8921_s7>;
+ vin_lvs1_3_6-supply = <&pm8921_s4>;
+ vin_lvs2-supply = <&pm8921_s1>;
+ vin_lvs4_5_7-supply = <&pm8921_s4>;
/* Buck SMPS */
- s1 {
+ pm8921_s1: s1 {
regulator-always-on;
regulator-min-microvolt = <1225000>;
regulator-max-microvolt = <1225000>;
@@ -106,52 +105,51 @@ s1 {
bias-pull-down;
};
- s3 {
+ pm8921_s3: s3 {
regulator-min-microvolt = <1000000>;
regulator-max-microvolt = <1400000>;
qcom,switch-mode-frequency = <4800000>;
};
- s4 {
+ pm8921_s4: s4 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
qcom,switch-mode-frequency = <3200000>;
};
- s7 {
+ pm8921_s7: s7 {
regulator-min-microvolt = <1300000>;
regulator-max-microvolt = <1300000>;
qcom,switch-mode-frequency = <3200000>;
};
- l3 {
+ pm8921_l3: l3 {
regulator-min-microvolt = <3050000>;
regulator-max-microvolt = <3300000>;
bias-pull-down;
};
- l4 {
+ pm8921_l4: l4 {
regulator-min-microvolt = <1000000>;
regulator-max-microvolt = <1800000>;
bias-pull-down;
};
- l5 {
+ pm8921_l5: l5 {
regulator-min-microvolt = <2750000>;
regulator-max-microvolt = <3000000>;
bias-pull-down;
};
- l23 {
+ pm8921_l23: l23 {
regulator-min-microvolt = <1700000>;
regulator-max-microvolt = <1900000>;
bias-pull-down;
};
- lvs6 {
+ pm8921_lvs6: lvs6 {
bias-pull-down;
};
-
};
};
diff --git a/arch/arm/boot/dts/qcom/qcom-apq8064-ifc6410.dts b/arch/arm/boot/dts/qcom/qcom-apq8064-ifc6410.dts
index 12bf8ea3fb93..39c44fae9d14 100644
--- a/arch/arm/boot/dts/qcom/qcom-apq8064-ifc6410.dts
+++ b/arch/arm/boot/dts/qcom/qcom-apq8064-ifc6410.dts
@@ -196,10 +196,6 @@ pinconf {
&rpm {
regulators {
- vin_lvs1_3_6-supply = <&pm8921_s4>;
- vin_lvs2-supply = <&pm8921_s1>;
- vin_lvs4_5_7-supply = <&pm8921_s4>;
-
vdd_l1_l2_l12_l18-supply = <&pm8921_s4>;
vdd_l24-supply = <&pm8921_s1>;
vdd_l25-supply = <&pm8921_s1>;
@@ -207,9 +203,12 @@ regulators {
vdd_l27-supply = <&pm8921_s7>;
vdd_l28-supply = <&pm8921_s7>;
+ vin_lvs1_3_6-supply = <&pm8921_s4>;
+ vin_lvs2-supply = <&pm8921_s1>;
+ vin_lvs4_5_7-supply = <&pm8921_s4>;
/* Buck SMPS */
- s1 {
+ pm8921_s1: s1 {
regulator-always-on;
regulator-min-microvolt = <1225000>;
regulator-max-microvolt = <1225000>;
@@ -217,59 +216,63 @@ s1 {
bias-pull-down;
};
- s3 {
+ pm8921_s3: s3 {
regulator-min-microvolt = <1000000>;
regulator-max-microvolt = <1400000>;
qcom,switch-mode-frequency = <4800000>;
};
- s4 {
+ pm8921_s4: s4 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
qcom,switch-mode-frequency = <3200000>;
};
- s7 {
+ pm8921_s7: s7 {
regulator-min-microvolt = <1300000>;
regulator-max-microvolt = <1300000>;
qcom,switch-mode-frequency = <3200000>;
};
- l3 {
+ pm8921_l3: l3 {
regulator-min-microvolt = <3050000>;
regulator-max-microvolt = <3300000>;
bias-pull-down;
};
- l4 {
+ pm8921_l4: l4 {
regulator-min-microvolt = <1000000>;
regulator-max-microvolt = <1800000>;
bias-pull-down;
};
- l5 {
+ pm8921_l5: l5 {
regulator-min-microvolt = <2750000>;
regulator-max-microvolt = <3000000>;
bias-pull-down;
};
- l6 {
+ pm8921_l6: l6 {
regulator-min-microvolt = <2950000>;
regulator-max-microvolt = <2950000>;
bias-pull-down;
};
- l23 {
+ pm8921_l23: l23 {
regulator-min-microvolt = <1700000>;
regulator-max-microvolt = <1900000>;
bias-pull-down;
};
- lvs1 {
+ pm8921_lvs1: lvs1 {
+ bias-pull-down;
+ };
+
+ pm8921_lvs6: lvs6 {
bias-pull-down;
};
- lvs6 {
+ pm8921_hdmi_switch: hdmi-switch {
bias-pull-down;
};
};
diff --git a/arch/arm/boot/dts/qcom/qcom-apq8064-sony-xperia-lagan-yuga.dts b/arch/arm/boot/dts/qcom/qcom-apq8064-sony-xperia-lagan-yuga.dts
index 53dd9d79556f..6988bd212924 100644
--- a/arch/arm/boot/dts/qcom/qcom-apq8064-sony-xperia-lagan-yuga.dts
+++ b/arch/arm/boot/dts/qcom/qcom-apq8064-sony-xperia-lagan-yuga.dts
@@ -85,23 +85,36 @@ gpio_keys_pin_a: gpio-keys-active-state {
&riva {
pinctrl-names = "default";
pinctrl-0 = <&riva_wlan_pin_a>, <&riva_bt_pin_a>, <&riva_fm_pin_a>;
+
+ vddcx-supply = <&pm8921_s3>;
+ vddmx-supply = <&pm8921_l24>;
+ vddpx-supply = <&pm8921_s4>;
+
status = "okay";
+
+ iris {
+ vddxo-supply = <&pm8921_l4>;
+ vddrfa-supply = <&pm8921_s2>;
+ vddpa-supply = <&pm8921_l10>;
+ vdddig-supply = <&pm8921_lvs2>;
+ };
};
&rpm {
regulators {
vin_l1_l2_l12_l18-supply = <&pm8921_s4>;
- vin_lvs_1_3_6-supply = <&pm8921_s4>;
- vin_lvs_4_5_7-supply = <&pm8921_s4>;
- vin_ncp-supply = <&pm8921_l6>;
- vin_lvs2-supply = <&pm8921_s4>;
vin_l24-supply = <&pm8921_s1>;
vin_l25-supply = <&pm8921_s1>;
vin_l27-supply = <&pm8921_s7>;
vin_l28-supply = <&pm8921_s7>;
+ vin_lvs_1_3_6-supply = <&pm8921_s4>;
+ vin_lvs2-supply = <&pm8921_s4>;
+ vin_lvs_4_5_7-supply = <&pm8921_s4>;
+ vin_ncp-supply = <&pm8921_l6>;
+
/* Buck SMPS */
- s1 {
+ pm8921_s1: s1 {
regulator-always-on;
regulator-min-microvolt = <1225000>;
regulator-max-microvolt = <1225000>;
@@ -109,21 +122,21 @@ s1 {
bias-pull-down;
};
- s2 {
+ pm8921_s2: s2 {
regulator-min-microvolt = <1300000>;
regulator-max-microvolt = <1300000>;
qcom,switch-mode-frequency = <1600000>;
bias-pull-down;
};
- s3 {
+ pm8921_s3: s3 {
regulator-min-microvolt = <500000>;
regulator-max-microvolt = <1150000>;
qcom,switch-mode-frequency = <4800000>;
bias-pull-down;
};
- s4 {
+ pm8921_s4: s4 {
regulator-always-on;
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
@@ -132,205 +145,207 @@ s4 {
qcom,force-mode = <QCOM_RPM_FORCE_MODE_AUTO>;
};
- s7 {
+ pm8921_s7: s7 {
regulator-min-microvolt = <1300000>;
regulator-max-microvolt = <1300000>;
qcom,switch-mode-frequency = <3200000>;
};
- s8 {
+ pm8921_s8: s8 {
regulator-min-microvolt = <2200000>;
regulator-max-microvolt = <2200000>;
qcom,switch-mode-frequency = <1600000>;
};
/* PMOS LDO */
- l1 {
+ pm8921_l1: l1 {
regulator-always-on;
regulator-min-microvolt = <1100000>;
regulator-max-microvolt = <1100000>;
bias-pull-down;
};
- l2 {
+ pm8921_l2: l2 {
regulator-min-microvolt = <1200000>;
regulator-max-microvolt = <1200000>;
bias-pull-down;
};
- l3 {
+ pm8921_l3: l3 {
regulator-min-microvolt = <3075000>;
regulator-max-microvolt = <3075000>;
bias-pull-down;
};
- l4 {
+ pm8921_l4: l4 {
regulator-always-on;
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
bias-pull-down;
};
- l5 {
+ pm8921_l5: l5 {
regulator-min-microvolt = <2950000>;
regulator-max-microvolt = <2950000>;
bias-pull-down;
};
- l6 {
+ pm8921_l6: l6 {
regulator-min-microvolt = <2950000>;
regulator-max-microvolt = <2950000>;
bias-pull-down;
};
- l7 {
+ pm8921_l7: l7 {
regulator-min-microvolt = <1850000>;
regulator-max-microvolt = <2950000>;
bias-pull-down;
};
- l8 {
+ pm8921_l8: l8 {
regulator-min-microvolt = <2800000>;
regulator-max-microvolt = <2800000>;
bias-pull-down;
};
- l9 {
+ pm8921_l9: l9 {
regulator-min-microvolt = <3000000>;
regulator-max-microvolt = <3000000>;
bias-pull-down;
};
- l10 {
+ pm8921_l10: l10 {
regulator-min-microvolt = <2900000>;
regulator-max-microvolt = <2900000>;
bias-pull-down;
};
- l11 {
+ pm8921_l11: l11 {
regulator-min-microvolt = <3000000>;
regulator-max-microvolt = <3000000>;
bias-pull-down;
};
- l12 {
+ pm8921_l12: l12 {
regulator-min-microvolt = <1200000>;
regulator-max-microvolt = <1200000>;
bias-pull-down;
};
- l14 {
+ pm8921_l14: l14 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
bias-pull-down;
};
- l15 {
+ pm8921_l15: l15 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <2950000>;
bias-pull-down;
};
- l16 {
+ pm8921_l16: l16 {
regulator-min-microvolt = <2800000>;
regulator-max-microvolt = <2800000>;
bias-pull-down;
};
- l17 {
+ pm8921_l17: l17 {
regulator-min-microvolt = <2000000>;
regulator-max-microvolt = <2000000>;
bias-pull-down;
};
- l18 {
+ pm8921_l18: l18 {
regulator-min-microvolt = <1200000>;
regulator-max-microvolt = <1200000>;
bias-pull-down;
};
- l21 {
+ pm8921_l21: l21 {
regulator-min-microvolt = <1050000>;
regulator-max-microvolt = <1050000>;
bias-pull-down;
};
- l22 {
+ pm8921_l22: l22 {
regulator-min-microvolt = <2600000>;
regulator-max-microvolt = <2600000>;
bias-pull-down;
};
- l23 {
+ pm8921_l23: l23 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
bias-pull-down;
};
- l24 {
+ pm8921_l24: l24 {
regulator-min-microvolt = <750000>;
regulator-max-microvolt = <1150000>;
bias-pull-down;
};
- l25 {
+ pm8921_l25: l25 {
regulator-always-on;
regulator-min-microvolt = <1250000>;
regulator-max-microvolt = <1250000>;
bias-pull-down;
};
- l27 {
+ pm8921_l27: l27 {
regulator-min-microvolt = <1100000>;
regulator-max-microvolt = <1100000>;
};
- l28 {
+ pm8921_l28: l28 {
regulator-min-microvolt = <1050000>;
regulator-max-microvolt = <1050000>;
bias-pull-down;
};
- l29 {
+ pm8921_l29: l29 {
regulator-min-microvolt = <2000000>;
regulator-max-microvolt = <2000000>;
bias-pull-down;
};
/* Low Voltage Switch */
- lvs1 {
+ pm8921_lvs1: lvs1 {
bias-pull-down;
};
- lvs2 {
+ pm8921_lvs2: lvs2 {
bias-pull-down;
};
- lvs3 {
+ pm8921_lvs3: lvs3 {
bias-pull-down;
};
- lvs4 {
+ pm8921_lvs4: lvs4 {
bias-pull-down;
};
- lvs5 {
+ pm8921_lvs5: lvs5 {
bias-pull-down;
};
- lvs6 {
+ pm8921_lvs6: lvs6 {
bias-pull-down;
};
- lvs7 {
+ pm8921_lvs7: lvs7 {
bias-pull-down;
};
- usb-switch {};
+ pm8921_usb_switch: usb-switch {};
- hdmi-switch {};
+ pm8921_hdmi_switch: hdmi-switch {
+ bias-pull-down;
+ };
- ncp {
+ pm8921_ncp: ncp {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
qcom,switch-mode-frequency = <1600000>;
diff --git a/arch/arm/boot/dts/qcom/qcom-apq8064.dtsi b/arch/arm/boot/dts/qcom/qcom-apq8064.dtsi
index 2a5a3b2fb8e9..36c68ee5be65 100644
--- a/arch/arm/boot/dts/qcom/qcom-apq8064.dtsi
+++ b/arch/arm/boot/dts/qcom/qcom-apq8064.dtsi
@@ -795,60 +795,6 @@ rpmcc: clock-controller {
clocks = <&pxo_board>, <&cxo_board>;
clock-names = "pxo", "cxo";
};
-
- regulators {
- compatible = "qcom,rpm-pm8921-regulators";
-
- pm8921_s1: s1 {};
- pm8921_s2: s2 {};
- pm8921_s3: s3 {};
- pm8921_s4: s4 {};
- pm8921_s7: s7 {};
- pm8921_s8: s8 {};
-
- pm8921_l1: l1 {};
- pm8921_l2: l2 {};
- pm8921_l3: l3 {};
- pm8921_l4: l4 {};
- pm8921_l5: l5 {};
- pm8921_l6: l6 {};
- pm8921_l7: l7 {};
- pm8921_l8: l8 {};
- pm8921_l9: l9 {};
- pm8921_l10: l10 {};
- pm8921_l11: l11 {};
- pm8921_l12: l12 {};
- pm8921_l14: l14 {};
- pm8921_l15: l15 {};
- pm8921_l16: l16 {};
- pm8921_l17: l17 {};
- pm8921_l18: l18 {};
- pm8921_l21: l21 {};
- pm8921_l22: l22 {};
- pm8921_l23: l23 {};
- pm8921_l24: l24 {};
- pm8921_l25: l25 {};
- pm8921_l26: l26 {};
- pm8921_l27: l27 {};
- pm8921_l28: l28 {};
- pm8921_l29: l29 {};
-
- pm8921_lvs1: lvs1 {};
- pm8921_lvs2: lvs2 {};
- pm8921_lvs3: lvs3 {};
- pm8921_lvs4: lvs4 {};
- pm8921_lvs5: lvs5 {};
- pm8921_lvs6: lvs6 {};
- pm8921_lvs7: lvs7 {};
-
- pm8921_usb_switch: usb-switch {};
-
- pm8921_hdmi_switch: hdmi-switch {
- bias-pull-down;
- };
-
- pm8921_ncp: ncp {};
- };
};
usb1: usb@12500000 {
@@ -1528,10 +1474,6 @@ riva: riva-pil@3200800 {
memory-region = <&wcnss_mem>;
- vddcx-supply = <&pm8921_s3>;
- vddmx-supply = <&pm8921_l24>;
- vddpx-supply = <&pm8921_s4>;
-
status = "disabled";
iris {
@@ -1539,11 +1481,6 @@ iris {
clocks = <&cxo_board>;
clock-names = "xo";
-
- vddxo-supply = <&pm8921_l4>;
- vddrfa-supply = <&pm8921_s2>;
- vddpa-supply = <&pm8921_l10>;
- vdddig-supply = <&pm8921_lvs2>;
};
smd-edge {
--
2.39.2
^ permalink raw reply related [flat|nested] 29+ messages in thread* Re: [PATCH 12/15] ARM: dts: qcom: apq8064: move RPM regulators to board files
2023-06-27 1:24 ` [PATCH 12/15] ARM: dts: qcom: apq8064: move RPM regulators " Dmitry Baryshkov
@ 2023-06-27 11:19 ` Konrad Dybcio
0 siblings, 0 replies; 29+ messages in thread
From: Konrad Dybcio @ 2023-06-27 11:19 UTC (permalink / raw)
To: Dmitry Baryshkov, Andy Gross, Bjorn Andersson, Rob Herring,
Krzysztof Kozlowski
Cc: linux-arm-msm, devicetree
On 27.06.2023 03:24, Dmitry Baryshkov wrote:
> The set of regulators available over the RPM requests is not a property
> of the SoC. Move them to board files.
>
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> ---
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Konrad
> .../dts/qcom/qcom-apq8064-asus-nexus7-flo.dts | 49 ++++----
> .../boot/dts/qcom/qcom-apq8064-cm-qs600.dts | 26 ++---
> .../boot/dts/qcom/qcom-apq8064-ifc6410.dts | 33 +++---
> .../qcom-apq8064-sony-xperia-lagan-yuga.dts | 105 ++++++++++--------
> arch/arm/boot/dts/qcom/qcom-apq8064.dtsi | 63 -----------
> 5 files changed, 115 insertions(+), 161 deletions(-)
>
> diff --git a/arch/arm/boot/dts/qcom/qcom-apq8064-asus-nexus7-flo.dts b/arch/arm/boot/dts/qcom/qcom-apq8064-asus-nexus7-flo.dts
> index d5dee70620c2..1caa73e20bc9 100644
> --- a/arch/arm/boot/dts/qcom/qcom-apq8064-asus-nexus7-flo.dts
> +++ b/arch/arm/boot/dts/qcom/qcom-apq8064-asus-nexus7-flo.dts
> @@ -192,22 +192,20 @@ &mdp_dsi1_out {
> &rpm {
> regulators {
> vdd_l1_l2_l12_l18-supply = <&pm8921_s4>;
> - vin_lvs1_3_6-supply = <&pm8921_s4>;
> - vin_lvs4_5_7-supply = <&pm8921_s4>;
> -
> -
> vdd_l24-supply = <&pm8921_s1>;
> vdd_l25-supply = <&pm8921_s1>;
> - vin_lvs2-supply = <&pm8921_s1>;
> -
> vdd_l26-supply = <&pm8921_s7>;
> vdd_l27-supply = <&pm8921_s7>;
> vdd_l28-supply = <&pm8921_s7>;
>
> + vin_lvs1_3_6-supply = <&pm8921_s4>;
> + vin_lvs2-supply = <&pm8921_s1>;
> + vin_lvs4_5_7-supply = <&pm8921_s4>;
> +
> vdd_ncp-supply = <&pm8921_l6>;
>
> /* Buck SMPS */
> - s1 {
> + pm8921_s1: s1 {
> regulator-always-on;
> regulator-min-microvolt = <1225000>;
> regulator-max-microvolt = <1225000>;
> @@ -216,7 +214,7 @@ s1 {
> };
>
> /* msm otg HSUSB_VDDCX */
> - s3 {
> + pm8921_s3: s3 {
> regulator-min-microvolt = <500000>;
> regulator-max-microvolt = <1150000>;
> qcom,switch-mode-frequency = <4800000>;
> @@ -229,55 +227,58 @@ s3 {
> * tabla2x-slim-CDC_VDD_CP
> * tabla2x-slim-VDDIO_CDC
> */
> - s4 {
> + pm8921_s4: s4 {
> regulator-min-microvolt = <1800000>;
> regulator-max-microvolt = <1800000>;
> qcom,switch-mode-frequency = <3200000>;
> regulator-always-on;
> };
>
> - s7 {
> + pm8921_s7: s7 {
> regulator-min-microvolt = <1300000>;
> regulator-max-microvolt = <1300000>;
> qcom,switch-mode-frequency = <3200000>;
> };
>
> /* mipi_dsi.1-dsi1_pll_vdda */
> - l2 {
> + pm8921_l2: l2 {
> regulator-min-microvolt = <1200000>;
> regulator-max-microvolt = <1200000>;
> regulator-always-on;
> };
>
> /* msm_otg-HSUSB_3p3 */
> - l3 {
> + pm8921_l3: l3 {
> regulator-min-microvolt = <3075000>;
> regulator-max-microvolt = <3075000>;
> bias-pull-down;
> };
>
> /* msm_otg-HSUSB_1p8 */
> - l4 {
> + pm8921_l4: l4 {
> regulator-min-microvolt = <1800000>;
> regulator-max-microvolt = <1800000>;
> bias-pull-down;
> };
>
> /* msm_sdcc.1-sdc_vdd */
> - l5 {
> + pm8921_l5: l5 {
> regulator-min-microvolt = <2950000>;
> regulator-max-microvolt = <2950000>;
> regulator-always-on;
> bias-pull-down;
> };
>
> - l6 {
> + pm8921_l6: l6 {
> regulator-min-microvolt = <2950000>;
> regulator-max-microvolt = <2950000>;
> };
>
> + pm8921_l8: l8 {
> + };
> +
> /* mipi_dsi.1-dsi1_avdd */
> - l11 {
> + pm8921_l11: l11 {
> regulator-min-microvolt = <3000000>;
> regulator-max-microvolt = <3000000>;
> bias-pull-down;
> @@ -285,14 +286,14 @@ l11 {
> };
>
> /* pwm_power for backlight */
> - l17 {
> + pm8921_l17: l17 {
> regulator-min-microvolt = <3000000>;
> regulator-max-microvolt = <3000000>;
> regulator-always-on;
> };
>
> /* camera, qdsp6 */
> - l23 {
> + pm8921_l23: l23 {
> regulator-min-microvolt = <1800000>;
> regulator-max-microvolt = <1800000>;
> bias-pull-down;
> @@ -302,32 +303,32 @@ l23 {
> * tabla2x-slim-CDC_VDDA_A_1P2V
> * tabla2x-slim-VDDD_CDC_D
> */
> - l25 {
> + pm8921_l25: l25 {
> regulator-min-microvolt = <1250000>;
> regulator-max-microvolt = <1250000>;
> bias-pull-down;
> };
>
> - lvs1 {
> + pm8921_lvs1: lvs1 {
> bias-pull-down;
> };
>
> - lvs4 {
> + pm8921_lvs4: lvs4 {
> bias-pull-down;
> };
>
> - lvs5 {
> + pm8921_lvs5: lvs5 {
> bias-pull-down;
> };
>
> - lvs6 {
> + pm8921_lvs6: lvs6 {
> bias-pull-down;
> };
> /*
> * mipi_dsi.1-dsi1_vddio
> * pil_riva-pll_vdd
> */
> - lvs7 {
> + pm8921_lvs7: lvs7 {
> bias-pull-down;
> };
> };
> diff --git a/arch/arm/boot/dts/qcom/qcom-apq8064-cm-qs600.dts b/arch/arm/boot/dts/qcom/qcom-apq8064-cm-qs600.dts
> index ffd654ab0b57..6472277d1c6d 100644
> --- a/arch/arm/boot/dts/qcom/qcom-apq8064-cm-qs600.dts
> +++ b/arch/arm/boot/dts/qcom/qcom-apq8064-cm-qs600.dts
> @@ -85,10 +85,6 @@ pinconf {
>
> &rpm {
> regulators {
> - vin_lvs1_3_6-supply = <&pm8921_s4>;
> - vin_lvs2-supply = <&pm8921_s1>;
> - vin_lvs4_5_7-supply = <&pm8921_s4>;
> -
> vdd_l1_l2_l12_l18-supply = <&pm8921_s4>;
> vdd_l24-supply = <&pm8921_s1>;
> vdd_l25-supply = <&pm8921_s1>;
> @@ -96,9 +92,12 @@ regulators {
> vdd_l27-supply = <&pm8921_s7>;
> vdd_l28-supply = <&pm8921_s7>;
>
> + vin_lvs1_3_6-supply = <&pm8921_s4>;
> + vin_lvs2-supply = <&pm8921_s1>;
> + vin_lvs4_5_7-supply = <&pm8921_s4>;
>
> /* Buck SMPS */
> - s1 {
> + pm8921_s1: s1 {
> regulator-always-on;
> regulator-min-microvolt = <1225000>;
> regulator-max-microvolt = <1225000>;
> @@ -106,52 +105,51 @@ s1 {
> bias-pull-down;
> };
>
> - s3 {
> + pm8921_s3: s3 {
> regulator-min-microvolt = <1000000>;
> regulator-max-microvolt = <1400000>;
> qcom,switch-mode-frequency = <4800000>;
> };
>
> - s4 {
> + pm8921_s4: s4 {
> regulator-min-microvolt = <1800000>;
> regulator-max-microvolt = <1800000>;
> qcom,switch-mode-frequency = <3200000>;
> };
>
> - s7 {
> + pm8921_s7: s7 {
> regulator-min-microvolt = <1300000>;
> regulator-max-microvolt = <1300000>;
> qcom,switch-mode-frequency = <3200000>;
> };
>
> - l3 {
> + pm8921_l3: l3 {
> regulator-min-microvolt = <3050000>;
> regulator-max-microvolt = <3300000>;
> bias-pull-down;
> };
>
> - l4 {
> + pm8921_l4: l4 {
> regulator-min-microvolt = <1000000>;
> regulator-max-microvolt = <1800000>;
> bias-pull-down;
> };
>
> - l5 {
> + pm8921_l5: l5 {
> regulator-min-microvolt = <2750000>;
> regulator-max-microvolt = <3000000>;
> bias-pull-down;
> };
>
> - l23 {
> + pm8921_l23: l23 {
> regulator-min-microvolt = <1700000>;
> regulator-max-microvolt = <1900000>;
> bias-pull-down;
> };
>
> - lvs6 {
> + pm8921_lvs6: lvs6 {
> bias-pull-down;
> };
> -
> };
> };
>
> diff --git a/arch/arm/boot/dts/qcom/qcom-apq8064-ifc6410.dts b/arch/arm/boot/dts/qcom/qcom-apq8064-ifc6410.dts
> index 12bf8ea3fb93..39c44fae9d14 100644
> --- a/arch/arm/boot/dts/qcom/qcom-apq8064-ifc6410.dts
> +++ b/arch/arm/boot/dts/qcom/qcom-apq8064-ifc6410.dts
> @@ -196,10 +196,6 @@ pinconf {
>
> &rpm {
> regulators {
> - vin_lvs1_3_6-supply = <&pm8921_s4>;
> - vin_lvs2-supply = <&pm8921_s1>;
> - vin_lvs4_5_7-supply = <&pm8921_s4>;
> -
> vdd_l1_l2_l12_l18-supply = <&pm8921_s4>;
> vdd_l24-supply = <&pm8921_s1>;
> vdd_l25-supply = <&pm8921_s1>;
> @@ -207,9 +203,12 @@ regulators {
> vdd_l27-supply = <&pm8921_s7>;
> vdd_l28-supply = <&pm8921_s7>;
>
> + vin_lvs1_3_6-supply = <&pm8921_s4>;
> + vin_lvs2-supply = <&pm8921_s1>;
> + vin_lvs4_5_7-supply = <&pm8921_s4>;
>
> /* Buck SMPS */
> - s1 {
> + pm8921_s1: s1 {
> regulator-always-on;
> regulator-min-microvolt = <1225000>;
> regulator-max-microvolt = <1225000>;
> @@ -217,59 +216,63 @@ s1 {
> bias-pull-down;
> };
>
> - s3 {
> + pm8921_s3: s3 {
> regulator-min-microvolt = <1000000>;
> regulator-max-microvolt = <1400000>;
> qcom,switch-mode-frequency = <4800000>;
> };
>
> - s4 {
> + pm8921_s4: s4 {
> regulator-min-microvolt = <1800000>;
> regulator-max-microvolt = <1800000>;
> qcom,switch-mode-frequency = <3200000>;
> };
>
> - s7 {
> + pm8921_s7: s7 {
> regulator-min-microvolt = <1300000>;
> regulator-max-microvolt = <1300000>;
> qcom,switch-mode-frequency = <3200000>;
> };
>
> - l3 {
> + pm8921_l3: l3 {
> regulator-min-microvolt = <3050000>;
> regulator-max-microvolt = <3300000>;
> bias-pull-down;
> };
>
> - l4 {
> + pm8921_l4: l4 {
> regulator-min-microvolt = <1000000>;
> regulator-max-microvolt = <1800000>;
> bias-pull-down;
> };
>
> - l5 {
> + pm8921_l5: l5 {
> regulator-min-microvolt = <2750000>;
> regulator-max-microvolt = <3000000>;
> bias-pull-down;
> };
>
> - l6 {
> + pm8921_l6: l6 {
> regulator-min-microvolt = <2950000>;
> regulator-max-microvolt = <2950000>;
> bias-pull-down;
> };
>
> - l23 {
> + pm8921_l23: l23 {
> regulator-min-microvolt = <1700000>;
> regulator-max-microvolt = <1900000>;
> bias-pull-down;
> };
>
> - lvs1 {
> + pm8921_lvs1: lvs1 {
> + bias-pull-down;
> + };
> +
> + pm8921_lvs6: lvs6 {
> bias-pull-down;
> };
>
> - lvs6 {
> + pm8921_hdmi_switch: hdmi-switch {
> bias-pull-down;
> };
> };
> diff --git a/arch/arm/boot/dts/qcom/qcom-apq8064-sony-xperia-lagan-yuga.dts b/arch/arm/boot/dts/qcom/qcom-apq8064-sony-xperia-lagan-yuga.dts
> index 53dd9d79556f..6988bd212924 100644
> --- a/arch/arm/boot/dts/qcom/qcom-apq8064-sony-xperia-lagan-yuga.dts
> +++ b/arch/arm/boot/dts/qcom/qcom-apq8064-sony-xperia-lagan-yuga.dts
> @@ -85,23 +85,36 @@ gpio_keys_pin_a: gpio-keys-active-state {
> &riva {
> pinctrl-names = "default";
> pinctrl-0 = <&riva_wlan_pin_a>, <&riva_bt_pin_a>, <&riva_fm_pin_a>;
> +
> + vddcx-supply = <&pm8921_s3>;
> + vddmx-supply = <&pm8921_l24>;
> + vddpx-supply = <&pm8921_s4>;
> +
> status = "okay";
> +
> + iris {
> + vddxo-supply = <&pm8921_l4>;
> + vddrfa-supply = <&pm8921_s2>;
> + vddpa-supply = <&pm8921_l10>;
> + vdddig-supply = <&pm8921_lvs2>;
> + };
> };
>
> &rpm {
> regulators {
> vin_l1_l2_l12_l18-supply = <&pm8921_s4>;
> - vin_lvs_1_3_6-supply = <&pm8921_s4>;
> - vin_lvs_4_5_7-supply = <&pm8921_s4>;
> - vin_ncp-supply = <&pm8921_l6>;
> - vin_lvs2-supply = <&pm8921_s4>;
> vin_l24-supply = <&pm8921_s1>;
> vin_l25-supply = <&pm8921_s1>;
> vin_l27-supply = <&pm8921_s7>;
> vin_l28-supply = <&pm8921_s7>;
>
> + vin_lvs_1_3_6-supply = <&pm8921_s4>;
> + vin_lvs2-supply = <&pm8921_s4>;
> + vin_lvs_4_5_7-supply = <&pm8921_s4>;
> + vin_ncp-supply = <&pm8921_l6>;
> +
> /* Buck SMPS */
> - s1 {
> + pm8921_s1: s1 {
> regulator-always-on;
> regulator-min-microvolt = <1225000>;
> regulator-max-microvolt = <1225000>;
> @@ -109,21 +122,21 @@ s1 {
> bias-pull-down;
> };
>
> - s2 {
> + pm8921_s2: s2 {
> regulator-min-microvolt = <1300000>;
> regulator-max-microvolt = <1300000>;
> qcom,switch-mode-frequency = <1600000>;
> bias-pull-down;
> };
>
> - s3 {
> + pm8921_s3: s3 {
> regulator-min-microvolt = <500000>;
> regulator-max-microvolt = <1150000>;
> qcom,switch-mode-frequency = <4800000>;
> bias-pull-down;
> };
>
> - s4 {
> + pm8921_s4: s4 {
> regulator-always-on;
> regulator-min-microvolt = <1800000>;
> regulator-max-microvolt = <1800000>;
> @@ -132,205 +145,207 @@ s4 {
> qcom,force-mode = <QCOM_RPM_FORCE_MODE_AUTO>;
> };
>
> - s7 {
> + pm8921_s7: s7 {
> regulator-min-microvolt = <1300000>;
> regulator-max-microvolt = <1300000>;
> qcom,switch-mode-frequency = <3200000>;
> };
>
> - s8 {
> + pm8921_s8: s8 {
> regulator-min-microvolt = <2200000>;
> regulator-max-microvolt = <2200000>;
> qcom,switch-mode-frequency = <1600000>;
> };
>
> /* PMOS LDO */
> - l1 {
> + pm8921_l1: l1 {
> regulator-always-on;
> regulator-min-microvolt = <1100000>;
> regulator-max-microvolt = <1100000>;
> bias-pull-down;
> };
>
> - l2 {
> + pm8921_l2: l2 {
> regulator-min-microvolt = <1200000>;
> regulator-max-microvolt = <1200000>;
> bias-pull-down;
> };
>
> - l3 {
> + pm8921_l3: l3 {
> regulator-min-microvolt = <3075000>;
> regulator-max-microvolt = <3075000>;
> bias-pull-down;
> };
>
> - l4 {
> + pm8921_l4: l4 {
> regulator-always-on;
> regulator-min-microvolt = <1800000>;
> regulator-max-microvolt = <1800000>;
> bias-pull-down;
> };
>
> - l5 {
> + pm8921_l5: l5 {
> regulator-min-microvolt = <2950000>;
> regulator-max-microvolt = <2950000>;
> bias-pull-down;
> };
>
> - l6 {
> + pm8921_l6: l6 {
> regulator-min-microvolt = <2950000>;
> regulator-max-microvolt = <2950000>;
> bias-pull-down;
> };
>
> - l7 {
> + pm8921_l7: l7 {
> regulator-min-microvolt = <1850000>;
> regulator-max-microvolt = <2950000>;
> bias-pull-down;
> };
>
> - l8 {
> + pm8921_l8: l8 {
> regulator-min-microvolt = <2800000>;
> regulator-max-microvolt = <2800000>;
> bias-pull-down;
> };
>
> - l9 {
> + pm8921_l9: l9 {
> regulator-min-microvolt = <3000000>;
> regulator-max-microvolt = <3000000>;
> bias-pull-down;
> };
>
> - l10 {
> + pm8921_l10: l10 {
> regulator-min-microvolt = <2900000>;
> regulator-max-microvolt = <2900000>;
> bias-pull-down;
> };
>
> - l11 {
> + pm8921_l11: l11 {
> regulator-min-microvolt = <3000000>;
> regulator-max-microvolt = <3000000>;
> bias-pull-down;
> };
>
> - l12 {
> + pm8921_l12: l12 {
> regulator-min-microvolt = <1200000>;
> regulator-max-microvolt = <1200000>;
> bias-pull-down;
> };
>
> - l14 {
> + pm8921_l14: l14 {
> regulator-min-microvolt = <1800000>;
> regulator-max-microvolt = <1800000>;
> bias-pull-down;
> };
>
> - l15 {
> + pm8921_l15: l15 {
> regulator-min-microvolt = <1800000>;
> regulator-max-microvolt = <2950000>;
> bias-pull-down;
> };
>
> - l16 {
> + pm8921_l16: l16 {
> regulator-min-microvolt = <2800000>;
> regulator-max-microvolt = <2800000>;
> bias-pull-down;
> };
>
> - l17 {
> + pm8921_l17: l17 {
> regulator-min-microvolt = <2000000>;
> regulator-max-microvolt = <2000000>;
> bias-pull-down;
> };
>
> - l18 {
> + pm8921_l18: l18 {
> regulator-min-microvolt = <1200000>;
> regulator-max-microvolt = <1200000>;
> bias-pull-down;
> };
>
> - l21 {
> + pm8921_l21: l21 {
> regulator-min-microvolt = <1050000>;
> regulator-max-microvolt = <1050000>;
> bias-pull-down;
> };
>
> - l22 {
> + pm8921_l22: l22 {
> regulator-min-microvolt = <2600000>;
> regulator-max-microvolt = <2600000>;
> bias-pull-down;
> };
>
> - l23 {
> + pm8921_l23: l23 {
> regulator-min-microvolt = <1800000>;
> regulator-max-microvolt = <1800000>;
> bias-pull-down;
> };
>
> - l24 {
> + pm8921_l24: l24 {
> regulator-min-microvolt = <750000>;
> regulator-max-microvolt = <1150000>;
> bias-pull-down;
> };
>
> - l25 {
> + pm8921_l25: l25 {
> regulator-always-on;
> regulator-min-microvolt = <1250000>;
> regulator-max-microvolt = <1250000>;
> bias-pull-down;
> };
>
> - l27 {
> + pm8921_l27: l27 {
> regulator-min-microvolt = <1100000>;
> regulator-max-microvolt = <1100000>;
> };
>
> - l28 {
> + pm8921_l28: l28 {
> regulator-min-microvolt = <1050000>;
> regulator-max-microvolt = <1050000>;
> bias-pull-down;
> };
>
> - l29 {
> + pm8921_l29: l29 {
> regulator-min-microvolt = <2000000>;
> regulator-max-microvolt = <2000000>;
> bias-pull-down;
> };
>
> /* Low Voltage Switch */
> - lvs1 {
> + pm8921_lvs1: lvs1 {
> bias-pull-down;
> };
>
> - lvs2 {
> + pm8921_lvs2: lvs2 {
> bias-pull-down;
> };
>
> - lvs3 {
> + pm8921_lvs3: lvs3 {
> bias-pull-down;
> };
>
> - lvs4 {
> + pm8921_lvs4: lvs4 {
> bias-pull-down;
> };
>
> - lvs5 {
> + pm8921_lvs5: lvs5 {
> bias-pull-down;
> };
>
> - lvs6 {
> + pm8921_lvs6: lvs6 {
> bias-pull-down;
> };
>
> - lvs7 {
> + pm8921_lvs7: lvs7 {
> bias-pull-down;
> };
>
> - usb-switch {};
> + pm8921_usb_switch: usb-switch {};
>
> - hdmi-switch {};
> + pm8921_hdmi_switch: hdmi-switch {
> + bias-pull-down;
> + };
>
> - ncp {
> + pm8921_ncp: ncp {
> regulator-min-microvolt = <1800000>;
> regulator-max-microvolt = <1800000>;
> qcom,switch-mode-frequency = <1600000>;
> diff --git a/arch/arm/boot/dts/qcom/qcom-apq8064.dtsi b/arch/arm/boot/dts/qcom/qcom-apq8064.dtsi
> index 2a5a3b2fb8e9..36c68ee5be65 100644
> --- a/arch/arm/boot/dts/qcom/qcom-apq8064.dtsi
> +++ b/arch/arm/boot/dts/qcom/qcom-apq8064.dtsi
> @@ -795,60 +795,6 @@ rpmcc: clock-controller {
> clocks = <&pxo_board>, <&cxo_board>;
> clock-names = "pxo", "cxo";
> };
> -
> - regulators {
> - compatible = "qcom,rpm-pm8921-regulators";
> -
> - pm8921_s1: s1 {};
> - pm8921_s2: s2 {};
> - pm8921_s3: s3 {};
> - pm8921_s4: s4 {};
> - pm8921_s7: s7 {};
> - pm8921_s8: s8 {};
> -
> - pm8921_l1: l1 {};
> - pm8921_l2: l2 {};
> - pm8921_l3: l3 {};
> - pm8921_l4: l4 {};
> - pm8921_l5: l5 {};
> - pm8921_l6: l6 {};
> - pm8921_l7: l7 {};
> - pm8921_l8: l8 {};
> - pm8921_l9: l9 {};
> - pm8921_l10: l10 {};
> - pm8921_l11: l11 {};
> - pm8921_l12: l12 {};
> - pm8921_l14: l14 {};
> - pm8921_l15: l15 {};
> - pm8921_l16: l16 {};
> - pm8921_l17: l17 {};
> - pm8921_l18: l18 {};
> - pm8921_l21: l21 {};
> - pm8921_l22: l22 {};
> - pm8921_l23: l23 {};
> - pm8921_l24: l24 {};
> - pm8921_l25: l25 {};
> - pm8921_l26: l26 {};
> - pm8921_l27: l27 {};
> - pm8921_l28: l28 {};
> - pm8921_l29: l29 {};
> -
> - pm8921_lvs1: lvs1 {};
> - pm8921_lvs2: lvs2 {};
> - pm8921_lvs3: lvs3 {};
> - pm8921_lvs4: lvs4 {};
> - pm8921_lvs5: lvs5 {};
> - pm8921_lvs6: lvs6 {};
> - pm8921_lvs7: lvs7 {};
> -
> - pm8921_usb_switch: usb-switch {};
> -
> - pm8921_hdmi_switch: hdmi-switch {
> - bias-pull-down;
> - };
> -
> - pm8921_ncp: ncp {};
> - };
> };
>
> usb1: usb@12500000 {
> @@ -1528,10 +1474,6 @@ riva: riva-pil@3200800 {
>
> memory-region = <&wcnss_mem>;
>
> - vddcx-supply = <&pm8921_s3>;
> - vddmx-supply = <&pm8921_l24>;
> - vddpx-supply = <&pm8921_s4>;
> -
> status = "disabled";
>
> iris {
> @@ -1539,11 +1481,6 @@ iris {
>
> clocks = <&cxo_board>;
> clock-names = "xo";
> -
> - vddxo-supply = <&pm8921_l4>;
> - vddrfa-supply = <&pm8921_s2>;
> - vddpa-supply = <&pm8921_l10>;
> - vdddig-supply = <&pm8921_lvs2>;
> };
>
> smd-edge {
^ permalink raw reply [flat|nested] 29+ messages in thread
* [PATCH 13/15] ARM: dts: qcom: mdm9615: move RPM regulators to board files
2023-06-27 1:24 [PATCH 00/15] ARM: dts: qcom: cleanup PMIC usage Dmitry Baryshkov
` (11 preceding siblings ...)
2023-06-27 1:24 ` [PATCH 12/15] ARM: dts: qcom: apq8064: move RPM regulators " Dmitry Baryshkov
@ 2023-06-27 1:24 ` Dmitry Baryshkov
2023-06-27 11:20 ` Konrad Dybcio
2023-06-27 1:24 ` [PATCH 14/15] ARM: dts: qcom: msm8660: " Dmitry Baryshkov
2023-06-27 1:24 ` [PATCH 15/15] ARM: dts: qcom: msm8960: drop useless rpm regulators node Dmitry Baryshkov
14 siblings, 1 reply; 29+ messages in thread
From: Dmitry Baryshkov @ 2023-06-27 1:24 UTC (permalink / raw)
To: Andy Gross, Bjorn Andersson, Konrad Dybcio, Rob Herring,
Krzysztof Kozlowski
Cc: linux-arm-msm, devicetree
The set of regulators available over the RPM requests is not a property
of the SoC. Move them to board files.
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
.../boot/dts/qcom/qcom-mdm9615-wp8548.dtsi | 136 ++++++++++++++++++
arch/arm/boot/dts/qcom/qcom-mdm9615.dtsi | 134 -----------------
2 files changed, 136 insertions(+), 134 deletions(-)
diff --git a/arch/arm/boot/dts/qcom/qcom-mdm9615-wp8548.dtsi b/arch/arm/boot/dts/qcom/qcom-mdm9615-wp8548.dtsi
index cc264861afe5..1e1c66c7f9d2 100644
--- a/arch/arm/boot/dts/qcom/qcom-mdm9615-wp8548.dtsi
+++ b/arch/arm/boot/dts/qcom/qcom-mdm9615-wp8548.dtsi
@@ -130,6 +130,142 @@ &gsbi5_serial {
pinctrl-names = "default";
};
+&rpm {
+ regulators {
+ compatible = "qcom,rpm-pm8018-regulators";
+
+ vin_lvs1-supply = <&pm8018_s3>;
+
+ vdd_l7-supply = <&pm8018_s4>;
+ vdd_l8-supply = <&pm8018_s3>;
+ vdd_l9_l10_l11_l12-supply = <&pm8018_s5>;
+
+ /* Buck SMPS */
+ pm8018_s1: s1 {
+ regulator-min-microvolt = <500000>;
+ regulator-max-microvolt = <1150000>;
+ qcom,switch-mode-frequency = <1600000>;
+ bias-pull-down;
+ };
+
+ pm8018_s2: s2 {
+ regulator-min-microvolt = <1225000>;
+ regulator-max-microvolt = <1300000>;
+ qcom,switch-mode-frequency = <1600000>;
+ bias-pull-down;
+ };
+
+ pm8018_s3: s3 {
+ regulator-always-on;
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <1800000>;
+ qcom,switch-mode-frequency = <1600000>;
+ bias-pull-down;
+ };
+
+ pm8018_s4: s4 {
+ regulator-min-microvolt = <2100000>;
+ regulator-max-microvolt = <2200000>;
+ qcom,switch-mode-frequency = <1600000>;
+ bias-pull-down;
+ };
+
+ pm8018_s5: s5 {
+ regulator-always-on;
+ regulator-min-microvolt = <1350000>;
+ regulator-max-microvolt = <1350000>;
+ qcom,switch-mode-frequency = <1600000>;
+ bias-pull-down;
+ };
+
+ /* PMOS LDO */
+ pm8018_l2: l2 {
+ regulator-always-on;
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <1800000>;
+ bias-pull-down;
+ };
+
+ pm8018_l3: l3 {
+ regulator-always-on;
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <1800000>;
+ bias-pull-down;
+ };
+
+ pm8018_l4: l4 {
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+ bias-pull-down;
+ };
+
+ pm8018_l5: l5 {
+ regulator-min-microvolt = <2850000>;
+ regulator-max-microvolt = <2850000>;
+ bias-pull-down;
+ };
+
+ pm8018_l6: l6 {
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <2850000>;
+ bias-pull-down;
+ };
+
+ pm8018_l7: l7 {
+ regulator-min-microvolt = <1850000>;
+ regulator-max-microvolt = <1900000>;
+ bias-pull-down;
+ };
+
+ pm8018_l8: l8 {
+ regulator-min-microvolt = <1200000>;
+ regulator-max-microvolt = <1200000>;
+ bias-pull-down;
+ };
+
+ pm8018_l9: l9 {
+ regulator-min-microvolt = <750000>;
+ regulator-max-microvolt = <1150000>;
+ bias-pull-down;
+ };
+
+ pm8018_l10: l10 {
+ regulator-min-microvolt = <1050000>;
+ regulator-max-microvolt = <1050000>;
+ bias-pull-down;
+ };
+
+ pm8018_l11: l11 {
+ regulator-min-microvolt = <1050000>;
+ regulator-max-microvolt = <1050000>;
+ bias-pull-down;
+ };
+
+ pm8018_l12: l12 {
+ regulator-min-microvolt = <1050000>;
+ regulator-max-microvolt = <1050000>;
+ bias-pull-down;
+ };
+
+ pm8018_l13: l13 {
+ regulator-min-microvolt = <1850000>;
+ regulator-max-microvolt = <2950000>;
+ bias-pull-down;
+ };
+
+ pm8018_l14: l14 {
+ regulator-min-microvolt = <2850000>;
+ regulator-max-microvolt = <2850000>;
+ bias-pull-down;
+ };
+
+ /* Low Voltage Switch */
+ pm8018_lvs1: lvs1 {
+ bias-pull-down;
+ };
+ };
+};
+
&sdcc1 {
status = "okay";
};
diff --git a/arch/arm/boot/dts/qcom/qcom-mdm9615.dtsi b/arch/arm/boot/dts/qcom/qcom-mdm9615.dtsi
index ac2327bc4ec5..0a8240f72daa 100644
--- a/arch/arm/boot/dts/qcom/qcom-mdm9615.dtsi
+++ b/arch/arm/boot/dts/qcom/qcom-mdm9615.dtsi
@@ -326,140 +326,6 @@ rpm: rpm@108000 {
<GIC_SPI 21 IRQ_TYPE_EDGE_RISING>,
<GIC_SPI 22 IRQ_TYPE_EDGE_RISING>;
interrupt-names = "ack", "err", "wakeup";
-
- regulators {
- compatible = "qcom,rpm-pm8018-regulators";
-
- vin_lvs1-supply = <&pm8018_s3>;
-
- vdd_l7-supply = <&pm8018_s4>;
- vdd_l8-supply = <&pm8018_s3>;
- vdd_l9_l10_l11_l12-supply = <&pm8018_s5>;
-
- /* Buck SMPS */
- pm8018_s1: s1 {
- regulator-min-microvolt = <500000>;
- regulator-max-microvolt = <1150000>;
- qcom,switch-mode-frequency = <1600000>;
- bias-pull-down;
- };
-
- pm8018_s2: s2 {
- regulator-min-microvolt = <1225000>;
- regulator-max-microvolt = <1300000>;
- qcom,switch-mode-frequency = <1600000>;
- bias-pull-down;
- };
-
- pm8018_s3: s3 {
- regulator-always-on;
- regulator-min-microvolt = <1800000>;
- regulator-max-microvolt = <1800000>;
- qcom,switch-mode-frequency = <1600000>;
- bias-pull-down;
- };
-
- pm8018_s4: s4 {
- regulator-min-microvolt = <2100000>;
- regulator-max-microvolt = <2200000>;
- qcom,switch-mode-frequency = <1600000>;
- bias-pull-down;
- };
-
- pm8018_s5: s5 {
- regulator-always-on;
- regulator-min-microvolt = <1350000>;
- regulator-max-microvolt = <1350000>;
- qcom,switch-mode-frequency = <1600000>;
- bias-pull-down;
- };
-
- /* PMOS LDO */
- pm8018_l2: l2 {
- regulator-always-on;
- regulator-min-microvolt = <1800000>;
- regulator-max-microvolt = <1800000>;
- bias-pull-down;
- };
-
- pm8018_l3: l3 {
- regulator-always-on;
- regulator-min-microvolt = <1800000>;
- regulator-max-microvolt = <1800000>;
- bias-pull-down;
- };
-
- pm8018_l4: l4 {
- regulator-min-microvolt = <3300000>;
- regulator-max-microvolt = <3300000>;
- bias-pull-down;
- };
-
- pm8018_l5: l5 {
- regulator-min-microvolt = <2850000>;
- regulator-max-microvolt = <2850000>;
- bias-pull-down;
- };
-
- pm8018_l6: l6 {
- regulator-min-microvolt = <1800000>;
- regulator-max-microvolt = <2850000>;
- bias-pull-down;
- };
-
- pm8018_l7: l7 {
- regulator-min-microvolt = <1850000>;
- regulator-max-microvolt = <1900000>;
- bias-pull-down;
- };
-
- pm8018_l8: l8 {
- regulator-min-microvolt = <1200000>;
- regulator-max-microvolt = <1200000>;
- bias-pull-down;
- };
-
- pm8018_l9: l9 {
- regulator-min-microvolt = <750000>;
- regulator-max-microvolt = <1150000>;
- bias-pull-down;
- };
-
- pm8018_l10: l10 {
- regulator-min-microvolt = <1050000>;
- regulator-max-microvolt = <1050000>;
- bias-pull-down;
- };
-
- pm8018_l11: l11 {
- regulator-min-microvolt = <1050000>;
- regulator-max-microvolt = <1050000>;
- bias-pull-down;
- };
-
- pm8018_l12: l12 {
- regulator-min-microvolt = <1050000>;
- regulator-max-microvolt = <1050000>;
- bias-pull-down;
- };
-
- pm8018_l13: l13 {
- regulator-min-microvolt = <1850000>;
- regulator-max-microvolt = <2950000>;
- bias-pull-down;
- };
-
- pm8018_l14: l14 {
- regulator-min-microvolt = <2850000>;
- regulator-max-microvolt = <2850000>;
- bias-pull-down;
- };
-
- /* Low Voltage Switch */
- pm8018_lvs1: lvs1 {
- bias-pull-down;
- };
- };
};
};
};
--
2.39.2
^ permalink raw reply related [flat|nested] 29+ messages in thread* Re: [PATCH 13/15] ARM: dts: qcom: mdm9615: move RPM regulators to board files
2023-06-27 1:24 ` [PATCH 13/15] ARM: dts: qcom: mdm9615: " Dmitry Baryshkov
@ 2023-06-27 11:20 ` Konrad Dybcio
0 siblings, 0 replies; 29+ messages in thread
From: Konrad Dybcio @ 2023-06-27 11:20 UTC (permalink / raw)
To: Dmitry Baryshkov, Andy Gross, Bjorn Andersson, Rob Herring,
Krzysztof Kozlowski
Cc: linux-arm-msm, devicetree
On 27.06.2023 03:24, Dmitry Baryshkov wrote:
> The set of regulators available over the RPM requests is not a property
> of the SoC. Move them to board files.
>
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> ---
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Konrad
> .../boot/dts/qcom/qcom-mdm9615-wp8548.dtsi | 136 ++++++++++++++++++
> arch/arm/boot/dts/qcom/qcom-mdm9615.dtsi | 134 -----------------
> 2 files changed, 136 insertions(+), 134 deletions(-)
>
> diff --git a/arch/arm/boot/dts/qcom/qcom-mdm9615-wp8548.dtsi b/arch/arm/boot/dts/qcom/qcom-mdm9615-wp8548.dtsi
> index cc264861afe5..1e1c66c7f9d2 100644
> --- a/arch/arm/boot/dts/qcom/qcom-mdm9615-wp8548.dtsi
> +++ b/arch/arm/boot/dts/qcom/qcom-mdm9615-wp8548.dtsi
> @@ -130,6 +130,142 @@ &gsbi5_serial {
> pinctrl-names = "default";
> };
>
> +&rpm {
> + regulators {
> + compatible = "qcom,rpm-pm8018-regulators";
> +
> + vin_lvs1-supply = <&pm8018_s3>;
> +
> + vdd_l7-supply = <&pm8018_s4>;
> + vdd_l8-supply = <&pm8018_s3>;
> + vdd_l9_l10_l11_l12-supply = <&pm8018_s5>;
> +
> + /* Buck SMPS */
> + pm8018_s1: s1 {
> + regulator-min-microvolt = <500000>;
> + regulator-max-microvolt = <1150000>;
> + qcom,switch-mode-frequency = <1600000>;
> + bias-pull-down;
> + };
> +
> + pm8018_s2: s2 {
> + regulator-min-microvolt = <1225000>;
> + regulator-max-microvolt = <1300000>;
> + qcom,switch-mode-frequency = <1600000>;
> + bias-pull-down;
> + };
> +
> + pm8018_s3: s3 {
> + regulator-always-on;
> + regulator-min-microvolt = <1800000>;
> + regulator-max-microvolt = <1800000>;
> + qcom,switch-mode-frequency = <1600000>;
> + bias-pull-down;
> + };
> +
> + pm8018_s4: s4 {
> + regulator-min-microvolt = <2100000>;
> + regulator-max-microvolt = <2200000>;
> + qcom,switch-mode-frequency = <1600000>;
> + bias-pull-down;
> + };
> +
> + pm8018_s5: s5 {
> + regulator-always-on;
> + regulator-min-microvolt = <1350000>;
> + regulator-max-microvolt = <1350000>;
> + qcom,switch-mode-frequency = <1600000>;
> + bias-pull-down;
> + };
> +
> + /* PMOS LDO */
> + pm8018_l2: l2 {
> + regulator-always-on;
> + regulator-min-microvolt = <1800000>;
> + regulator-max-microvolt = <1800000>;
> + bias-pull-down;
> + };
> +
> + pm8018_l3: l3 {
> + regulator-always-on;
> + regulator-min-microvolt = <1800000>;
> + regulator-max-microvolt = <1800000>;
> + bias-pull-down;
> + };
> +
> + pm8018_l4: l4 {
> + regulator-min-microvolt = <3300000>;
> + regulator-max-microvolt = <3300000>;
> + bias-pull-down;
> + };
> +
> + pm8018_l5: l5 {
> + regulator-min-microvolt = <2850000>;
> + regulator-max-microvolt = <2850000>;
> + bias-pull-down;
> + };
> +
> + pm8018_l6: l6 {
> + regulator-min-microvolt = <1800000>;
> + regulator-max-microvolt = <2850000>;
> + bias-pull-down;
> + };
> +
> + pm8018_l7: l7 {
> + regulator-min-microvolt = <1850000>;
> + regulator-max-microvolt = <1900000>;
> + bias-pull-down;
> + };
> +
> + pm8018_l8: l8 {
> + regulator-min-microvolt = <1200000>;
> + regulator-max-microvolt = <1200000>;
> + bias-pull-down;
> + };
> +
> + pm8018_l9: l9 {
> + regulator-min-microvolt = <750000>;
> + regulator-max-microvolt = <1150000>;
> + bias-pull-down;
> + };
> +
> + pm8018_l10: l10 {
> + regulator-min-microvolt = <1050000>;
> + regulator-max-microvolt = <1050000>;
> + bias-pull-down;
> + };
> +
> + pm8018_l11: l11 {
> + regulator-min-microvolt = <1050000>;
> + regulator-max-microvolt = <1050000>;
> + bias-pull-down;
> + };
> +
> + pm8018_l12: l12 {
> + regulator-min-microvolt = <1050000>;
> + regulator-max-microvolt = <1050000>;
> + bias-pull-down;
> + };
> +
> + pm8018_l13: l13 {
> + regulator-min-microvolt = <1850000>;
> + regulator-max-microvolt = <2950000>;
> + bias-pull-down;
> + };
> +
> + pm8018_l14: l14 {
> + regulator-min-microvolt = <2850000>;
> + regulator-max-microvolt = <2850000>;
> + bias-pull-down;
> + };
> +
> + /* Low Voltage Switch */
> + pm8018_lvs1: lvs1 {
> + bias-pull-down;
> + };
> + };
> +};
> +
> &sdcc1 {
> status = "okay";
> };
> diff --git a/arch/arm/boot/dts/qcom/qcom-mdm9615.dtsi b/arch/arm/boot/dts/qcom/qcom-mdm9615.dtsi
> index ac2327bc4ec5..0a8240f72daa 100644
> --- a/arch/arm/boot/dts/qcom/qcom-mdm9615.dtsi
> +++ b/arch/arm/boot/dts/qcom/qcom-mdm9615.dtsi
> @@ -326,140 +326,6 @@ rpm: rpm@108000 {
> <GIC_SPI 21 IRQ_TYPE_EDGE_RISING>,
> <GIC_SPI 22 IRQ_TYPE_EDGE_RISING>;
> interrupt-names = "ack", "err", "wakeup";
> -
> - regulators {
> - compatible = "qcom,rpm-pm8018-regulators";
> -
> - vin_lvs1-supply = <&pm8018_s3>;
> -
> - vdd_l7-supply = <&pm8018_s4>;
> - vdd_l8-supply = <&pm8018_s3>;
> - vdd_l9_l10_l11_l12-supply = <&pm8018_s5>;
> -
> - /* Buck SMPS */
> - pm8018_s1: s1 {
> - regulator-min-microvolt = <500000>;
> - regulator-max-microvolt = <1150000>;
> - qcom,switch-mode-frequency = <1600000>;
> - bias-pull-down;
> - };
> -
> - pm8018_s2: s2 {
> - regulator-min-microvolt = <1225000>;
> - regulator-max-microvolt = <1300000>;
> - qcom,switch-mode-frequency = <1600000>;
> - bias-pull-down;
> - };
> -
> - pm8018_s3: s3 {
> - regulator-always-on;
> - regulator-min-microvolt = <1800000>;
> - regulator-max-microvolt = <1800000>;
> - qcom,switch-mode-frequency = <1600000>;
> - bias-pull-down;
> - };
> -
> - pm8018_s4: s4 {
> - regulator-min-microvolt = <2100000>;
> - regulator-max-microvolt = <2200000>;
> - qcom,switch-mode-frequency = <1600000>;
> - bias-pull-down;
> - };
> -
> - pm8018_s5: s5 {
> - regulator-always-on;
> - regulator-min-microvolt = <1350000>;
> - regulator-max-microvolt = <1350000>;
> - qcom,switch-mode-frequency = <1600000>;
> - bias-pull-down;
> - };
> -
> - /* PMOS LDO */
> - pm8018_l2: l2 {
> - regulator-always-on;
> - regulator-min-microvolt = <1800000>;
> - regulator-max-microvolt = <1800000>;
> - bias-pull-down;
> - };
> -
> - pm8018_l3: l3 {
> - regulator-always-on;
> - regulator-min-microvolt = <1800000>;
> - regulator-max-microvolt = <1800000>;
> - bias-pull-down;
> - };
> -
> - pm8018_l4: l4 {
> - regulator-min-microvolt = <3300000>;
> - regulator-max-microvolt = <3300000>;
> - bias-pull-down;
> - };
> -
> - pm8018_l5: l5 {
> - regulator-min-microvolt = <2850000>;
> - regulator-max-microvolt = <2850000>;
> - bias-pull-down;
> - };
> -
> - pm8018_l6: l6 {
> - regulator-min-microvolt = <1800000>;
> - regulator-max-microvolt = <2850000>;
> - bias-pull-down;
> - };
> -
> - pm8018_l7: l7 {
> - regulator-min-microvolt = <1850000>;
> - regulator-max-microvolt = <1900000>;
> - bias-pull-down;
> - };
> -
> - pm8018_l8: l8 {
> - regulator-min-microvolt = <1200000>;
> - regulator-max-microvolt = <1200000>;
> - bias-pull-down;
> - };
> -
> - pm8018_l9: l9 {
> - regulator-min-microvolt = <750000>;
> - regulator-max-microvolt = <1150000>;
> - bias-pull-down;
> - };
> -
> - pm8018_l10: l10 {
> - regulator-min-microvolt = <1050000>;
> - regulator-max-microvolt = <1050000>;
> - bias-pull-down;
> - };
> -
> - pm8018_l11: l11 {
> - regulator-min-microvolt = <1050000>;
> - regulator-max-microvolt = <1050000>;
> - bias-pull-down;
> - };
> -
> - pm8018_l12: l12 {
> - regulator-min-microvolt = <1050000>;
> - regulator-max-microvolt = <1050000>;
> - bias-pull-down;
> - };
> -
> - pm8018_l13: l13 {
> - regulator-min-microvolt = <1850000>;
> - regulator-max-microvolt = <2950000>;
> - bias-pull-down;
> - };
> -
> - pm8018_l14: l14 {
> - regulator-min-microvolt = <2850000>;
> - regulator-max-microvolt = <2850000>;
> - bias-pull-down;
> - };
> -
> - /* Low Voltage Switch */
> - pm8018_lvs1: lvs1 {
> - bias-pull-down;
> - };
> - };
> };
> };
> };
^ permalink raw reply [flat|nested] 29+ messages in thread
* [PATCH 14/15] ARM: dts: qcom: msm8660: move RPM regulators to board files
2023-06-27 1:24 [PATCH 00/15] ARM: dts: qcom: cleanup PMIC usage Dmitry Baryshkov
` (12 preceding siblings ...)
2023-06-27 1:24 ` [PATCH 13/15] ARM: dts: qcom: mdm9615: " Dmitry Baryshkov
@ 2023-06-27 1:24 ` Dmitry Baryshkov
2023-06-27 11:21 ` Konrad Dybcio
2023-06-27 1:24 ` [PATCH 15/15] ARM: dts: qcom: msm8960: drop useless rpm regulators node Dmitry Baryshkov
14 siblings, 1 reply; 29+ messages in thread
From: Dmitry Baryshkov @ 2023-06-27 1:24 UTC (permalink / raw)
To: Andy Gross, Bjorn Andersson, Konrad Dybcio, Rob Herring,
Krzysztof Kozlowski
Cc: linux-arm-msm, devicetree
The set of regulators available over the RPM requests is not a property
of the SoC. Move them to board files.
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
.../dts/qcom/qcom-apq8060-dragonboard.dts | 141 ++++++++++++------
arch/arm/boot/dts/qcom/qcom-msm8660-surf.dts | 10 ++
arch/arm/boot/dts/qcom/qcom-msm8660.dtsi | 66 --------
3 files changed, 102 insertions(+), 115 deletions(-)
diff --git a/arch/arm/boot/dts/qcom/qcom-apq8060-dragonboard.dts b/arch/arm/boot/dts/qcom/qcom-apq8060-dragonboard.dts
index 20de516a8deb..8a511f69d800 100644
--- a/arch/arm/boot/dts/qcom/qcom-apq8060-dragonboard.dts
+++ b/arch/arm/boot/dts/qcom/qcom-apq8060-dragonboard.dts
@@ -449,6 +449,8 @@ &rpm {
* that means
*/
regulators-0 {
+ compatible = "qcom,rpm-pm8901-regulators";
+
vdd_l0-supply = <&pm8901_s4>;
vdd_l1-supply = <&vph>;
vdd_l2-supply = <&vph>;
@@ -466,57 +468,63 @@ regulators-0 {
lvs3_in-supply = <&pm8058_s2>;
mvs_in-supply = <&pm8058_s3>;
- l0 {
+ pm8901_l0: l0 {
regulator-min-microvolt = <1200000>;
regulator-max-microvolt = <1200000>;
bias-pull-down;
};
- l1 {
+
+ pm8901_l1: l1 {
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
bias-pull-down;
};
- l2 {
+
+ pm8901_l2: l2 {
/* TMA340 requires strictly 3.3V */
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
bias-pull-down;
};
- l3 {
+
+ pm8901_l3: l3 {
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
bias-pull-down;
};
- l4 {
+
+ pm8901_l4: l4 {
regulator-min-microvolt = <2600000>;
regulator-max-microvolt = <2600000>;
bias-pull-down;
};
- l5 {
+
+ pm8901_l5: l5 {
regulator-min-microvolt = <2850000>;
regulator-max-microvolt = <2850000>;
bias-pull-down;
};
- l6 {
+
+ pm8901_l6: l6 {
regulator-min-microvolt = <2200000>;
regulator-max-microvolt = <2200000>;
bias-pull-down;
};
/* s0 and s1 are SAW regulators controlled over SPM */
- s2 {
+ pm8901_s2: s2 {
regulator-min-microvolt = <1300000>;
regulator-max-microvolt = <1300000>;
qcom,switch-mode-frequency = <1600000>;
bias-pull-down;
};
- s3 {
+ pm8901_s3: s3 {
regulator-min-microvolt = <1100000>;
regulator-max-microvolt = <1100000>;
qcom,switch-mode-frequency = <1600000>;
bias-pull-down;
};
- s4 {
+ pm8901_s4: s4 {
regulator-min-microvolt = <1225000>;
regulator-max-microvolt = <1225000>;
qcom,switch-mode-frequency = <1600000>;
@@ -524,17 +532,22 @@ s4 {
};
/* LVS0 thru 3 and mvs are just switches */
- lvs0 {
+ pm8901_lvs0: lvs0 {
regulator-always-on;
};
- lvs1 { };
- lvs2 { };
- lvs3 { };
- mvs { };
+ pm8901_lvs1: lvs1 { };
+
+ pm8901_lvs2: lvs2 { };
+
+ pm8901_lvs3: lvs3 { };
+
+ pm8901_mvs: mvs { };
};
regulators-1 {
+ compatible = "qcom,rpm-pm8058-regulators";
+
vdd_l0_l1_lvs-supply = <&pm8058_s3>;
vdd_l2_l11_l12-supply = <&vph>;
vdd_l3_l4_l5-supply = <&vph>;
@@ -556,144 +569,169 @@ regulators-1 {
vdd_s4-supply = <&vph>;
vdd_ncp-supply = <&vph>;
- l0 {
+ pm8058_l0: l0 {
regulator-min-microvolt = <1200000>;
regulator-max-microvolt = <1200000>;
bias-pull-down;
};
- l1 {
+
+ pm8058_l1: l1 {
regulator-min-microvolt = <1200000>;
regulator-max-microvolt = <1200000>;
bias-pull-down;
};
- l2 {
+
+ pm8058_l2: l2 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <2600000>;
bias-pull-down;
};
- l3 {
+
+ pm8058_l3: l3 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
bias-pull-down;
};
- l4 {
+
+ pm8058_l4: l4 {
regulator-min-microvolt = <2850000>;
regulator-max-microvolt = <2850000>;
bias-pull-down;
};
- l5 {
+
+ pm8058_l5: l5 {
regulator-min-microvolt = <2850000>;
regulator-max-microvolt = <2850000>;
bias-pull-down;
};
- l6 {
+
+ pm8058_l6: l6 {
regulator-min-microvolt = <3000000>;
regulator-max-microvolt = <3600000>;
bias-pull-down;
};
- l7 {
+
+ pm8058_l7: l7 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
bias-pull-down;
};
- l8 {
+
+ pm8058_l8: l8 {
regulator-min-microvolt = <2900000>;
regulator-max-microvolt = <3050000>;
bias-pull-down;
};
- l9 {
+
+ pm8058_l9: l9 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
bias-pull-down;
};
- l10 {
+
+ pm8058_l10: l10 {
regulator-min-microvolt = <2600000>;
regulator-max-microvolt = <2600000>;
bias-pull-down;
};
- l11 {
+
+ pm8058_l11: l11 {
regulator-min-microvolt = <1500000>;
regulator-max-microvolt = <1500000>;
bias-pull-down;
};
- l12 {
+
+ pm8058_l12: l12 {
regulator-min-microvolt = <2900000>;
regulator-max-microvolt = <2900000>;
bias-pull-down;
};
- l13 {
+
+ pm8058_l13: l13 {
regulator-min-microvolt = <2050000>;
regulator-max-microvolt = <2050000>;
bias-pull-down;
};
- l14 {
+
+ pm8058_l14: l14 {
regulator-min-microvolt = <2850000>;
regulator-max-microvolt = <2850000>;
};
- l15 {
+
+ pm8058_l15: l15 {
regulator-min-microvolt = <2850000>;
regulator-max-microvolt = <2850000>;
bias-pull-down;
};
- l16 {
+
+ pm8058_l16: l16 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
bias-pull-down;
regulator-always-on;
};
- l17 {
+
+ pm8058_l17: l17 {
// 1.5V according to schematic
regulator-min-microvolt = <2600000>;
regulator-max-microvolt = <2600000>;
bias-pull-down;
};
- l18 {
+
+ pm8058_l18: l18 {
regulator-min-microvolt = <2200000>;
regulator-max-microvolt = <2200000>;
bias-pull-down;
};
- l19 {
+
+ pm8058_l19: l19 {
regulator-min-microvolt = <2500000>;
regulator-max-microvolt = <2500000>;
bias-pull-down;
};
- l20 {
+
+ pm8058_l20: l20 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
bias-pull-down;
};
- l21 {
+
+ pm8058_l21: l21 {
// 1.1 V according to schematic
regulator-min-microvolt = <1200000>;
regulator-max-microvolt = <1200000>;
bias-pull-down;
regulator-always-on;
};
- l22 {
+
+ pm8058_l22: l22 {
// 1.2 V according to schematic
regulator-min-microvolt = <1150000>;
regulator-max-microvolt = <1150000>;
bias-pull-down;
};
- l23 {
+
+ pm8058_l23: l23 {
// Unused
regulator-min-microvolt = <1200000>;
regulator-max-microvolt = <1200000>;
bias-pull-down;
};
- l24 {
+
+ pm8058_l24: l24 {
// Unused
regulator-min-microvolt = <1200000>;
regulator-max-microvolt = <1200000>;
bias-pull-down;
};
- l25 {
+
+ pm8058_l25: l25 {
regulator-min-microvolt = <1200000>;
regulator-max-microvolt = <1200000>;
bias-pull-down;
};
- s0 {
+ pm8058_s0: s0 {
// regulator-min-microvolt = <500000>;
// regulator-max-microvolt = <1325000>;
regulator-min-microvolt = <1100000>;
@@ -701,7 +739,8 @@ s0 {
qcom,switch-mode-frequency = <1600000>;
bias-pull-down;
};
- s1 {
+
+ pm8058_s1: s1 {
// regulator-min-microvolt = <500000>;
// regulator-max-microvolt = <1250000>;
regulator-min-microvolt = <1100000>;
@@ -709,21 +748,24 @@ s1 {
qcom,switch-mode-frequency = <1600000>;
bias-pull-down;
};
- s2 {
+
+ pm8058_s2: s2 {
// 1.3 V according to schematic
regulator-min-microvolt = <1200000>;
regulator-max-microvolt = <1400000>;
qcom,switch-mode-frequency = <1600000>;
bias-pull-down;
};
- s3 {
+
+ pm8058_s3: s3 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
qcom,switch-mode-frequency = <1600000>;
regulator-always-on;
bias-pull-down;
};
- s4 {
+
+ pm8058_s4: s4 {
regulator-min-microvolt = <2200000>;
regulator-max-microvolt = <2200000>;
qcom,switch-mode-frequency = <1600000>;
@@ -732,14 +774,15 @@ s4 {
};
/* LVS0 and LVS1 are just switches */
- lvs0 {
+ pm8058_lvs0: lvs0 {
bias-pull-down;
};
- lvs1 {
+
+ pm8058_lvs1: lvs1 {
bias-pull-down;
};
- ncp {
+ pm8058_ncp: ncp {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
qcom,switch-mode-frequency = <1600000>;
diff --git a/arch/arm/boot/dts/qcom/qcom-msm8660-surf.dts b/arch/arm/boot/dts/qcom/qcom-msm8660-surf.dts
index 04dca0c93971..43e646ded7bd 100644
--- a/arch/arm/boot/dts/qcom/qcom-msm8660-surf.dts
+++ b/arch/arm/boot/dts/qcom/qcom-msm8660-surf.dts
@@ -61,6 +61,16 @@ MATRIX_KEY(5, 4, KEY_MENU)
keypad,num-columns = <5>;
};
+&rpm {
+ regulators-0 {
+ compatible = "qcom,rpm-pm8901-regulators";
+ };
+
+ regulators-1 {
+ compatible = "qcom,rpm-pm8058-regulators";
+ };
+};
+
/* eMMC */
&sdcc1 {
vmmc-supply = <&vsdcc_fixed>;
diff --git a/arch/arm/boot/dts/qcom/qcom-msm8660.dtsi b/arch/arm/boot/dts/qcom/qcom-msm8660.dtsi
index b8094b7c09fc..c2cb3abd5177 100644
--- a/arch/arm/boot/dts/qcom/qcom-msm8660.dtsi
+++ b/arch/arm/boot/dts/qcom/qcom-msm8660.dtsi
@@ -352,72 +352,6 @@ rpmcc: clock-controller {
clocks = <&pxo_board>;
clock-names = "pxo";
};
-
- regulators-0 {
- compatible = "qcom,rpm-pm8901-regulators";
-
- pm8901_l0: l0 {};
- pm8901_l1: l1 {};
- pm8901_l2: l2 {};
- pm8901_l3: l3 {};
- pm8901_l4: l4 {};
- pm8901_l5: l5 {};
- pm8901_l6: l6 {};
-
- /* S0 and S1 Handled as SAW regulators by SPM */
- pm8901_s2: s2 {};
- pm8901_s3: s3 {};
- pm8901_s4: s4 {};
-
- pm8901_lvs0: lvs0 {};
- pm8901_lvs1: lvs1 {};
- pm8901_lvs2: lvs2 {};
- pm8901_lvs3: lvs3 {};
-
- pm8901_mvs: mvs {};
- };
-
- regulators-1 {
- compatible = "qcom,rpm-pm8058-regulators";
-
- pm8058_l0: l0 {};
- pm8058_l1: l1 {};
- pm8058_l2: l2 {};
- pm8058_l3: l3 {};
- pm8058_l4: l4 {};
- pm8058_l5: l5 {};
- pm8058_l6: l6 {};
- pm8058_l7: l7 {};
- pm8058_l8: l8 {};
- pm8058_l9: l9 {};
- pm8058_l10: l10 {};
- pm8058_l11: l11 {};
- pm8058_l12: l12 {};
- pm8058_l13: l13 {};
- pm8058_l14: l14 {};
- pm8058_l15: l15 {};
- pm8058_l16: l16 {};
- pm8058_l17: l17 {};
- pm8058_l18: l18 {};
- pm8058_l19: l19 {};
- pm8058_l20: l20 {};
- pm8058_l21: l21 {};
- pm8058_l22: l22 {};
- pm8058_l23: l23 {};
- pm8058_l24: l24 {};
- pm8058_l25: l25 {};
-
- pm8058_s0: s0 {};
- pm8058_s1: s1 {};
- pm8058_s2: s2 {};
- pm8058_s3: s3 {};
- pm8058_s4: s4 {};
-
- pm8058_lvs0: lvs0 {};
- pm8058_lvs1: lvs1 {};
-
- pm8058_ncp: ncp {};
- };
};
amba {
--
2.39.2
^ permalink raw reply related [flat|nested] 29+ messages in thread* Re: [PATCH 14/15] ARM: dts: qcom: msm8660: move RPM regulators to board files
2023-06-27 1:24 ` [PATCH 14/15] ARM: dts: qcom: msm8660: " Dmitry Baryshkov
@ 2023-06-27 11:21 ` Konrad Dybcio
0 siblings, 0 replies; 29+ messages in thread
From: Konrad Dybcio @ 2023-06-27 11:21 UTC (permalink / raw)
To: Dmitry Baryshkov, Andy Gross, Bjorn Andersson, Rob Herring,
Krzysztof Kozlowski
Cc: linux-arm-msm, devicetree
On 27.06.2023 03:24, Dmitry Baryshkov wrote:
> The set of regulators available over the RPM requests is not a property
> of the SoC. Move them to board files.
>
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> ---
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Konrad
> .../dts/qcom/qcom-apq8060-dragonboard.dts | 141 ++++++++++++------
> arch/arm/boot/dts/qcom/qcom-msm8660-surf.dts | 10 ++
> arch/arm/boot/dts/qcom/qcom-msm8660.dtsi | 66 --------
> 3 files changed, 102 insertions(+), 115 deletions(-)
>
> diff --git a/arch/arm/boot/dts/qcom/qcom-apq8060-dragonboard.dts b/arch/arm/boot/dts/qcom/qcom-apq8060-dragonboard.dts
> index 20de516a8deb..8a511f69d800 100644
> --- a/arch/arm/boot/dts/qcom/qcom-apq8060-dragonboard.dts
> +++ b/arch/arm/boot/dts/qcom/qcom-apq8060-dragonboard.dts
> @@ -449,6 +449,8 @@ &rpm {
> * that means
> */
> regulators-0 {
> + compatible = "qcom,rpm-pm8901-regulators";
> +
> vdd_l0-supply = <&pm8901_s4>;
> vdd_l1-supply = <&vph>;
> vdd_l2-supply = <&vph>;
> @@ -466,57 +468,63 @@ regulators-0 {
> lvs3_in-supply = <&pm8058_s2>;
> mvs_in-supply = <&pm8058_s3>;
>
> - l0 {
> + pm8901_l0: l0 {
> regulator-min-microvolt = <1200000>;
> regulator-max-microvolt = <1200000>;
> bias-pull-down;
> };
> - l1 {
> +
> + pm8901_l1: l1 {
> regulator-min-microvolt = <3300000>;
> regulator-max-microvolt = <3300000>;
> bias-pull-down;
> };
> - l2 {
> +
> + pm8901_l2: l2 {
> /* TMA340 requires strictly 3.3V */
> regulator-min-microvolt = <3300000>;
> regulator-max-microvolt = <3300000>;
> bias-pull-down;
> };
> - l3 {
> +
> + pm8901_l3: l3 {
> regulator-min-microvolt = <3300000>;
> regulator-max-microvolt = <3300000>;
> bias-pull-down;
> };
> - l4 {
> +
> + pm8901_l4: l4 {
> regulator-min-microvolt = <2600000>;
> regulator-max-microvolt = <2600000>;
> bias-pull-down;
> };
> - l5 {
> +
> + pm8901_l5: l5 {
> regulator-min-microvolt = <2850000>;
> regulator-max-microvolt = <2850000>;
> bias-pull-down;
> };
> - l6 {
> +
> + pm8901_l6: l6 {
> regulator-min-microvolt = <2200000>;
> regulator-max-microvolt = <2200000>;
> bias-pull-down;
> };
>
> /* s0 and s1 are SAW regulators controlled over SPM */
> - s2 {
> + pm8901_s2: s2 {
> regulator-min-microvolt = <1300000>;
> regulator-max-microvolt = <1300000>;
> qcom,switch-mode-frequency = <1600000>;
> bias-pull-down;
> };
> - s3 {
> + pm8901_s3: s3 {
> regulator-min-microvolt = <1100000>;
> regulator-max-microvolt = <1100000>;
> qcom,switch-mode-frequency = <1600000>;
> bias-pull-down;
> };
> - s4 {
> + pm8901_s4: s4 {
> regulator-min-microvolt = <1225000>;
> regulator-max-microvolt = <1225000>;
> qcom,switch-mode-frequency = <1600000>;
> @@ -524,17 +532,22 @@ s4 {
> };
>
> /* LVS0 thru 3 and mvs are just switches */
> - lvs0 {
> + pm8901_lvs0: lvs0 {
> regulator-always-on;
> };
> - lvs1 { };
> - lvs2 { };
> - lvs3 { };
> - mvs { };
>
> + pm8901_lvs1: lvs1 { };
> +
> + pm8901_lvs2: lvs2 { };
> +
> + pm8901_lvs3: lvs3 { };
> +
> + pm8901_mvs: mvs { };
> };
>
> regulators-1 {
> + compatible = "qcom,rpm-pm8058-regulators";
> +
> vdd_l0_l1_lvs-supply = <&pm8058_s3>;
> vdd_l2_l11_l12-supply = <&vph>;
> vdd_l3_l4_l5-supply = <&vph>;
> @@ -556,144 +569,169 @@ regulators-1 {
> vdd_s4-supply = <&vph>;
> vdd_ncp-supply = <&vph>;
>
> - l0 {
> + pm8058_l0: l0 {
> regulator-min-microvolt = <1200000>;
> regulator-max-microvolt = <1200000>;
> bias-pull-down;
> };
> - l1 {
> +
> + pm8058_l1: l1 {
> regulator-min-microvolt = <1200000>;
> regulator-max-microvolt = <1200000>;
> bias-pull-down;
> };
> - l2 {
> +
> + pm8058_l2: l2 {
> regulator-min-microvolt = <1800000>;
> regulator-max-microvolt = <2600000>;
> bias-pull-down;
> };
> - l3 {
> +
> + pm8058_l3: l3 {
> regulator-min-microvolt = <1800000>;
> regulator-max-microvolt = <1800000>;
> bias-pull-down;
> };
> - l4 {
> +
> + pm8058_l4: l4 {
> regulator-min-microvolt = <2850000>;
> regulator-max-microvolt = <2850000>;
> bias-pull-down;
> };
> - l5 {
> +
> + pm8058_l5: l5 {
> regulator-min-microvolt = <2850000>;
> regulator-max-microvolt = <2850000>;
> bias-pull-down;
> };
> - l6 {
> +
> + pm8058_l6: l6 {
> regulator-min-microvolt = <3000000>;
> regulator-max-microvolt = <3600000>;
> bias-pull-down;
> };
> - l7 {
> +
> + pm8058_l7: l7 {
> regulator-min-microvolt = <1800000>;
> regulator-max-microvolt = <1800000>;
> bias-pull-down;
> };
> - l8 {
> +
> + pm8058_l8: l8 {
> regulator-min-microvolt = <2900000>;
> regulator-max-microvolt = <3050000>;
> bias-pull-down;
> };
> - l9 {
> +
> + pm8058_l9: l9 {
> regulator-min-microvolt = <1800000>;
> regulator-max-microvolt = <1800000>;
> bias-pull-down;
> };
> - l10 {
> +
> + pm8058_l10: l10 {
> regulator-min-microvolt = <2600000>;
> regulator-max-microvolt = <2600000>;
> bias-pull-down;
> };
> - l11 {
> +
> + pm8058_l11: l11 {
> regulator-min-microvolt = <1500000>;
> regulator-max-microvolt = <1500000>;
> bias-pull-down;
> };
> - l12 {
> +
> + pm8058_l12: l12 {
> regulator-min-microvolt = <2900000>;
> regulator-max-microvolt = <2900000>;
> bias-pull-down;
> };
> - l13 {
> +
> + pm8058_l13: l13 {
> regulator-min-microvolt = <2050000>;
> regulator-max-microvolt = <2050000>;
> bias-pull-down;
> };
> - l14 {
> +
> + pm8058_l14: l14 {
> regulator-min-microvolt = <2850000>;
> regulator-max-microvolt = <2850000>;
> };
> - l15 {
> +
> + pm8058_l15: l15 {
> regulator-min-microvolt = <2850000>;
> regulator-max-microvolt = <2850000>;
> bias-pull-down;
> };
> - l16 {
> +
> + pm8058_l16: l16 {
> regulator-min-microvolt = <1800000>;
> regulator-max-microvolt = <1800000>;
> bias-pull-down;
> regulator-always-on;
> };
> - l17 {
> +
> + pm8058_l17: l17 {
> // 1.5V according to schematic
> regulator-min-microvolt = <2600000>;
> regulator-max-microvolt = <2600000>;
> bias-pull-down;
> };
> - l18 {
> +
> + pm8058_l18: l18 {
> regulator-min-microvolt = <2200000>;
> regulator-max-microvolt = <2200000>;
> bias-pull-down;
> };
> - l19 {
> +
> + pm8058_l19: l19 {
> regulator-min-microvolt = <2500000>;
> regulator-max-microvolt = <2500000>;
> bias-pull-down;
> };
> - l20 {
> +
> + pm8058_l20: l20 {
> regulator-min-microvolt = <1800000>;
> regulator-max-microvolt = <1800000>;
> bias-pull-down;
> };
> - l21 {
> +
> + pm8058_l21: l21 {
> // 1.1 V according to schematic
> regulator-min-microvolt = <1200000>;
> regulator-max-microvolt = <1200000>;
> bias-pull-down;
> regulator-always-on;
> };
> - l22 {
> +
> + pm8058_l22: l22 {
> // 1.2 V according to schematic
> regulator-min-microvolt = <1150000>;
> regulator-max-microvolt = <1150000>;
> bias-pull-down;
> };
> - l23 {
> +
> + pm8058_l23: l23 {
> // Unused
> regulator-min-microvolt = <1200000>;
> regulator-max-microvolt = <1200000>;
> bias-pull-down;
> };
> - l24 {
> +
> + pm8058_l24: l24 {
> // Unused
> regulator-min-microvolt = <1200000>;
> regulator-max-microvolt = <1200000>;
> bias-pull-down;
> };
> - l25 {
> +
> + pm8058_l25: l25 {
> regulator-min-microvolt = <1200000>;
> regulator-max-microvolt = <1200000>;
> bias-pull-down;
> };
>
> - s0 {
> + pm8058_s0: s0 {
> // regulator-min-microvolt = <500000>;
> // regulator-max-microvolt = <1325000>;
> regulator-min-microvolt = <1100000>;
> @@ -701,7 +739,8 @@ s0 {
> qcom,switch-mode-frequency = <1600000>;
> bias-pull-down;
> };
> - s1 {
> +
> + pm8058_s1: s1 {
> // regulator-min-microvolt = <500000>;
> // regulator-max-microvolt = <1250000>;
> regulator-min-microvolt = <1100000>;
> @@ -709,21 +748,24 @@ s1 {
> qcom,switch-mode-frequency = <1600000>;
> bias-pull-down;
> };
> - s2 {
> +
> + pm8058_s2: s2 {
> // 1.3 V according to schematic
> regulator-min-microvolt = <1200000>;
> regulator-max-microvolt = <1400000>;
> qcom,switch-mode-frequency = <1600000>;
> bias-pull-down;
> };
> - s3 {
> +
> + pm8058_s3: s3 {
> regulator-min-microvolt = <1800000>;
> regulator-max-microvolt = <1800000>;
> qcom,switch-mode-frequency = <1600000>;
> regulator-always-on;
> bias-pull-down;
> };
> - s4 {
> +
> + pm8058_s4: s4 {
> regulator-min-microvolt = <2200000>;
> regulator-max-microvolt = <2200000>;
> qcom,switch-mode-frequency = <1600000>;
> @@ -732,14 +774,15 @@ s4 {
> };
>
> /* LVS0 and LVS1 are just switches */
> - lvs0 {
> + pm8058_lvs0: lvs0 {
> bias-pull-down;
> };
> - lvs1 {
> +
> + pm8058_lvs1: lvs1 {
> bias-pull-down;
> };
>
> - ncp {
> + pm8058_ncp: ncp {
> regulator-min-microvolt = <1800000>;
> regulator-max-microvolt = <1800000>;
> qcom,switch-mode-frequency = <1600000>;
> diff --git a/arch/arm/boot/dts/qcom/qcom-msm8660-surf.dts b/arch/arm/boot/dts/qcom/qcom-msm8660-surf.dts
> index 04dca0c93971..43e646ded7bd 100644
> --- a/arch/arm/boot/dts/qcom/qcom-msm8660-surf.dts
> +++ b/arch/arm/boot/dts/qcom/qcom-msm8660-surf.dts
> @@ -61,6 +61,16 @@ MATRIX_KEY(5, 4, KEY_MENU)
> keypad,num-columns = <5>;
> };
>
> +&rpm {
> + regulators-0 {
> + compatible = "qcom,rpm-pm8901-regulators";
> + };
> +
> + regulators-1 {
> + compatible = "qcom,rpm-pm8058-regulators";
> + };
> +};
> +
> /* eMMC */
> &sdcc1 {
> vmmc-supply = <&vsdcc_fixed>;
> diff --git a/arch/arm/boot/dts/qcom/qcom-msm8660.dtsi b/arch/arm/boot/dts/qcom/qcom-msm8660.dtsi
> index b8094b7c09fc..c2cb3abd5177 100644
> --- a/arch/arm/boot/dts/qcom/qcom-msm8660.dtsi
> +++ b/arch/arm/boot/dts/qcom/qcom-msm8660.dtsi
> @@ -352,72 +352,6 @@ rpmcc: clock-controller {
> clocks = <&pxo_board>;
> clock-names = "pxo";
> };
> -
> - regulators-0 {
> - compatible = "qcom,rpm-pm8901-regulators";
> -
> - pm8901_l0: l0 {};
> - pm8901_l1: l1 {};
> - pm8901_l2: l2 {};
> - pm8901_l3: l3 {};
> - pm8901_l4: l4 {};
> - pm8901_l5: l5 {};
> - pm8901_l6: l6 {};
> -
> - /* S0 and S1 Handled as SAW regulators by SPM */
> - pm8901_s2: s2 {};
> - pm8901_s3: s3 {};
> - pm8901_s4: s4 {};
> -
> - pm8901_lvs0: lvs0 {};
> - pm8901_lvs1: lvs1 {};
> - pm8901_lvs2: lvs2 {};
> - pm8901_lvs3: lvs3 {};
> -
> - pm8901_mvs: mvs {};
> - };
> -
> - regulators-1 {
> - compatible = "qcom,rpm-pm8058-regulators";
> -
> - pm8058_l0: l0 {};
> - pm8058_l1: l1 {};
> - pm8058_l2: l2 {};
> - pm8058_l3: l3 {};
> - pm8058_l4: l4 {};
> - pm8058_l5: l5 {};
> - pm8058_l6: l6 {};
> - pm8058_l7: l7 {};
> - pm8058_l8: l8 {};
> - pm8058_l9: l9 {};
> - pm8058_l10: l10 {};
> - pm8058_l11: l11 {};
> - pm8058_l12: l12 {};
> - pm8058_l13: l13 {};
> - pm8058_l14: l14 {};
> - pm8058_l15: l15 {};
> - pm8058_l16: l16 {};
> - pm8058_l17: l17 {};
> - pm8058_l18: l18 {};
> - pm8058_l19: l19 {};
> - pm8058_l20: l20 {};
> - pm8058_l21: l21 {};
> - pm8058_l22: l22 {};
> - pm8058_l23: l23 {};
> - pm8058_l24: l24 {};
> - pm8058_l25: l25 {};
> -
> - pm8058_s0: s0 {};
> - pm8058_s1: s1 {};
> - pm8058_s2: s2 {};
> - pm8058_s3: s3 {};
> - pm8058_s4: s4 {};
> -
> - pm8058_lvs0: lvs0 {};
> - pm8058_lvs1: lvs1 {};
> -
> - pm8058_ncp: ncp {};
> - };
> };
>
> amba {
^ permalink raw reply [flat|nested] 29+ messages in thread
* [PATCH 15/15] ARM: dts: qcom: msm8960: drop useless rpm regulators node
2023-06-27 1:24 [PATCH 00/15] ARM: dts: qcom: cleanup PMIC usage Dmitry Baryshkov
` (13 preceding siblings ...)
2023-06-27 1:24 ` [PATCH 14/15] ARM: dts: qcom: msm8660: " Dmitry Baryshkov
@ 2023-06-27 1:24 ` Dmitry Baryshkov
2023-06-27 11:22 ` Konrad Dybcio
14 siblings, 1 reply; 29+ messages in thread
From: Dmitry Baryshkov @ 2023-06-27 1:24 UTC (permalink / raw)
To: Andy Gross, Bjorn Andersson, Konrad Dybcio, Rob Herring,
Krzysztof Kozlowski
Cc: linux-arm-msm, devicetree
The set of regulators available over the RPM requests is not a property
of the SoC. The only msm8960 board file (qcom-msm8960-cdp) also defines
this node together with the compatible string. Drop the useless device
node.
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
arch/arm/boot/dts/qcom/qcom-msm8960.dtsi | 4 ----
1 file changed, 4 deletions(-)
diff --git a/arch/arm/boot/dts/qcom/qcom-msm8960.dtsi b/arch/arm/boot/dts/qcom/qcom-msm8960.dtsi
index 8157236f249d..b25cd58003e2 100644
--- a/arch/arm/boot/dts/qcom/qcom-msm8960.dtsi
+++ b/arch/arm/boot/dts/qcom/qcom-msm8960.dtsi
@@ -200,10 +200,6 @@ rpm: rpm@108000 {
<GIC_SPI 21 IRQ_TYPE_EDGE_RISING>,
<GIC_SPI 22 IRQ_TYPE_EDGE_RISING>;
interrupt-names = "ack", "err", "wakeup";
-
- regulators {
- compatible = "qcom,rpm-pm8921-regulators";
- };
};
acc0: clock-controller@2088000 {
--
2.39.2
^ permalink raw reply related [flat|nested] 29+ messages in thread* Re: [PATCH 15/15] ARM: dts: qcom: msm8960: drop useless rpm regulators node
2023-06-27 1:24 ` [PATCH 15/15] ARM: dts: qcom: msm8960: drop useless rpm regulators node Dmitry Baryshkov
@ 2023-06-27 11:22 ` Konrad Dybcio
0 siblings, 0 replies; 29+ messages in thread
From: Konrad Dybcio @ 2023-06-27 11:22 UTC (permalink / raw)
To: Dmitry Baryshkov, Andy Gross, Bjorn Andersson, Rob Herring,
Krzysztof Kozlowski
Cc: linux-arm-msm, devicetree
On 27.06.2023 03:24, Dmitry Baryshkov wrote:
> The set of regulators available over the RPM requests is not a property
> of the SoC. The only msm8960 board file (qcom-msm8960-cdp) also defines
> this node together with the compatible string. Drop the useless device
> node.
>
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> ---
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Konrad
> arch/arm/boot/dts/qcom/qcom-msm8960.dtsi | 4 ----
> 1 file changed, 4 deletions(-)
>
> diff --git a/arch/arm/boot/dts/qcom/qcom-msm8960.dtsi b/arch/arm/boot/dts/qcom/qcom-msm8960.dtsi
> index 8157236f249d..b25cd58003e2 100644
> --- a/arch/arm/boot/dts/qcom/qcom-msm8960.dtsi
> +++ b/arch/arm/boot/dts/qcom/qcom-msm8960.dtsi
> @@ -200,10 +200,6 @@ rpm: rpm@108000 {
> <GIC_SPI 21 IRQ_TYPE_EDGE_RISING>,
> <GIC_SPI 22 IRQ_TYPE_EDGE_RISING>;
> interrupt-names = "ack", "err", "wakeup";
> -
> - regulators {
> - compatible = "qcom,rpm-pm8921-regulators";
> - };
> };
>
> acc0: clock-controller@2088000 {
^ permalink raw reply [flat|nested] 29+ messages in thread