ARM: dts: qcom: strip prefix from PMIC files
authorDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Thu, 28 Sep 2023 11:02:40 +0000 (14:02 +0300)
committerBjorn Andersson <andersson@kernel.org>
Tue, 14 Nov 2023 17:25:59 +0000 (11:25 -0600)
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.

Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Link: https://lore.kernel.org/r/20230928110309.1212221-8-dmitry.baryshkov@linaro.org
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
29 files changed:
arch/arm/boot/dts/qcom/pm8226.dtsi [new file with mode: 0644]
arch/arm/boot/dts/qcom/pm8841.dtsi [new file with mode: 0644]
arch/arm/boot/dts/qcom/pm8941.dtsi [new file with mode: 0644]
arch/arm/boot/dts/qcom/pma8084.dtsi [new file with mode: 0644]
arch/arm/boot/dts/qcom/pmx55.dtsi [new file with mode: 0644]
arch/arm/boot/dts/qcom/pmx65.dtsi [new file with mode: 0644]
arch/arm/boot/dts/qcom/qcom-apq8026-asus-sparrow.dts
arch/arm/boot/dts/qcom/qcom-apq8026-huawei-sturgeon.dts
arch/arm/boot/dts/qcom/qcom-apq8026-lg-lenok.dts
arch/arm/boot/dts/qcom/qcom-apq8026-samsung-matisse-wifi.dts
arch/arm/boot/dts/qcom/qcom-apq8074-dragonboard.dts
arch/arm/boot/dts/qcom/qcom-apq8084-ifc6540.dts
arch/arm/boot/dts/qcom/qcom-apq8084-mtp.dts
arch/arm/boot/dts/qcom/qcom-msm8974-lge-nexus5-hammerhead.dts
arch/arm/boot/dts/qcom/qcom-msm8974-sony-xperia-rhine.dtsi
arch/arm/boot/dts/qcom/qcom-msm8974pro-fairphone-fp2.dts
arch/arm/boot/dts/qcom/qcom-msm8974pro-oneplus-bacon.dts
arch/arm/boot/dts/qcom/qcom-msm8974pro-samsung-klte.dts
arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts
arch/arm/boot/dts/qcom/qcom-pm8226.dtsi [deleted file]
arch/arm/boot/dts/qcom/qcom-pm8841.dtsi [deleted file]
arch/arm/boot/dts/qcom/qcom-pm8941.dtsi [deleted file]
arch/arm/boot/dts/qcom/qcom-pma8084.dtsi [deleted file]
arch/arm/boot/dts/qcom/qcom-pmx55.dtsi [deleted file]
arch/arm/boot/dts/qcom/qcom-pmx65.dtsi [deleted file]
arch/arm/boot/dts/qcom/qcom-sdx55-mtp.dts
arch/arm/boot/dts/qcom/qcom-sdx55-t55.dts
arch/arm/boot/dts/qcom/qcom-sdx55-telit-fn980-tlb.dts
arch/arm/boot/dts/qcom/qcom-sdx65-mtp.dts

