Employ PMIC_SID/_LABEL and switch sc8280xp-pmics to use pm8350c.dtsi in
order to reduce duplication and possible discrepancies.
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@xxxxxxxxxx>
---
arch/arm64/boot/dts/qcom/sc8280xp-crd.dts | 4 +--
.../qcom/sc8280xp-lenovo-thinkpad-x13s.dts | 4 +--
arch/arm64/boot/dts/qcom/sc8280xp-pmics.dtsi | 32 +++----------------
3 files changed, 8 insertions(+), 32 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts b/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts
index d7b537284990..18f821d99434 100644
--- a/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts
+++ b/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts
@@ -24,7 +24,7 @@ aliases {
backlight: backlight {
compatible = "pwm-backlight";
- pwms = <&pmc8280c_lpg 3 1000000>;
+ pwms = <&pmc8280c_pwm 3 1000000>;
enable-gpios = <&pmc8280_1_gpios 8 GPIO_ACTIVE_HIGH>;
power-supply = <&vreg_edp_bl>;
@@ -555,7 +555,7 @@ &pcie4_phy {
status = "okay";
};
-&pmc8280c_lpg {
+&pmc8280c_pwm {
status = "okay";
};
diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
index 590400985055..c74d32f7931e 100644
--- a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
+++ b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
@@ -54,7 +54,7 @@ wcd938x: audio-codec {
backlight: backlight {
compatible = "pwm-backlight";
- pwms = <&pmc8280c_lpg 3 1000000>;
+ pwms = <&pmc8280c_pwm 3 1000000>;
enable-gpios = <&pmc8280_1_gpios 8 GPIO_ACTIVE_HIGH>;
power-supply = <&vreg_edp_bl>;
@@ -725,7 +725,7 @@ &pcie4_phy {
status = "okay";
};
-&pmc8280c_lpg {
+&pmc8280c_pwm {
status = "okay";
};
diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-pmics.dtsi b/arch/arm64/boot/dts/qcom/sc8280xp-pmics.dtsi
index 69f79ed87f62..3d2914d13fd2 100644
--- a/arch/arm64/boot/dts/qcom/sc8280xp-pmics.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc8280xp-pmics.dtsi
@@ -16,40 +16,16 @@
#define PMIC_NODE pmc82801
#include "pm8350.dtsi"
+#define PMIC_SID 2
+#define PMIC_LABEL pmc8280c
+#include "pm8350c.dtsi"
+
#define PMIC_SID 3
#define PMIC_LABEL pmc8280_2
#define PMIC_NODE pmc82802
#include "pm8350.dtsi"
&spmi_bus {
- pmc8280c: pmic@2 {
- compatible = "qcom,pm8350c", "qcom,spmi-pmic";
- reg = <0x2 SPMI_USID>;
- #address-cells = <1>;
- #size-cells = <0>;
-
- pmc8280c_gpios: gpio@8800 {
- compatible = "qcom,pm8350c-gpio", "qcom,spmi-gpio";
- reg = <0x8800>;
- gpio-controller;
- gpio-ranges = <&pmc8280c_gpios 0 0 9>;
- #gpio-cells = <2>;
- interrupt-controller;
- #interrupt-cells = <2>;
- };
-
- pmc8280c_lpg: pwm {
- compatible = "qcom,pm8350c-pwm";
-
- #address-cells = <1>;
- #size-cells = <0>;
-
- #pwm-cells = <2>;
-
- status = "disabled";
- };
- };
-
pmr735a: pmic@4 {
compatible = "qcom,pmr735a", "qcom,spmi-pmic";
reg = <0x4 SPMI_USID>;
--
2.30.2
