Merge tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

[sfrench/cifs-2.6.git] / arch / arm64 / boot / dts / qcom / pm8916.dtsi

diff --git a/arch/arm64/boot/dts/qcom/pm8916.dtsi b/arch/arm64/boot/dts/qcom/pm8916.dtsi
index 0bcdf047110791c664331ec16038cdacaa5f1920..f931cb0de231f932659e007d40054ff30295d574 100644 (file)
--- a/arch/arm64/boot/dts/qcom/pm8916.dtsi
+++ b/arch/arm64/boot/dts/qcom/pm8916.dtsi
@@ -1,24 +1,17 @@
 // SPDX-License-Identifier: GPL-2.0
 #include <dt-bindings/iio/qcom,spmi-vadc.h>
-#include <dt-bindings/interrupt-controller/irq.h>
 #include <dt-bindings/input/linux-event-codes.h>
+#include <dt-bindings/interrupt-controller/irq.h>
 #include <dt-bindings/spmi/spmi.h>
 
 &spmi_bus {
 
-       pm8916_0: pm8916@0 {
+       pm8916_0: pmic@0 {
                compatible = "qcom,pm8916", "qcom,spmi-pmic";
                reg = <0x0 SPMI_USID>;
                #address-cells = <1>;
                #size-cells = <0>;
 
-               rtc@6000 {
-                       compatible = "qcom,pm8941-rtc";
-                       reg = <0x6000>;
-                       reg-names = "rtc", "alarm";
-                       interrupts = <0x0 0x61 0x1 IRQ_TYPE_EDGE_RISING>;
-               };
-
                pon@800 {
                        compatible = "qcom,pm8916-pon";
                        reg = <0x800>;
@@ -33,6 +26,14 @@
                                linux,code = <KEY_POWER>;
                        };
 
+                       pm8916_resin: resin {
+                               compatible = "qcom,pm8941-resin";
+                               interrupts = <0x0 0x8 1 IRQ_TYPE_EDGE_BOTH>;
+                               debounce = <15625>;
+                               bias-pull-up;
+                               status = "disabled";
+                       };
+
                        watchdog {
                                compatible = "qcom,pm8916-wdt";
                                interrupts = <0x0 0x8 6 IRQ_TYPE_EDGE_RISING>;
@@ -40,28 +41,6 @@
                        };
                };
 
-               pm8916_gpios: gpios@c000 {
-                       compatible = "qcom,pm8916-gpio";
-                       reg = <0xc000>;
-                       gpio-controller;
-                       #gpio-cells = <2>;
-                       interrupts = <0 0xc0 0 IRQ_TYPE_NONE>,
-                                    <0 0xc1 0 IRQ_TYPE_NONE>,
-                                    <0 0xc2 0 IRQ_TYPE_NONE>,
-                                    <0 0xc3 0 IRQ_TYPE_NONE>;
-               };
-
-               pm8916_mpps: mpps@a000 {
-                       compatible = "qcom,pm8916-mpp";
-                       reg = <0xa000>;
-                       gpio-controller;
-                       #gpio-cells = <2>;
-                       interrupts = <0 0xa0 0 IRQ_TYPE_NONE>,
-                                    <0 0xa1 0 IRQ_TYPE_NONE>,
-                                    <0 0xa2 0 IRQ_TYPE_NONE>,
-                                    <0 0xa3 0 IRQ_TYPE_NONE>;
-               };
-
                pm8916_temp: temp-alarm@2400 {
                        compatible = "qcom,spmi-temp-alarm";
                        reg = <0x2400>;
@@ -71,7 +50,7 @@
                        #thermal-sensor-cells = <0>;
                };
 
-               pm8916_vadc: vadc@3100 {
+               pm8916_vadc: adc@3100 {
                        compatible = "qcom,spmi-vadc";
                        reg = <0x3100>;
                        interrupts = <0x0 0x31 0x0 IRQ_TYPE_EDGE_RISING>;
@@ -79,33 +58,62 @@
                        #size-cells = <0>;
                        #io-channel-cells = <1>;
 
-                       usb_in {
+                       adc-chan@0 {
                                reg = <VADC_USBIN>;
                                qcom,pre-scaling = <1 10>;
                        };
-                       vph_pwr {
+                       adc-chan@7 {
                                reg = <VADC_VSYS>;
                                qcom,pre-scaling = <1 3>;
                        };
-                       die_temp {
+                       adc-chan@8 {
                                reg = <VADC_DIE_TEMP>;
                        };
-                       ref_625mv {
+                       adc-chan@9 {
                                reg = <VADC_REF_625MV>;
                        };
-                       ref_1250v {
+                       adc-chan@a {
                                reg = <VADC_REF_1250MV>;
                        };
-                       ref_gnd {
+                       adc-chan@e {
                                reg = <VADC_GND_REF>;
                        };
-                       ref_vdd {
+                       adc-chan@f {
                                reg = <VADC_VDD_VADC>;
                        };
                };
+
+               rtc@6000 {
+                       compatible = "qcom,pm8941-rtc";
+                       reg = <0x6000>;
+                       reg-names = "rtc", "alarm";
+                       interrupts = <0x0 0x61 0x1 IRQ_TYPE_EDGE_RISING>;
+               };
+
+               pm8916_mpps: mpps@a000 {
+                       compatible = "qcom,pm8916-mpp";
+                       reg = <0xa000>;
+                       gpio-controller;
+                       #gpio-cells = <2>;
+                       interrupts = <0 0xa0 0 IRQ_TYPE_NONE>,
+                                    <0 0xa1 0 IRQ_TYPE_NONE>,
+                                    <0 0xa2 0 IRQ_TYPE_NONE>,
+                                    <0 0xa3 0 IRQ_TYPE_NONE>;
+               };
+
+               pm8916_gpios: gpios@c000 {
+                       compatible = "qcom,pm8916-gpio";
+                       reg = <0xc000>;
+                       gpio-controller;
+                       #gpio-cells = <2>;
+                       interrupts = <0 0xc0 0 IRQ_TYPE_NONE>,
+                                    <0 0xc1 0 IRQ_TYPE_NONE>,
+                                    <0 0xc2 0 IRQ_TYPE_NONE>,
+                                    <0 0xc3 0 IRQ_TYPE_NONE>;
+               };
        };
 
-       pm8916_1: pm8916@1 {
+       pm8916_1: pmic@1 {
                compatible = "qcom,pm8916", "qcom,spmi-pmic";
                reg = <0x1 SPMI_USID>;
                #address-cells = <1>;
@@ -117,9 +125,9 @@
                        status = "disabled";
                };
 
-               wcd_codec: codec@f000 {
+               wcd_codec: audio-codec@f000 {
                        compatible = "qcom,pm8916-wcd-analog-codec";
-                       reg = <0xf000 0x200>;
+                       reg = <0xf000>;
                        reg-names = "pmic-codec-core";
                        clocks = <&gcc GCC_CODEC_DIGCODEC_CLK>;
                        clock-names = "mclk";