diff --git a/arch/arm/boot/dts/qcom/pm8226.dtsi b/arch/arm/boot/dts/qcom/pm8226.dtsi
new file mode 100644 (file)
index 0000000..2413778
--- /dev/null
@@ -0,0 +1,180 @@
+// SPDX-License-Identifier: BSD-3-Clause
+#include <dt-bindings/iio/qcom,spmi-vadc.h>
+#include <dt-bindings/input/linux-event-codes.h>
+#include <dt-bindings/interrupt-controller/irq.h>
+#include <dt-bindings/spmi/spmi.h>
+
+/ {
+       thermal-zones {
+               pm8226-thermal {
+                       polling-delay-passive = <100>;
+                       polling-delay = <0>;
+                       thermal-sensors = <&pm8226_temp>;
+
+                       trips {
+                               trip0 {
+                                       temperature = <105000>;
+                                       hysteresis = <2000>;
+                                       type = "passive";
+                               };
+
+                               trip1 {
+                                       temperature = <125000>;
+                                       hysteresis = <2000>;
+                                       type = "hot";
+                               };
+
+                               crit {
+                                       temperature = <145000>;
+                                       hysteresis = <2000>;
+                                       type = "critical";
+                               };
+                       };
+               };
+       };
+};
+
+&spmi_bus {
+       pm8226_0: pm8226@0 {
+               compatible = "qcom,pm8226", "qcom,spmi-pmic";
+               reg = <0x0 SPMI_USID>;
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               pon@800 {
+                       compatible = "qcom,pm8916-pon";
+                       reg = <0x800>;
+
+                       pwrkey {
+                               compatible = "qcom,pm8941-pwrkey";
+                               interrupts = <0x0 0x8 0 IRQ_TYPE_EDGE_BOTH>;
+                               debounce = <15625>;
+                               bias-pull-up;
+                               linux,code = <KEY_POWER>;
+                       };
+
+                       pm8226_resin: resin {
+                               compatible = "qcom,pm8941-resin";
+                               interrupts = <0x0 0x8 1 IRQ_TYPE_EDGE_BOTH>;
+                               debounce = <15625>;
+                               bias-pull-up;
+                               status = "disabled";
+                       };
+               };
+
+               smbb: charger@1000 {
+                       compatible = "qcom,pm8226-charger";
+                       reg = <0x1000>;
+                       interrupts = <0x0 0x10 7 IRQ_TYPE_EDGE_BOTH>,
+                                    <0x0 0x10 5 IRQ_TYPE_EDGE_BOTH>,
+                                    <0x0 0x10 4 IRQ_TYPE_EDGE_BOTH>,
+                                    <0x0 0x12 1 IRQ_TYPE_EDGE_BOTH>,
+                                    <0x0 0x12 0 IRQ_TYPE_EDGE_BOTH>,
+                                    <0x0 0x13 2 IRQ_TYPE_EDGE_BOTH>,
+                                    <0x0 0x13 1 IRQ_TYPE_EDGE_BOTH>,
+                                    <0x0 0x14 1 IRQ_TYPE_EDGE_BOTH>;
+                       interrupt-names = "chg-done",
+                                         "chg-fast",
+                                         "chg-trkl",
+                                         "bat-temp-ok",
+                                         "bat-present",
+                                         "chg-gone",
+                                         "usb-valid",
+                                         "dc-valid";
+
+                       chg_otg: otg-vbus { };
+               };
+
+               pm8226_temp: temp-alarm@2400 {
+                       compatible = "qcom,spmi-temp-alarm";
+                       reg = <0x2400>;
+                       interrupts = <0 0x24 0 IRQ_TYPE_EDGE_RISING>;
+                       io-channels = <&pm8226_vadc VADC_DIE_TEMP>;
+                       io-channel-names = "thermal";
+                       #thermal-sensor-cells = <0>;
+               };
+
+               pm8226_vadc: adc@3100 {
+                       compatible = "qcom,spmi-vadc";
+                       reg = <0x3100>;
+                       interrupts = <0x0 0x31 0x0 IRQ_TYPE_EDGE_RISING>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       #io-channel-cells = <1>;
+
+                       channel@7 {
+                               reg = <VADC_VSYS>;
+                               qcom,pre-scaling = <1 3>;
+                               label = "vph_pwr";
+                       };
+                       channel@8 {
+                               reg = <VADC_DIE_TEMP>;
+                               label = "die_temp";
+                       };
+                       channel@9 {
+                               reg = <VADC_REF_625MV>;
+                               label = "ref_625mv";
+                       };
+                       channel@a {
+                               reg = <VADC_REF_1250MV>;
+                               label = "ref_1250mv";
+                       };
+                       channel@e {
+                               reg = <VADC_GND_REF>;
+                       };
+                       channel@f {
+                               reg = <VADC_VDD_VADC>;
+                       };
+               };
+
+               pm8226_iadc: adc@3600 {
+                       compatible = "qcom,pm8226-iadc", "qcom,spmi-iadc";
+                       reg = <0x3600>;
+                       interrupts = <0x0 0x36 0x0 IRQ_TYPE_EDGE_RISING>;
+               };
+
+               rtc@6000 {
+                       compatible = "qcom,pm8941-rtc";
+                       reg = <0x6000>, <0x6100>;
+                       reg-names = "rtc", "alarm";
+                       interrupts = <0x0 0x61 0x1 IRQ_TYPE_EDGE_RISING>;
+               };
+
+               pm8226_mpps: mpps@a000 {
+                       compatible = "qcom,pm8226-mpp", "qcom,spmi-mpp";
+                       reg = <0xa000>;
+                       gpio-controller;
+                       #gpio-cells = <2>;
+                       gpio-ranges = <&pm8226_mpps 0 0 8>;
+                       interrupt-controller;
+                       #interrupt-cells = <2>;
+               };
+
+               pm8226_gpios: gpio@c000 {
+                       compatible = "qcom,pm8226-gpio", "qcom,spmi-gpio";
+                       reg = <0xc000>;
+                       gpio-controller;
+                       #gpio-cells = <2>;
+                       gpio-ranges = <&pm8226_gpios 0 0 8>;
+                       interrupt-controller;
+                       #interrupt-cells = <2>;
+               };
+       };
+
+       pm8226_1: pm8226@1 {
+               compatible = "qcom,pm8226", "qcom,spmi-pmic";
+               reg = <0x1 SPMI_USID>;
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               pm8226_spmi_regulators: regulators {
+                       compatible = "qcom,pm8226-regulators";
+               };
+
+               pm8226_vib: vibrator@c000 {
+                       compatible = "qcom,pm8916-vib";
+                       reg = <0xc000>;
+                       status = "disabled";
+               };
+       };
+};
diff --git a/arch/arm/boot/dts/qcom/pm8841.dtsi b/arch/arm/boot/dts/qcom/pm8841.dtsi
new file mode 100644 (file)
index 0000000..3bf2ce5
--- /dev/null
@@ -0,0 +1,68 @@
+// SPDX-License-Identifier: GPL-2.0
+#include <dt-bindings/interrupt-controller/irq.h>
+#include <dt-bindings/spmi/spmi.h>
+
+
+/ {
+       thermal-zones {
+               pm8841-thermal {
+                       polling-delay-passive = <100>;
+                       polling-delay = <0>;
+                       thermal-sensors = <&pm8841_temp>;
+
+                       trips {
+                               trip0 {
+                                       temperature = <105000>;
+                                       hysteresis = <2000>;
+                                       type = "passive";
+                               };
+
+                               trip1 {
+                                       temperature = <125000>;
+                                       hysteresis = <2000>;
+                                       type = "hot";
+                               };
+
+                               crit {
+                                       temperature = <140000>;
+                                       hysteresis = <2000>;
+                                       type = "critical";
+                               };
+                       };
+               };
+       };
+};
+
+&spmi_bus {
+
+       pm8841_0: pm8841@4 {
+               compatible = "qcom,pm8841", "qcom,spmi-pmic";
+               reg = <0x4 SPMI_USID>;
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               pm8841_mpps: mpps@a000 {
+                       compatible = "qcom,pm8841-mpp", "qcom,spmi-mpp";
+                       reg = <0xa000>;
+                       gpio-controller;
+                       #gpio-cells = <2>;
+                       gpio-ranges = <&pm8841_mpps 0 0 4>;
+                       interrupt-controller;
+                       #interrupt-cells = <2>;
+               };
+
+               pm8841_temp: temp-alarm@2400 {
+                       compatible = "qcom,spmi-temp-alarm";
+                       reg = <0x2400>;
+                       interrupts = <4 0x24 0 IRQ_TYPE_EDGE_RISING>;
+                       #thermal-sensor-cells = <0>;
+               };
+       };
+
+       pm8841_1: pm8841@5 {
+               compatible = "qcom,pm8841", "qcom,spmi-pmic";
+               reg = <0x5 SPMI_USID>;
+               #address-cells = <1>;
+               #size-cells = <0>;
+       };
+};
diff --git a/arch/arm/boot/dts/qcom/pm8941.dtsi b/arch/arm/boot/dts/qcom/pm8941.dtsi
new file mode 100644 (file)
index 0000000..ed0ba59
--- /dev/null
@@ -0,0 +1,254 @@
+// SPDX-License-Identifier: GPL-2.0
+#include <dt-bindings/iio/qcom,spmi-vadc.h>
+#include <dt-bindings/interrupt-controller/irq.h>
+#include <dt-bindings/spmi/spmi.h>
+
+
+/ {
+       thermal-zones {
+               pm8941-thermal {
+                       polling-delay-passive = <100>;
+                       polling-delay = <0>;
+                       thermal-sensors = <&pm8941_temp>;
+
+                       trips {
+                               trip0 {
+                                       temperature = <105000>;
+                                       hysteresis = <2000>;
+                                       type = "passive";
+                               };
+
+                               trip1 {
+                                       temperature = <125000>;
+                                       hysteresis = <2000>;
+                                       type = "hot";
+                               };
+
+                               crit {
+                                       temperature = <145000>;
+                                       hysteresis = <2000>;
+                                       type = "critical";
+                               };
+                       };
+               };
+       };
+};
+
+&spmi_bus {
+
+       pm8941_0: pm8941@0 {
+               compatible = "qcom,pm8941", "qcom,spmi-pmic";
+               reg = <0x0 SPMI_USID>;
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               rtc@6000 {
+                       compatible = "qcom,pm8941-rtc";
+                       reg = <0x6000>,
+                             <0x6100>;
+                       reg-names = "rtc", "alarm";
+                       interrupts = <0x0 0x61 0x1 IRQ_TYPE_EDGE_RISING>;
+               };
+
+               pon@800 {
+                       compatible = "qcom,pm8941-pon";
+                       reg = <0x800>;
+
+                       pwrkey {
+                               compatible = "qcom,pm8941-pwrkey";
+                               interrupts = <0x0 0x8 0 IRQ_TYPE_EDGE_BOTH>;
+                               debounce = <15625>;
+                               bias-pull-up;
+                       };
+
+                       pm8941_resin: resin {
+                               compatible = "qcom,pm8941-resin";
+                               interrupts = <0x0 0x8 1 IRQ_TYPE_EDGE_BOTH>;
+                               debounce = <15625>;
+                               bias-pull-up;
+                               status = "disabled";
+                       };
+               };
+
+               usb_id: usb-detect@900 {
+                       compatible = "qcom,pm8941-misc";
+                       reg = <0x900>;
+                       interrupts = <0x0 0x9 0 IRQ_TYPE_EDGE_BOTH>;
+                       interrupt-names = "usb_id";
+               };
+
+               smbb: charger@1000 {
+                       compatible = "qcom,pm8941-charger";
+                       reg = <0x1000>;
+                       interrupts = <0x0 0x10 7 IRQ_TYPE_EDGE_BOTH>,
+                                    <0x0 0x10 5 IRQ_TYPE_EDGE_BOTH>,
+                                    <0x0 0x10 4 IRQ_TYPE_EDGE_BOTH>,
+                                    <0x0 0x12 1 IRQ_TYPE_EDGE_BOTH>,
+                                    <0x0 0x12 0 IRQ_TYPE_EDGE_BOTH>,
+                                    <0x0 0x13 2 IRQ_TYPE_EDGE_BOTH>,
+                                    <0x0 0x13 1 IRQ_TYPE_EDGE_BOTH>,
+                                    <0x0 0x14 1 IRQ_TYPE_EDGE_BOTH>;
+                       interrupt-names = "chg-done",
+                                         "chg-fast",
+                                         "chg-trkl",
+                                         "bat-temp-ok",
+                                         "bat-present",
+                                         "chg-gone",
+                                         "usb-valid",
+                                         "dc-valid";
+
+                       usb-otg-in-supply = <&pm8941_5vs1>;
+
+                       chg_otg: otg-vbus { };
+               };
+
+               pm8941_gpios: gpio@c000 {
+                       compatible = "qcom,pm8941-gpio", "qcom,spmi-gpio";
+                       reg = <0xc000>;
+                       gpio-controller;
+                       gpio-ranges = <&pm8941_gpios 0 0 36>;
+                       #gpio-cells = <2>;
+                       interrupt-controller;
+                       #interrupt-cells = <2>;
+
+                       boost_bypass_n_pin: boost-bypass-state {
+                               pins = "gpio21";
+                               function = "normal";
+                       };
+               };
+
+               pm8941_mpps: mpps@a000 {
+                       compatible = "qcom,pm8941-mpp", "qcom,spmi-mpp";
+                       reg = <0xa000>;
+                       gpio-controller;
+                       #gpio-cells = <2>;
+                       gpio-ranges = <&pm8941_mpps 0 0 8>;
+                       interrupt-controller;
+                       #interrupt-cells = <2>;
+               };
+
+               pm8941_temp: temp-alarm@2400 {
+                       compatible = "qcom,spmi-temp-alarm";
+                       reg = <0x2400>;
+                       interrupts = <0 0x24 0 IRQ_TYPE_EDGE_RISING>;
+                       io-channels = <&pm8941_vadc VADC_DIE_TEMP>;
+                       io-channel-names = "thermal";
+                       #thermal-sensor-cells = <0>;
+               };
+
+               pm8941_vadc: adc@3100 {
+                       compatible = "qcom,spmi-vadc";
+                       reg = <0x3100>;
+                       interrupts = <0x0 0x31 0x0 IRQ_TYPE_EDGE_RISING>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       #io-channel-cells = <1>;
+
+
+                       channel@6 {
+                               reg = <VADC_VBAT_SNS>;
+                       };
+
+                       channel@8 {
+                               reg = <VADC_DIE_TEMP>;
+                       };
+
+                       channel@9 {
+                               reg = <VADC_REF_625MV>;
+                       };
+
+                       channel@a {
+                               reg = <VADC_REF_1250MV>;
+                       };
+
+                       channel@e {
+                               reg = <VADC_GND_REF>;
+                       };
+
+                       channel@f {
+                               reg = <VADC_VDD_VADC>;
+                       };
+
+                       channel@30 {
+                               reg = <VADC_LR_MUX1_BAT_THERM>;
+                       };
+               };
+
+               pm8941_iadc: adc@3600 {
+                       compatible = "qcom,pm8941-iadc", "qcom,spmi-iadc";
+                       reg = <0x3600>;
+                       interrupts = <0x0 0x36 0x0 IRQ_TYPE_EDGE_RISING>;
+                       qcom,external-resistor-micro-ohms = <10000>;
+               };
+
+               pm8941_coincell: charger@2800 {
+                       compatible = "qcom,pm8941-coincell";
+                       reg = <0x2800>;
+                       status = "disabled";
+               };
+       };
+
+       pm8941_1: pm8941@1 {
+               compatible = "qcom,pm8941", "qcom,spmi-pmic";
+               reg = <0x1 SPMI_USID>;
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               pm8941_lpg: pwm {
+                       compatible = "qcom,pm8941-lpg";
+
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       #pwm-cells = <2>;
+
+                       status = "disabled";
+               };
+
+               pm8941_vib: vibrator@c000 {
+                       compatible = "qcom,pm8916-vib";
+                       reg = <0xc000>;
+                       status = "disabled";
+               };
+
+               pm8941_wled: wled@d800 {
+                       compatible = "qcom,pm8941-wled";
+                       reg = <0xd800>;
+                       label = "backlight";
+
+                       status = "disabled";
+               };
+
+               regulators {
+                       compatible = "qcom,pm8941-regulators";
+                       interrupts = <0x1 0x83 0x2 0>, <0x1 0x84 0x2 0>;
+                       interrupt-names = "ocp-5vs1", "ocp-5vs2";
+                       vin_5vs-supply = <&pm8941_5v>;
+
+                       pm8941_5v: s4 {
+                               regulator-min-microvolt = <5000000>;
+                               regulator-max-microvolt = <5000000>;
+                               regulator-enable-ramp-delay = <500>;
+                       };
+
+                       pm8941_5vs1: 5vs1 {
+                               regulator-enable-ramp-delay = <1000>;
+                               regulator-pull-down;
+                               regulator-over-current-protection;
+                               qcom,ocp-max-retries = <10>;
+                               qcom,ocp-retry-delay = <30>;
+                               qcom,vs-soft-start-strength = <0>;
+                               regulator-initial-mode = <1>;
+                       };
+
+                       pm8941_5vs2: 5vs2 {
+                               regulator-enable-ramp-delay = <1000>;
+                               regulator-pull-down;
+                               regulator-over-current-protection;
+                               qcom,ocp-max-retries = <10>;
+                               qcom,ocp-retry-delay = <30>;
+                               qcom,vs-soft-start-strength = <0>;
+                               regulator-initial-mode = <1>;
+                       };
+               };
+       };
+};
diff --git a/arch/arm/boot/dts/qcom/pma8084.dtsi b/arch/arm/boot/dts/qcom/pma8084.dtsi
new file mode 100644 (file)
index 0000000..2985f48
--- /dev/null
@@ -0,0 +1,99 @@
+// SPDX-License-Identifier: GPL-2.0
+#include <dt-bindings/iio/qcom,spmi-vadc.h>
+#include <dt-bindings/interrupt-controller/irq.h>
+#include <dt-bindings/spmi/spmi.h>
+
+&spmi_bus {
+
+       pma8084_0: pma8084@0 {
+               compatible = "qcom,pma8084", "qcom,spmi-pmic";
+               reg = <0x0 SPMI_USID>;
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               rtc@6000 {
+                       compatible = "qcom,pm8941-rtc";
+                       reg = <0x6000>,
+                             <0x6100>;
+                       reg-names = "rtc", "alarm";
+                       interrupts = <0x0 0x61 0x1 IRQ_TYPE_EDGE_RISING>;
+               };
+
+               pwrkey@800 {
+                       compatible = "qcom,pm8941-pwrkey";
+                       reg = <0x800>;
+                       interrupts = <0x0 0x8 0 IRQ_TYPE_EDGE_BOTH>;
+                       debounce = <15625>;
+                       bias-pull-up;
+               };
+
+               pma8084_gpios: gpio@c000 {
+                       compatible = "qcom,pma8084-gpio", "qcom,spmi-gpio";
+                       reg = <0xc000>;
+                       gpio-controller;
+                       gpio-ranges = <&pma8084_gpios 0 0 22>;
+                       #gpio-cells = <2>;
+                       interrupt-controller;
+                       #interrupt-cells = <2>;
+               };
+
+               pma8084_mpps: mpps@a000 {
+                       compatible = "qcom,pma8084-mpp", "qcom,spmi-mpp";
+                       reg = <0xa000>;
+                       gpio-controller;
+                       #gpio-cells = <2>;
+                       gpio-ranges = <&pma8084_mpps 0 0 8>;
+                       interrupt-controller;
+                       #interrupt-cells = <2>;
+               };
+
+               pma8084_temp: temp-alarm@2400 {
+                       compatible = "qcom,spmi-temp-alarm";
+                       reg = <0x2400>;
+                       interrupts = <0 0x24 0 IRQ_TYPE_EDGE_RISING>;
+                       #thermal-sensor-cells = <0>;
+                       io-channels = <&pma8084_vadc VADC_DIE_TEMP>;
+                       io-channel-names = "thermal";
+               };
+
+               pma8084_vadc: adc@3100 {
+                       compatible = "qcom,spmi-vadc";
+                       reg = <0x3100>;
+                       interrupts = <0x0 0x31 0x0 IRQ_TYPE_EDGE_RISING>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       #io-channel-cells = <1>;
+
+                       channel@8 {
+                               reg = <VADC_DIE_TEMP>;
+                       };
+
+                       channel@9 {
+                               reg = <VADC_REF_625MV>;
+                       };
+
+                       channel@a {
+                               reg = <VADC_REF_1250MV>;
+                       };
+
+                       channel@c {
+                               reg = <VADC_SPARE1>;
+                       };
+
+                       channel@e {
+                               reg = <VADC_GND_REF>;
+                       };
+
+                       channel@f {
+                               reg = <VADC_VDD_VADC>;
+                       };
+               };
+       };
+
+       pma8084_1: pma8084@1 {
+               compatible = "qcom,pma8084", "qcom,spmi-pmic";
+               reg = <0x1 SPMI_USID>;
+               #address-cells = <1>;
+               #size-cells = <0>;
+       };
+};
diff --git a/arch/arm/boot/dts/qcom/pmx55.dtsi b/arch/arm/boot/dts/qcom/pmx55.dtsi
new file mode 100644 (file)
index 0000000..da08511
--- /dev/null
@@ -0,0 +1,85 @@
+// SPDX-License-Identifier: BSD-3-Clause
+
+/*
+ * Copyright (c) 2018-2020, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2020, Linaro Limited
+ */
+
+#include <dt-bindings/iio/qcom,spmi-vadc.h>
+#include <dt-bindings/interrupt-controller/irq.h>
+#include <dt-bindings/spmi/spmi.h>
+
+&spmi_bus {
+       pmic@8 {
+               compatible = "qcom,pmx55", "qcom,spmi-pmic";
+               reg = <0x8 SPMI_USID>;
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               pon@800 {
+                       compatible = "qcom,pm8916-pon";
+                       reg = <0x0800>;
+
+                       status = "disabled";
+               };
+
+               pmx55_temp: temp-alarm@2400 {
+                       compatible = "qcom,spmi-temp-alarm";
+                       reg = <0x2400>;
+                       interrupts = <0x8 0x24 0x0 IRQ_TYPE_EDGE_BOTH>;
+                       io-channels = <&pmx55_adc ADC5_DIE_TEMP>;
+                       io-channel-names = "thermal";
+                       #thermal-sensor-cells = <0>;
+               };
+
+               pmx55_adc: adc@3100 {
+                       compatible = "qcom,spmi-adc5";
+                       reg = <0x3100>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       #io-channel-cells = <1>;
+                       interrupts = <0x8 0x31 0x0 IRQ_TYPE_EDGE_RISING>;
+
+                       channel@0 {
+                               reg = <ADC5_REF_GND>;
+                               qcom,pre-scaling = <1 1>;
+                               label = "ref_gnd";
+                       };
+
+                       channel@1 {
+                               reg = <ADC5_1P25VREF>;
+                               qcom,pre-scaling = <1 1>;
+                               label = "vref_1p25";
+                       };
+
+                       channel@6 {
+                               reg = <ADC5_DIE_TEMP>;
+                               qcom,pre-scaling = <1 1>;
+                               label = "die_temp";
+                       };
+
+                       channel@9 {
+                               reg = <ADC5_CHG_TEMP>;
+                               qcom,pre-scaling = <1 1>;
+                               label = "chg_temp";
+                       };
+               };
+
+               pmx55_gpios: gpio@c000 {
+                       compatible = "qcom,pmx55-gpio", "qcom,spmi-gpio";
+                       reg = <0xc000>;
+                       gpio-controller;
+                       gpio-ranges = <&pmx55_gpios 0 0 11>;
+                       #gpio-cells = <2>;
+                       interrupt-controller;
+                       #interrupt-cells = <2>;
+               };
+       };
+
+       pmic@9 {
+               compatible = "qcom,pmx55", "qcom,spmi-pmic";
+               reg = <0x9 SPMI_USID>;
+               #address-cells = <1>;
+               #size-cells = <0>;
+       };
+};
diff --git a/arch/arm/boot/dts/qcom/pmx65.dtsi b/arch/arm/boot/dts/qcom/pmx65.dtsi
new file mode 100644 (file)
index 0000000..1c7fdf5
--- /dev/null
@@ -0,0 +1,33 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Copyright (c) 2022, Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+
+#include <dt-bindings/interrupt-controller/irq.h>
+#include <dt-bindings/spmi/spmi.h>
+
+&spmi_bus {
+       pmic@1 {
+               compatible = "qcom,pmx65", "qcom,spmi-pmic";
+               reg = <1 SPMI_USID>;
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               pmx65_temp: temp-alarm@a00 {
+                       compatible = "qcom,spmi-temp-alarm";
+                       reg = <0xa00>;
+                       interrupts = <0x1 0xa 0x0 IRQ_TYPE_EDGE_BOTH>;
+                       #thermal-sensor-cells = <0>;
+               };
+
+               pmx65_gpios: gpio@8800 {
+                       compatible = "qcom,pmx65-gpio", "qcom,spmi-gpio";
+                       reg = <0x8800>;
+                       gpio-controller;
+                       gpio-ranges = <&pmx65_gpios 0 0 16>;
+                       #gpio-cells = <2>;
+                       interrupt-controller;
+                       #interrupt-cells = <2>;
+               };
+       };
+};
index aa0e0e8d2a973ea75f3f86e938f0c909c4ea73dd..a39f5a161b03bbd666bea62783b32a8dcaa078d6 100644 (file)
@@ -6,7 +6,7 @@
 /dts-v1/;
 
 #include "qcom-msm8226.dtsi"
