Stop duplicating declarations of pm8350c and pmr735a PMICs, use existing
files to prevent possible future issues.
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@xxxxxxxxxx>
---
arch/arm64/boot/dts/qcom/sc8280xp-crd.dts | 6 +--
.../qcom/sc8280xp-lenovo-thinkpad-x13s.dts | 6 +--
arch/arm64/boot/dts/qcom/sc8280xp-pmics.dtsi | 51 ++-----------------
3 files changed, 11 insertions(+), 52 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts b/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts
index 58a14c39633b..aabdacc15aab 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 = <&pm8350c_pwm 3 1000000>;
enable-gpios = <&pm8350_1_gpios 8 GPIO_ACTIVE_HIGH>;
power-supply = <&vreg_edp_bl>;
@@ -555,7 +555,7 @@ &pcie4_phy {
status = "okay";
};
-&pmc8280c_lpg {
+&pm8350c_pwm {
status = "okay";
};
@@ -710,7 +710,7 @@ wwan_sw_en: wwan-sw-en-state {
};
};
-&pmc8280c_gpios {
+&pm8350c_gpios {
edp_bl_pwm: edp-bl-pwm-state {
pins = "gpio8";
function = "func1";
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 023ccb7725ef..7e589e5f6a2e 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 = <&pm8350c_pwm 3 1000000>;
enable-gpios = <&pm8350_1_gpios 8 GPIO_ACTIVE_HIGH>;
power-supply = <&vreg_edp_bl>;
@@ -725,7 +725,7 @@ &pcie4_phy {
status = "okay";
};
-&pmc8280c_lpg {
+&pm8350c_pwm {
status = "okay";
};
@@ -1172,7 +1172,7 @@ wwan_sw_en: wwan-sw-en-state {
};
};
-&pmc8280c_gpios {
+&pm8350c_gpios {
edp_bl_pwm: edp-bl-pwm-state {
pins = "gpio8";
function = "func1";
diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-pmics.dtsi b/arch/arm64/boot/dts/qcom/sc8280xp-pmics.dtsi
index 505bb8f9a13c..a37fe4b1458c 100644
--- a/arch/arm64/boot/dts/qcom/sc8280xp-pmics.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc8280xp-pmics.dtsi
@@ -15,53 +15,12 @@
#include "pm8350.dtsi"
#undef PM8350_SID
+/* SID 2 */
+#include "pm8350c.dtsi"
+
#define PM8350_SID 3
#include "pm8350.dtsi"
#undef PM8350_SID
-&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>;
- #address-cells = <1>;
- #size-cells = <0>;
-
- pmr735a_gpios: gpio@8800 {
- compatible = "qcom,pmr735a-gpio", "qcom,spmi-gpio";
- reg = <0x8800>;
- gpio-controller;
- gpio-ranges = <&pmr735a_gpios 0 0 4>;
- #gpio-cells = <2>;
- interrupt-controller;
- #interrupt-cells = <2>;
- };
- };
-};
+/* SID 4 */
+#include "pmr735a.dtsi"
--
2.30.2
