Merge remote-tracking branch 'mkp-scsi/4.5/scsi-fixes' into fixes

[mirror_ubuntu-zesty-kernel.git] / arch / arm / boot / dts / qcom-pma8084.dtsi

diff --git a/arch/arm/boot/dts/qcom-pma8084.dtsi b/arch/arm/boot/dts/qcom-pma8084.dtsi
index 5e240ccc08b705d46937abc93747905cb733b46c..4e9bd3f88473e4220f67ddf54eec71e47eca2d12 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>;
@@ -19,7 +19,7 @@
                };
 
                pma8084_gpios: gpios@c000 {
-                       compatible = "qcom,pma8084-gpio";
+                       compatible = "qcom,pma8084-gpio", "qcom,spmi-gpio";
                        reg = <0xc000 0x1600>;
                        gpio-controller;
                        #gpio-cells = <2>;
@@ -48,7 +48,7 @@
                };
 
                pma8084_mpps: mpps@a000 {
-                       compatible = "qcom,pma8084-mpp";
+                       compatible = "qcom,pma8084-mpp", "qcom,spmi-mpp";
                        reg = <0xa000 0x800>;
                        gpio-controller;
                        #gpio-cells = <2>;
@@ -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>;