-#include "qcom-pm8226.dtsi"
+#include "pm8226.dtsi"
 
 /delete-node/ &adsp_region;
 
index de19640efe5538349b4fb5740bce4786bec552f0..59b218042d32dd89104f8d787775759f5c9cacd1 100644 (file)
@@ -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;
index b887e5361ec3a22b280554486a2a96216906f1fc..feb78afef3a6e010b1f1cdbe5f9d1e34eb195121 100644 (file)
@@ -6,7 +6,7 @@
 /dts-v1/;
 
 #include "qcom-msm8226.dtsi"
-#include "qcom-pm8226.dtsi"
+#include "pm8226.dtsi"
 
 /delete-node/ &adsp_region;
 
index f516e0426bb9e82ec71f964c315056ff558261c6..cffc069712b2f1b2cc36c80dd51284a77e7fed31 100644 (file)
@@ -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;
index 6d1b2439ae3ace4d7489258000bb610d2f72b967..950fa652f9856aec4ad15cb59985046859bba65a 100644 (file)
@@ -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;
 
index 116e59a3b76d01e54306ced831dfbc2019b05754..1df24c922be9f3e9a2a56cb7edb2fa353c59860c 100644 (file)
@@ -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";
index c6b6680248a69ee91fe2a102b7b9b5d7608ea6cb..d4e6aee034afd1e6a7f9b10b302351a756f819b8 100644 (file)
@@ -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";
index 60bdfddeae69eb828831d06192d2ca20fd539cf1..da99f770d4f57b669d0853f9ee00b71cb54e6663 100644 (file)
@@ -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>
index 68a2f9094e536f758b25ed0e97d97fc87257b71e..23ae474698aa7b02c1f49996428071ed2683d1e4 100644 (file)
@@ -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>
index 42d253b75dad02552e03b0c210d3589c9727a678..6c4153689b39e5af4c65a40c844a44031b17aa7a 100644 (file)
@@ -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>
index 8230d0e1d95d1de1bff1ad1af990e1850b6b4246..c0ca264d8140dba2050792fbdc0d5916e11a0684 100644 (file)
@@ -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>
 
