arm64: dts: qcom: msm8916: Use more generic node names

Now that all MSM8916 boards are referencing nodes by label instead
of name, we can easily make some more nodes use more generic names
(as recommended in the device tree specification or the binding
documentation).

Signed-off-by: Stephan Gerhold <stephan@gerhold.net>
Link: https://lore.kernel.org/r/20200915071221.72895-10-stephan@gerhold.net
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>

diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi b/arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi
index 2ba649bffd4e89d030073b10f518e5a78ba4496c..b18d21e42f596c558a73cac2e3909a0fad4fd9eb 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi
@@ -81,7 +81,7 @@
                #address-cells = <1>;
                #size-cells = <0>;
 
-               muic: sm5502@25 {
+               muic: extcon@25 {
                        compatible = "siliconmitus,sm5502-muic";
 
                        reg = <0x25>;

diff --git a/arch/arm64/boot/dts/qcom/msm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916.dtsi
index b2669643a12d5da9cff239fbb2586448671798fd..4444d068343c61edee766df0e8417422257d4b6c 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916.dtsi
@@ -714,7 +714,7 @@
                        reg-names = "mic-iomux", "spkr-iomux";
                };
 
-               lpass: lpass@7708000 {
+               lpass: audio-controller@7708000 {
                        status = "disabled";
                        compatible = "qcom,lpass-cpu-apq8016";
                        clocks = <&gcc GCC_ULTAUDIO_AHBFABRIC_IXFABRIC_CLK>,
@@ -743,7 +743,7 @@
                        #size-cells = <0>;
                };
 
-               lpass_codec: codec@771c000 {
+               lpass_codec: audio-codec@771c000 {
                        compatible = "qcom,msm8916-wcd-digital-codec";
                        reg = <0x0771c000 0x400>;
                        clocks = <&gcc GCC_ULTAUDIO_AHBFABRIC_IXFABRIC_CLK>,
@@ -1161,7 +1161,7 @@
                        };
                };
 
-               mpss: hexagon@4080000 {
+               mpss: remoteproc@4080000 {
                        compatible = "qcom,msm8916-mss-pil", "qcom,q6v5-pil";
                        reg = <0x04080000 0x100>,
                              <0x04020000 0x040>;
@@ -1225,7 +1225,7 @@
                        };
                };
 
-               pronto: wcnss@a21b000 {
+               pronto: remoteproc@a21b000 {
                        compatible = "qcom,pronto-v2-pil", "qcom,pronto";
                        reg = <0x0a204000 0x2000>, <0x0a202000 0x1000>, <0x0a21b000 0x3000>;
                        reg-names = "ccu", "dxe", "pmu";
@@ -1821,7 +1821,7 @@
                                compatible = "qcom,rpm-msm8916";
                                qcom,smd-channels = "rpm_requests";
 
-                               rpmcc: qcom,rpmcc {
+                               rpmcc: clock-controller {
                                        compatible = "qcom,rpmcc-msm8916";
                                        #clock-cells = <1>;
                                };

diff --git a/arch/arm64/boot/dts/qcom/pm8916.dtsi b/arch/arm64/boot/dts/qcom/pm8916.dtsi
index 636ef9db9a1433ed2a86fb4f8d9df9a5ba169e66..c7b22ac81452778da211bd46c3c0216964dc5a54 100644 (file)
--- a/arch/arm64/boot/dts/qcom/pm8916.dtsi
+++ b/arch/arm64/boot/dts/qcom/pm8916.dtsi
@@ -6,7 +6,7 @@
 
 &spmi_bus {
 
-       pm8916_0: pm8916@0 {
+       pm8916_0: pmic@0 {
                compatible = "qcom,pm8916", "qcom,spmi-pmic";
                reg = <0x0 SPMI_USID>;
                #address-cells = <1>;
@@ -79,7 +79,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>;
@@ -87,33 +87,33 @@
                        #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>;
                        };
                };
        };
 
-       pm8916_1: pm8916@1 {
+       pm8916_1: pmic@1 {
                compatible = "qcom,pm8916", "qcom,spmi-pmic";
                reg = <0x1 SPMI_USID>;
                #address-cells = <1>;
@@ -125,7 +125,7 @@
                        status = "disabled";
                };
 
-               wcd_codec: codec@f000 {
+               wcd_codec: audio-codec@f000 {
                        compatible = "qcom,pm8916-wcd-analog-codec";
                        reg = <0xf000>;
                        reg-names = "pmic-codec-core";