arm64: dts: qcom: Alias pm8916 on msm8916 devices

Add an alias for pm8916 on msm8916 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/arm64/boot/dts/qcom/apq8016-sbc.dtsi b/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi
index 6b8abbe6874622ffe7d3a28b7b71041959b90418..46bfcb9b2e8414bebee817b2f6ea946f8be7b980 100644 (file)
--- a/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi
+++ b/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi
@@ -20,6 +20,7 @@
        aliases {
                serial0 = &blsp1_uart2;
                serial1 = &blsp1_uart1;
+               usid0 = &pm8916_0;
        };
 
        chosen {

diff --git a/arch/arm64/boot/dts/qcom/msm8916-mtp.dtsi b/arch/arm64/boot/dts/qcom/msm8916-mtp.dtsi
index a1aa0b201e926a493c624a69c5695946bafb3ff0..ceeb8a6feed656cc8e02f704e236d85b1a03b1b0 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-mtp.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916-mtp.dtsi
@@ -17,6 +17,7 @@
 / {
        aliases {
                serial0 = &blsp1_uart2;
+               usid0 = &pm8916_0;
        };
 
        chosen {

diff --git a/arch/arm64/boot/dts/qcom/pm8916.dtsi b/arch/arm64/boot/dts/qcom/pm8916.dtsi
index b222ece7e3d25af69afd56f3d1912b1520c27985..37432451ee4c0733040e35d90dafa166fec2630f 100644 (file)
--- a/arch/arm64/boot/dts/qcom/pm8916.dtsi
+++ b/arch/arm64/boot/dts/qcom/pm8916.dtsi
@@ -4,8 +4,8 @@
 
 &spmi_bus {
 
-       usid0: pm8916@0 {
-               compatible = "qcom,spmi-pmic";
+       pm8916_0: pm8916@0 {
+               compatible = "qcom,pm8916", "qcom,spmi-pmic";
                reg = <0x0 SPMI_USID>;
                #address-cells = <1>;
                #size-cells = <0>;
@@ -90,7 +90,7 @@
                };
        };
 
-       usid1: pm8916@1 {
+       pm8916_1: pm8916@1 {
                compatible = "qcom,spmi-pmic";
                reg = <0x1 SPMI_USID>;
                #address-cells = <1>;