index 3e2c86591ee2f79ef8af323279bac754f302c29e..325feb89b343abdf5cb3485d22b2082496e6c2e2 100644 (file)
@@ -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>
index 11468d1409f7227fa6ca5ca9e354837192714968..0798cce3dbea01c560e5d341109d8d8ce2b4ad39 100644 (file)
@@ -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-pm8226.dtsi b/arch/arm/boot/dts/qcom/qcom-pm8226.dtsi
deleted file mode 100644 (file)
index 2413778..0000000
+++ /dev/null
@@ -1,180 +0,0 @@
-// SPDX-License-Identifier: BSD-3-Clause
-#include <dt-bindings/iio/qcom,spmi-vadc.h>
-#include <dt-bindings/input/linux-event-codes.h>
-#include <dt-bindings/interrupt-controller/irq.h>
-#include <dt-bindings/spmi/spmi.h>
-
-/ {
-       thermal-zones {
-               pm8226-thermal {
-                       polling-delay-passive = <100>;
-                       polling-delay = <0>;
-                       thermal-sensors = <&pm8226_temp>;
-
-                       trips {
-                               trip0 {
-                                       temperature = <105000>;
-                                       hysteresis = <2000>;
-                                       type = "passive";
-                               };
-
-                               trip1 {
-                                       temperature = <125000>;
-                                       hysteresis = <2000>;
-                                       type = "hot";
-                               };
-
-                               crit {
-                                       temperature = <145000>;
-                                       hysteresis = <2000>;
-                                       type = "critical";
-                               };
-                       };
-               };
-       };
-};
-
-&spmi_bus {
-       pm8226_0: pm8226@0 {
-               compatible = "qcom,pm8226", "qcom,spmi-pmic";
-               reg = <0x0 SPMI_USID>;
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               pon@800 {
-                       compatible = "qcom,pm8916-pon";
-                       reg = <0x800>;
-
-                       pwrkey {
-                               compatible = "qcom,pm8941-pwrkey";
-                               interrupts = <0x0 0x8 0 IRQ_TYPE_EDGE_BOTH>;
-                               debounce = <15625>;
-                               bias-pull-up;
-                               linux,code = <KEY_POWER>;
-                       };
-
-                       pm8226_resin: resin {
-                               compatible = "qcom,pm8941-resin";
-                               interrupts = <0x0 0x8 1 IRQ_TYPE_EDGE_BOTH>;
-                               debounce = <15625>;
-                               bias-pull-up;
-                               status = "disabled";
-                       };
-               };
-
-               smbb: charger@1000 {
-                       compatible = "qcom,pm8226-charger";
-                       reg = <0x1000>;
-                       interrupts = <0x0 0x10 7 IRQ_TYPE_EDGE_BOTH>,
-                                    <0x0 0x10 5 IRQ_TYPE_EDGE_BOTH>,
-                                    <0x0 0x10 4 IRQ_TYPE_EDGE_BOTH>,
-                                    <0x0 0x12 1 IRQ_TYPE_EDGE_BOTH>,
-                                    <0x0 0x12 0 IRQ_TYPE_EDGE_BOTH>,
-                                    <0x0 0x13 2 IRQ_TYPE_EDGE_BOTH>,
-                                    <0x0 0x13 1 IRQ_TYPE_EDGE_BOTH>,
-                                    <0x0 0x14 1 IRQ_TYPE_EDGE_BOTH>;
-                       interrupt-names = "chg-done",
-                                         "chg-fast",
-                                         "chg-trkl",
-                                         "bat-temp-ok",
-                                         "bat-present",
-                                         "chg-gone",
-                                         "usb-valid",
-                                         "dc-valid";
-
-                       chg_otg: otg-vbus { };
-               };
-
-               pm8226_temp: temp-alarm@2400 {
-                       compatible = "qcom,spmi-temp-alarm";
-                       reg = <0x2400>;
-                       interrupts = <0 0x24 0 IRQ_TYPE_EDGE_RISING>;
-                       io-channels = <&pm8226_vadc VADC_DIE_TEMP>;
-                       io-channel-names = "thermal";
-                       #thermal-sensor-cells = <0>;
-               };
-
-               pm8226_vadc: adc@3100 {
-                       compatible = "qcom,spmi-vadc";
-                       reg = <0x3100>;
-                       interrupts = <0x0 0x31 0x0 IRQ_TYPE_EDGE_RISING>;
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-                       #io-channel-cells = <1>;
-
-                       channel@7 {
-                               reg = <VADC_VSYS>;
-                               qcom,pre-scaling = <1 3>;
-                               label = "vph_pwr";
-                       };
-                       channel@8 {
-                               reg = <VADC_DIE_TEMP>;
-                               label = "die_temp";
-                       };
-                       channel@9 {
-                               reg = <VADC_REF_625MV>;
-                               label = "ref_625mv";
-                       };
-                       channel@a {
-                               reg = <VADC_REF_1250MV>;
-                               label = "ref_1250mv";
-                       };
-                       channel@e {
-                               reg = <VADC_GND_REF>;
-                       };
-                       channel@f {
-                               reg = <VADC_VDD_VADC>;
-                       };
-               };
-
-               pm8226_iadc: adc@3600 {
-                       compatible = "qcom,pm8226-iadc", "qcom,spmi-iadc";
-                       reg = <0x3600>;
-                       interrupts = <0x0 0x36 0x0 IRQ_TYPE_EDGE_RISING>;
-               };
-
-               rtc@6000 {
-                       compatible = "qcom,pm8941-rtc";
-                       reg = <0x6000>, <0x6100>;
-                       reg-names = "rtc", "alarm";
-                       interrupts = <0x0 0x61 0x1 IRQ_TYPE_EDGE_RISING>;
-               };
-
-               pm8226_mpps: mpps@a000 {
-                       compatible = "qcom,pm8226-mpp", "qcom,spmi-mpp";
-                       reg = <0xa000>;
-                       gpio-controller;
-                       #gpio-cells = <2>;
-                       gpio-ranges = <&pm8226_mpps 0 0 8>;
-                       interrupt-controller;
-                       #interrupt-cells = <2>;
-               };
-
-               pm8226_gpios: gpio@c000 {
-                       compatible = "qcom,pm8226-gpio", "qcom,spmi-gpio";
-                       reg = <0xc000>;
-                       gpio-controller;
-                       #gpio-cells = <2>;
-                       gpio-ranges = <&pm8226_gpios 0 0 8>;
-                       interrupt-controller;
-                       #interrupt-cells = <2>;
-               };
-       };
-
-       pm8226_1: pm8226@1 {
-               compatible = "qcom,pm8226", "qcom,spmi-pmic";
-               reg = <0x1 SPMI_USID>;
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               pm8226_spmi_regulators: regulators {
-                       compatible = "qcom,pm8226-regulators";
-               };
-
-               pm8226_vib: vibrator@c000 {
-                       compatible = "qcom,pm8916-vib";
-                       reg = <0xc000>;
-                       status = "disabled";
-               };
-       };
-};
diff --git a/arch/arm/boot/dts/qcom/qcom-pm8841.dtsi b/arch/arm/boot/dts/qcom/qcom-pm8841.dtsi
deleted file mode 100644 (file)
index 3bf2ce5..0000000
+++ /dev/null
@@ -1,68 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-#include <dt-bindings/interrupt-controller/irq.h>
-#include <dt-bindings/spmi/spmi.h>
-
-
-/ {
-       thermal-zones {
-               pm8841-thermal {
-                       polling-delay-passive = <100>;
-                       polling-delay = <0>;
-                       thermal-sensors = <&pm8841_temp>;
-
-                       trips {
-                               trip0 {
-                                       temperature = <105000>;
-                                       hysteresis = <2000>;
-                                       type = "passive";
-                               };
-
-                               trip1 {
-                                       temperature = <125000>;
-                                       hysteresis = <2000>;
-                                       type = "hot";
-                               };
-
-                               crit {
-                                       temperature = <140000>;
-                                       hysteresis = <2000>;
-                                       type = "critical";
-                               };
-                       };
-               };
-       };
-};
-
-&spmi_bus {
-
-       pm8841_0: pm8841@4 {
-               compatible = "qcom,pm8841", "qcom,spmi-pmic";
-               reg = <0x4 SPMI_USID>;
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               pm8841_mpps: mpps@a000 {
-                       compatible = "qcom,pm8841-mpp", "qcom,spmi-mpp";
-                       reg = <0xa000>;
-                       gpio-controller;
-                       #gpio-cells = <2>;
-                       gpio-ranges = <&pm8841_mpps 0 0 4>;
-                       interrupt-controller;
-                       #interrupt-cells = <2>;
-               };
-
-               pm8841_temp: temp-alarm@2400 {
-                       compatible = "qcom,spmi-temp-alarm";
-                       reg = <0x2400>;
-                       interrupts = <4 0x24 0 IRQ_TYPE_EDGE_RISING>;
-                       #thermal-sensor-cells = <0>;
-               };
-       };
-
-       pm8841_1: pm8841@5 {
-               compatible = "qcom,pm8841", "qcom,spmi-pmic";
-               reg = <0x5 SPMI_USID>;
-               #address-cells = <1>;
-               #size-cells = <0>;
-       };
-};
diff --git a/arch/arm/boot/dts/qcom/qcom-pm8941.dtsi b/arch/arm/boot/dts/qcom/qcom-pm8941.dtsi
deleted file mode 100644 (file)
index ed0ba59..0000000
+++ /dev/null
@@ -1,254 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-#include <dt-bindings/iio/qcom,spmi-vadc.h>
-#include <dt-bindings/interrupt-controller/irq.h>
-#include <dt-bindings/spmi/spmi.h>
-
-
-/ {
-       thermal-zones {
-               pm8941-thermal {
-                       polling-delay-passive = <100>;
-                       polling-delay = <0>;
-                       thermal-sensors = <&pm8941_temp>;
-
-                       trips {
-                               trip0 {
-                                       temperature = <105000>;
-                                       hysteresis = <2000>;
-                                       type = "passive";
-                               };
-
-                               trip1 {
-                                       temperature = <125000>;
-                                       hysteresis = <2000>;
-                                       type = "hot";
-                               };
-
-                               crit {
-                                       temperature = <145000>;
-                                       hysteresis = <2000>;
-                                       type = "critical";
-                               };
-                       };
-               };
-       };
-};
-
-&spmi_bus {
-
-       pm8941_0: pm8941@0 {
-               compatible = "qcom,pm8941", "qcom,spmi-pmic";
-               reg = <0x0 SPMI_USID>;
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               rtc@6000 {
-                       compatible = "qcom,pm8941-rtc";
-                       reg = <0x6000>,
-                             <0x6100>;
-                       reg-names = "rtc", "alarm";
-                       interrupts = <0x0 0x61 0x1 IRQ_TYPE_EDGE_RISING>;
-               };
-
-               pon@800 {
-                       compatible = "qcom,pm8941-pon";
-                       reg = <0x800>;
-
-                       pwrkey {
-                               compatible = "qcom,pm8941-pwrkey";
-                               interrupts = <0x0 0x8 0 IRQ_TYPE_EDGE_BOTH>;
-                               debounce = <15625>;
-                               bias-pull-up;
-                       };
-
-                       pm8941_resin: resin {
-                               compatible = "qcom,pm8941-resin";
-                               interrupts = <0x0 0x8 1 IRQ_TYPE_EDGE_BOTH>;
-                               debounce = <15625>;
-                               bias-pull-up;
-                               status = "disabled";
-                       };
-               };
-
-               usb_id: usb-detect@900 {
-                       compatible = "qcom,pm8941-misc";
-                       reg = <0x900>;
-                       interrupts = <0x0 0x9 0 IRQ_TYPE_EDGE_BOTH>;
-                       interrupt-names = "usb_id";
-               };
-
-               smbb: charger@1000 {
-                       compatible = "qcom,pm8941-charger";
-                       reg = <0x1000>;
-                       interrupts = <0x0 0x10 7 IRQ_TYPE_EDGE_BOTH>,
-                                    <0x0 0x10 5 IRQ_TYPE_EDGE_BOTH>,
-                                    <0x0 0x10 4 IRQ_TYPE_EDGE_BOTH>,
-                                    <0x0 0x12 1 IRQ_TYPE_EDGE_BOTH>,
-                                    <0x0 0x12 0 IRQ_TYPE_EDGE_BOTH>,
-                                    <0x0 0x13 2 IRQ_TYPE_EDGE_BOTH>,
-                                    <0x0 0x13 1 IRQ_TYPE_EDGE_BOTH>,
-                                    <0x0 0x14 1 IRQ_TYPE_EDGE_BOTH>;
-                       interrupt-names = "chg-done",
-                                         "chg-fast",
-                                         "chg-trkl",
-                                         "bat-temp-ok",
-                                         "bat-present",
-                                         "chg-gone",
-                                         "usb-valid",
-                                         "dc-valid";
-
-                       usb-otg-in-supply = <&pm8941_5vs1>;
-
-                       chg_otg: otg-vbus { };
-               };
-
-               pm8941_gpios: gpio@c000 {
-                       compatible = "qcom,pm8941-gpio", "qcom,spmi-gpio";
-                       reg = <0xc000>;
-                       gpio-controller;
-                       gpio-ranges = <&pm8941_gpios 0 0 36>;
-                       #gpio-cells = <2>;
-                       interrupt-controller;
-                       #interrupt-cells = <2>;
-
-                       boost_bypass_n_pin: boost-bypass-state {
-                               pins = "gpio21";
-                               function = "normal";
-                       };
-               };
-
-               pm8941_mpps: mpps@a000 {
-                       compatible = "qcom,pm8941-mpp", "qcom,spmi-mpp";
-                       reg = <0xa000>;
-                       gpio-controller;
-                       #gpio-cells = <2>;
-                       gpio-ranges = <&pm8941_mpps 0 0 8>;
-                       interrupt-controller;
-                       #interrupt-cells = <2>;
-               };
-
-               pm8941_temp: temp-alarm@2400 {
-                       compatible = "qcom,spmi-temp-alarm";
-                       reg = <0x2400>;
-                       interrupts = <0 0x24 0 IRQ_TYPE_EDGE_RISING>;
-                       io-channels = <&pm8941_vadc VADC_DIE_TEMP>;
-                       io-channel-names = "thermal";
-                       #thermal-sensor-cells = <0>;
-               };
-
-               pm8941_vadc: adc@3100 {
-                       compatible = "qcom,spmi-vadc";
-                       reg = <0x3100>;
-                       interrupts = <0x0 0x31 0x0 IRQ_TYPE_EDGE_RISING>;
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-                       #io-channel-cells = <1>;
-
-
-                       channel@6 {
-                               reg = <VADC_VBAT_SNS>;
-                       };
-
-                       channel@8 {
-                               reg = <VADC_DIE_TEMP>;
-                       };
-
-                       channel@9 {
-                               reg = <VADC_REF_625MV>;
-                       };
-
-                       channel@a {
-                               reg = <VADC_REF_1250MV>;
-                       };
-
-                       channel@e {
-                               reg = <VADC_GND_REF>;
-                       };
-
-                       channel@f {
-                               reg = <VADC_VDD_VADC>;
-                       };
-
-                       channel@30 {
-                               reg = <VADC_LR_MUX1_BAT_THERM>;
-                       };
-               };
-
-               pm8941_iadc: adc@3600 {
-                       compatible = "qcom,pm8941-iadc", "qcom,spmi-iadc";
-                       reg = <0x3600>;
-                       interrupts = <0x0 0x36 0x0 IRQ_TYPE_EDGE_RISING>;
-                       qcom,external-resistor-micro-ohms = <10000>;
-               };
-
-               pm8941_coincell: charger@2800 {
-                       compatible = "qcom,pm8941-coincell";
-                       reg = <0x2800>;
-                       status = "disabled";
-               };
-       };
-
-       pm8941_1: pm8941@1 {
-               compatible = "qcom,pm8941", "qcom,spmi-pmic";
-               reg = <0x1 SPMI_USID>;
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               pm8941_lpg: pwm {
-                       compatible = "qcom,pm8941-lpg";
-
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-                       #pwm-cells = <2>;
-
-                       status = "disabled";
-               };
-
-               pm8941_vib: vibrator@c000 {
-                       compatible = "qcom,pm8916-vib";
-                       reg = <0xc000>;
-                       status = "disabled";
-               };
-
-               pm8941_wled: wled@d800 {
-                       compatible = "qcom,pm8941-wled";
-                       reg = <0xd800>;
-                       label = "backlight";
-
-                       status = "disabled";
-               };
-
-               regulators {
-                       compatible = "qcom,pm8941-regulators";
-                       interrupts = <0x1 0x83 0x2 0>, <0x1 0x84 0x2 0>;
-                       interrupt-names = "ocp-5vs1", "ocp-5vs2";
-                       vin_5vs-supply = <&pm8941_5v>;
-
-                       pm8941_5v: s4 {
-                               regulator-min-microvolt = <5000000>;
-                               regulator-max-microvolt = <5000000>;
-                               regulator-enable-ramp-delay = <500>;
-                       };
-
-                       pm8941_5vs1: 5vs1 {
-                               regulator-enable-ramp-delay = <1000>;
-                               regulator-pull-down;
-                               regulator-over-current-protection;
-                               qcom,ocp-max-retries = <10>;
-                               qcom,ocp-retry-delay = <30>;
-                               qcom,vs-soft-start-strength = <0>;
-                               regulator-initial-mode = <1>;
-                       };
-
-                       pm8941_5vs2: 5vs2 {
-                               regulator-enable-ramp-delay = <1000>;
-                               regulator-pull-down;
-                               regulator-over-current-protection;
-                               qcom,ocp-max-retries = <10>;
-                               qcom,ocp-retry-delay = <30>;
-                               qcom,vs-soft-start-strength = <0>;
-                               regulator-initial-mode = <1>;
-                       };
-               };
-       };
-};
diff --git a/arch/arm/boot/dts/qcom/qcom-pma8084.dtsi b/arch/arm/boot/dts/qcom/qcom-pma8084.dtsi
deleted file mode 100644 (file)
index 2985f48..0000000
+++ /dev/null
@@ -1,99 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-#include <dt-bindings/iio/qcom,spmi-vadc.h>
-#include <dt-bindings/interrupt-controller/irq.h>
-#include <dt-bindings/spmi/spmi.h>
-
-&spmi_bus {
-
-       pma8084_0: pma8084@0 {
-               compatible = "qcom,pma8084", "qcom,spmi-pmic";
-               reg = <0x0 SPMI_USID>;
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               rtc@6000 {
-                       compatible = "qcom,pm8941-rtc";
-                       reg = <0x6000>,
-                             <0x6100>;
-                       reg-names = "rtc", "alarm";
-                       interrupts = <0x0 0x61 0x1 IRQ_TYPE_EDGE_RISING>;
-               };
-
-               pwrkey@800 {
-                       compatible = "qcom,pm8941-pwrkey";
-                       reg = <0x800>;
-                       interrupts = <0x0 0x8 0 IRQ_TYPE_EDGE_BOTH>;
-                       debounce = <15625>;
-                       bias-pull-up;
-               };
-
-               pma8084_gpios: gpio@c000 {
-                       compatible = "qcom,pma8084-gpio", "qcom,spmi-gpio";
-                       reg = <0xc000>;
-                       gpio-controller;
-                       gpio-ranges = <&pma8084_gpios 0 0 22>;
-                       #gpio-cells = <2>;
-                       interrupt-controller;
-                       #interrupt-cells = <2>;
-               };
-
-               pma8084_mpps: mpps@a000 {
-                       compatible = "qcom,pma8084-mpp", "qcom,spmi-mpp";
-                       reg = <0xa000>;
-                       gpio-controller;
-                       #gpio-cells = <2>;
-                       gpio-ranges = <&pma8084_mpps 0 0 8>;
-                       interrupt-controller;
-                       #interrupt-cells = <2>;
-               };
-
-               pma8084_temp: temp-alarm@2400 {
-                       compatible = "qcom,spmi-temp-alarm";
-                       reg = <0x2400>;
-                       interrupts = <0 0x24 0 IRQ_TYPE_EDGE_RISING>;
-                       #thermal-sensor-cells = <0>;
-                       io-channels = <&pma8084_vadc VADC_DIE_TEMP>;
-                       io-channel-names = "thermal";
-               };
-
-               pma8084_vadc: adc@3100 {
-                       compatible = "qcom,spmi-vadc";
-                       reg = <0x3100>;
-                       interrupts = <0x0 0x31 0x0 IRQ_TYPE_EDGE_RISING>;
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-                       #io-channel-cells = <1>;
-
-                       channel@8 {
-                               reg = <VADC_DIE_TEMP>;
-                       };
-
-                       channel@9 {
-                               reg = <VADC_REF_625MV>;
-                       };
-
-                       channel@a {
-                               reg = <VADC_REF_1250MV>;
-                       };
-
-                       channel@c {
-                               reg = <VADC_SPARE1>;
-                       };
-
-                       channel@e {
-                               reg = <VADC_GND_REF>;
-                       };
-
-                       channel@f {
-                               reg = <VADC_VDD_VADC>;
-                       };
-               };
-       };
-
-       pma8084_1: pma8084@1 {
-               compatible = "qcom,pma8084", "qcom,spmi-pmic";
-               reg = <0x1 SPMI_USID>;
-               #address-cells = <1>;
-               #size-cells = <0>;
-       };
-};
diff --git a/arch/arm/boot/dts/qcom/qcom-pmx55.dtsi b/arch/arm/boot/dts/qcom/qcom-pmx55.dtsi
deleted file mode 100644 (file)
index da08511..0000000
+++ /dev/null
@@ -1,85 +0,0 @@
-// SPDX-License-Identifier: BSD-3-Clause
-
-/*
- * Copyright (c) 2018-2020, The Linux Foundation. All rights reserved.
- * Copyright (c) 2020, Linaro Limited
- */
-
-#include <dt-bindings/iio/qcom,spmi-vadc.h>
-#include <dt-bindings/interrupt-controller/irq.h>
-#include <dt-bindings/spmi/spmi.h>
-
-&spmi_bus {
-       pmic@8 {
-               compatible = "qcom,pmx55", "qcom,spmi-pmic";
-               reg = <0x8 SPMI_USID>;
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               pon@800 {
-                       compatible = "qcom,pm8916-pon";
-                       reg = <0x0800>;
-
-                       status = "disabled";
-               };
-
-               pmx55_temp: temp-alarm@2400 {
-                       compatible = "qcom,spmi-temp-alarm";
-                       reg = <0x2400>;
-                       interrupts = <0x8 0x24 0x0 IRQ_TYPE_EDGE_BOTH>;
-                       io-channels = <&pmx55_adc ADC5_DIE_TEMP>;
-                       io-channel-names = "thermal";
-                       #thermal-sensor-cells = <0>;
-               };
-
-               pmx55_adc: adc@3100 {
-                       compatible = "qcom,spmi-adc5";
-                       reg = <0x3100>;
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-                       #io-channel-cells = <1>;
-                       interrupts = <0x8 0x31 0x0 IRQ_TYPE_EDGE_RISING>;
-
-                       channel@0 {
-                               reg = <ADC5_REF_GND>;
-                               qcom,pre-scaling = <1 1>;
-                               label = "ref_gnd";
-                       };
-
-                       channel@1 {
-                               reg = <ADC5_1P25VREF>;
-                               qcom,pre-scaling = <1 1>;
-                               label = "vref_1p25";
-                       };
-
-                       channel@6 {
-                               reg = <ADC5_DIE_TEMP>;
-                               qcom,pre-scaling = <1 1>;
-                               label = "die_temp";
-                       };
-
-                       channel@9 {
-                               reg = <ADC5_CHG_TEMP>;
-                               qcom,pre-scaling = <1 1>;
-                               label = "chg_temp";
-                       };
-               };
-
-               pmx55_gpios: gpio@c000 {
-                       compatible = "qcom,pmx55-gpio", "qcom,spmi-gpio";
-                       reg = <0xc000>;
-                       gpio-controller;
-                       gpio-ranges = <&pmx55_gpios 0 0 11>;
-                       #gpio-cells = <2>;
-                       interrupt-controller;
-                       #interrupt-cells = <2>;
-               };
-       };
-
-       pmic@9 {
-               compatible = "qcom,pmx55", "qcom,spmi-pmic";
-               reg = <0x9 SPMI_USID>;
-               #address-cells = <1>;
-               #size-cells = <0>;
-       };
-};
diff --git a/arch/arm/boot/dts/qcom/qcom-pmx65.dtsi b/arch/arm/boot/dts/qcom/qcom-pmx65.dtsi
deleted file mode 100644 (file)
index 1c7fdf5..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-only
-/*
- * Copyright (c) 2022, Qualcomm Innovation Center, Inc. All rights reserved.
- */
-
-#include <dt-bindings/interrupt-controller/irq.h>
-#include <dt-bindings/spmi/spmi.h>
-
-&spmi_bus {
-       pmic@1 {
-               compatible = "qcom,pmx65", "qcom,spmi-pmic";
-               reg = <1 SPMI_USID>;
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               pmx65_temp: temp-alarm@a00 {
-                       compatible = "qcom,spmi-temp-alarm";
-                       reg = <0xa00>;
-                       interrupts = <0x1 0xa 0x0 IRQ_TYPE_EDGE_BOTH>;
-                       #thermal-sensor-cells = <0>;
-               };
-
-               pmx65_gpios: gpio@8800 {
-                       compatible = "qcom,pmx65-gpio", "qcom,spmi-gpio";
-                       reg = <0x8800>;
-                       gpio-controller;
-                       gpio-ranges = <&pmx65_gpios 0 0 16>;
-                       #gpio-cells = <2>;
-                       interrupt-controller;
-                       #interrupt-cells = <2>;
-               };
-       };
-};
index 7e97ad5803d87ba86b2538f3fe5a3d1d8f3b7121..2470693619090b80f908960f2660ec14a3916e6e 100644 (file)
@@ -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";
index 51058b06527979fb3baa59637478dba1d15b1a30..082f7ed1a01fb87223ac0d924c0cf781fb233557 100644 (file)
@@ -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";
index 8fadc6e70692a5691fc61b8292dbe0b9656cb38f..e336a15b45c4c6388128cd886378343d62e82218 100644 (file)
@@ -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";
index 9649c859a2c36355f53c75a5277fb755901a6189..07c10c84eefa1ba0e0d9ed89065c6dfbebc6a430 100644 (file)
@@ -12,7 +12,7 @@
 #include <dt-bindings/regulator/qcom,rpmh-regulator.h>
 #include <arm64/qcom/pmk8350.dtsi>
 #include <arm64/qcom/pm7250b.dtsi>
-#include "qcom-pmx65.dtsi"
+#include "pmx65.dtsi"
 
 / {
        model = "Qualcomm Technologies, Inc. SDX65 MTP";