Merge remote-tracking branches 'asoc/fix/email', 'asoc/fix/fsl-ssi', 'asoc/fix/pm...

[firefly-linux-kernel-4.4.55.git] / arch / arm / boot / dts / qcom-msm8960.dtsi

diff --git a/arch/arm/boot/dts/qcom-msm8960.dtsi b/arch/arm/boot/dts/qcom-msm8960.dtsi
index e1b0d5cd9e3cb7860363169a4f58efc158d05ced..a02b984cc68d8e2704abcb175e54c061ed54f629 100644 (file)
--- a/arch/arm/boot/dts/qcom-msm8960.dtsi
+++ b/arch/arm/boot/dts/qcom-msm8960.dtsi
@@ -91,6 +91,13 @@
                        reg = <0x900000 0x4000>;
                };
 
+               lcc: clock-controller@28000000 {
+                       compatible = "qcom,lcc-msm8960";
+                       reg = <0x28000000 0x1000>;
+                       #clock-cells = <1>;
+                       #reset-cells = <1>;
+               };
+
                clock-controller@4000000 {
                        compatible = "qcom,mmcc-msm8960";
                        reg = <0x4000000 0x1000>;
@@ -122,6 +129,7 @@
 
                gsbi5: gsbi@16400000 {
                        compatible = "qcom,gsbi-v1.0.0";
+                       cell-index = <5>;
                        reg = <0x16400000 0x100>;
                        clocks = <&gcc GSBI5_H_CLK>;
                        clock-names = "iface";
@@ -129,6 +137,8 @@
                        #size-cells = <1>;
                        ranges;
 
+                       syscon-tcsr = <&tcsr>;
+
                        serial@16440000 {
                                compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm";
                                reg = <0x16440000 0x1000>,
@@ -238,5 +248,10 @@
                                vmmc-supply = <&vsdcc_fixed>;
                        };
                };
+
+               tcsr: syscon@1a400000 {
+                       compatible = "qcom,tcsr-msm8960", "syscon";
+                       reg = <0x1a400000 0x100>;
+               };
        };
 };