arm: dts: qcom: Add aliases for PMICs

Add an alias for the PMICs found on qcom based SoCs so that the
newly updated dtbTool can find the PMIC compatible string and add
the pmic-id element to the QCDT header.

Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Andy Gross <agross@codeaurora.org>

diff --git a/arch/arm/boot/dts/qcom-apq8074-dragonboard.dts b/arch/arm/boot/dts/qcom-apq8074-dragonboard.dts
index 835bdc71c5ba4e7db71642305e541f5e203d4758..c0e2053150424825c5419112109ec6785db30b2d 100644 (file)
--- a/arch/arm/boot/dts/qcom-apq8074-dragonboard.dts
+++ b/arch/arm/boot/dts/qcom-apq8074-dragonboard.dts
@@ -8,6 +8,8 @@
 
        aliases {
                serial0 = &blsp1_uart2;
+               usid0 = &pm8941_0;
+               usid4 = &pm8841_0;
        };
 
        chosen {

diff --git a/arch/arm/boot/dts/qcom-apq8084-ifc6540.dts b/arch/arm/boot/dts/qcom-apq8084-ifc6540.dts
index 32aaa9d4522822287bd2e10f2b74d288023203e7..2052b84a77c6434e22367a948529cd2ee107e8f3 100644 (file)
--- a/arch/arm/boot/dts/qcom-apq8084-ifc6540.dts
+++ b/arch/arm/boot/dts/qcom-apq8084-ifc6540.dts
@@ -7,6 +7,7 @@
 
        aliases {
                serial0 = &blsp2_uart2;
+               usid0 = &pma8084_0;
        };
 
        chosen {

diff --git a/arch/arm/boot/dts/qcom-apq8084-mtp.dts b/arch/arm/boot/dts/qcom-apq8084-mtp.dts
index 3016c7048d446cb5ee1e0810b37986663eb20398..d174d15bcf70d8a7bec9e3fcde771e7a5d4adca8 100644 (file)
--- a/arch/arm/boot/dts/qcom-apq8084-mtp.dts
+++ b/arch/arm/boot/dts/qcom-apq8084-mtp.dts
@@ -7,6 +7,7 @@
 
        aliases {
                serial0 = &blsp2_uart2;
+               usid0 = &pma8084_0;
        };
 
        chosen {

diff --git a/arch/arm/boot/dts/qcom-pm8841.dtsi b/arch/arm/boot/dts/qcom-pm8841.dtsi
index 8f1a0b16201739ead985a49f09a97fcbd3b13ed9..523bee959f98004f61545193d8518f538abfca61 100644 (file)
--- a/arch/arm/boot/dts/qcom-pm8841.dtsi
+++ b/arch/arm/boot/dts/qcom-pm8841.dtsi
@@ -3,8 +3,8 @@
 
 &spmi_bus {
 
-       usid4: pm8841@4 {
-               compatible = "qcom,spmi-pmic";
+       pm8841_0: pm8841@4 {
+               compatible = "qcom,pm8841", "qcom,spmi-pmic";
                reg = <0x4 SPMI_USID>;
                #address-cells = <1>;
                #size-cells = <0>;
@@ -27,8 +27,8 @@
                };
        };
 
-       usid5: pm8841@5 {
-               compatible = "qcom,spmi-pmic";
+       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
index b0d443999fcccb84d3301e7787c292830a596e86..02d674f765919fee8cd612739d8aef35f1ee9445 100644 (file)
--- a/arch/arm/boot/dts/qcom-pm8941.dtsi
+++ b/arch/arm/boot/dts/qcom-pm8941.dtsi
@@ -4,8 +4,8 @@
 
 &spmi_bus {
 
-       usid0: pm8941@0 {
-               compatible ="qcom,spmi-pmic";
+       pm8941_0: pm8941@0 {
+               compatible = "qcom,pm8941", "qcom,spmi-pmic";
                reg = <0x0 SPMI_USID>;
                #address-cells = <1>;
                #size-cells = <0>;
@@ -153,8 +153,8 @@
                };
        };
 
-       usid1: pm8941@1 {
-               compatible = "qcom,spmi-pmic";
+       pm8941_1: pm8941@1 {
+               compatible = "qcom,pm8941", "qcom,spmi-pmic";
                reg = <0x1 SPMI_USID>;
                #address-cells = <1>;
                #size-cells = <0>;

diff --git a/arch/arm/boot/dts/qcom-pma8084.dtsi b/arch/arm/boot/dts/qcom-pma8084.dtsi
index 5e240ccc08b705d46937abc93747905cb733b46c..10b8f9e6d60bdf84df0f9f674a99135da3468081 100644 (file)
--- a/arch/arm/boot/dts/qcom-pma8084.dtsi
+++ b/arch/arm/boot/dts/qcom-pma8084.dtsi
@@ -4,8 +4,8 @@
 
 &spmi_bus {
 
-       usid0: pma8084@0 {
-               compatible = "qcom,spmi-pmic";
+       pma8084_0: pma8084@0 {
+               compatible = "qcom,pma8084", "qcom,spmi-pmic";
                reg = <0x0 SPMI_USID>;
                #address-cells = <1>;
                #size-cells = <0>;
@@ -101,8 +101,8 @@
                };
        };
 
-       usid1: pma8084@1 {
-               compatible = "qcom,spmi-pmic";
+       pma8084_1: pma8084@1 {
+               compatible = "qcom,pma8084", "qcom,spmi-pmic";
                reg = <0x1 SPMI_USID>;
                #address-cells = <1>;
                #size-cells = <0>;