Employ PMIC_LABEL and switch sc8280xp-pmics to use pmk8350.dtsi in order
to reduce duplication and possible discrepancies.
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@xxxxxxxxxx>
---
arch/arm64/boot/dts/qcom/sc8280xp-pmics.dtsi | 67 ++------------------
1 file changed, 4 insertions(+), 63 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-pmics.dtsi b/arch/arm64/boot/dts/qcom/sc8280xp-pmics.dtsi
index 254337345e45..6c183b6c9207 100644
--- a/arch/arm64/boot/dts/qcom/sc8280xp-pmics.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc8280xp-pmics.dtsi
@@ -51,70 +51,11 @@ trip1 {
};
};
-&spmi_bus {
- pmk8280: pmic@0 {
- compatible = "qcom,pmk8350", "qcom,spmi-pmic";
- reg = <0x0 SPMI_USID>;
- #address-cells = <1>;
- #size-cells = <0>;
-
- pmk8280_pon: pon@1300 {
- compatible = "qcom,pmk8350-pon";
- reg = <0x1300>, <0x800>;
-
- pmk8280_pon_pwrkey: pwrkey {
- compatible = "qcom,pmk8350-pwrkey";
- interrupts-extended = <&spmi_bus 0x0 0x13 0x7 IRQ_TYPE_EDGE_BOTH>;
- linux,code = <KEY_POWER>;
- status = "disabled";
- };
-
- pmk8280_pon_resin: resin {
- compatible = "qcom,pmk8350-resin";
- interrupts-extended = <&spmi_bus 0x0 0x13 0x6 IRQ_TYPE_EDGE_BOTH>;
- status = "disabled";
- };
- };
-
- pmk8280_vadc: adc@3100 {
- compatible = "qcom,spmi-adc7";
- reg = <0x3100>;
- interrupts-extended = <&spmi_bus 0x0 0x31 0x0 IRQ_TYPE_EDGE_RISING>;
- #address-cells = <1>;
- #size-cells = <0>;
- #io-channel-cells = <1>;
- status = "disabled";
- };
-
- pmk8280_adc_tm: adc-tm@3400 {
- compatible = "qcom,spmi-adc-tm5-gen2";
- reg = <0x3400>;
- interrupts-extended = <&spmi_bus 0x0 0x34 0x0 IRQ_TYPE_EDGE_RISING>;
- #address-cells = <1>;
- #size-cells = <0>;
- #thermal-sensor-cells = <1>;
- status = "disabled";
- };
-
- pmk8280_rtc: rtc@6100 {
- compatible = "qcom,pmk8350-rtc";
- reg = <0x6100>, <0x6200>;
- reg-names = "rtc", "alarm";
- interrupts = <0x0 0x62 0x1 IRQ_TYPE_EDGE_RISING>;
- wakeup-source;
- status = "disabled";
- };
-
- pmk8280_sdam_6: nvram@8500 {
- compatible = "qcom,spmi-sdam";
- reg = <0x8500>;
- #address-cells = <1>;
- #size-cells = <1>;
- ranges = <0 0x8500 0x100>;
- status = "disabled";
- };
- };
+/* SID 0 */
+#define PMIC_LABEL pmk8280
+#include "pmk8350.dtsi"
+&spmi_bus {
pmc8280_1: pmic@1 {
compatible = "qcom,pm8350", "qcom,spmi-pmic";
reg = <0x1 SPMI_USID>;
--
2.30.2
