Merge tag 'dlm-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm

[karo-tx-linux.git] / arch / arm / boot / dts / qcom-msm8974.dtsi

diff --git a/arch/arm/boot/dts/qcom-msm8974.dtsi b/arch/arm/boot/dts/qcom-msm8974.dtsi
index 37b47b5538b816bb51c251c521d58d18b7bbd806..d7c99b894a491c7011e8a95f3800f5585aeb49e4 100644 (file)
--- a/arch/arm/boot/dts/qcom-msm8974.dtsi
+++ b/arch/arm/boot/dts/qcom-msm8974.dtsi
@@ -9,6 +9,17 @@
        compatible = "qcom,msm8974";
        interrupt-parent = <&intc>;
 
+       reserved-memory {
+               #address-cells = <1>;
+               #size-cells = <1>;
+               ranges;
+
+               smem_region: smem@fa00000 {
+                       reg = <0xfa00000 0x200000>;
+                       no-map;
+               };
+       };
+
        cpus {
                #address-cells = <1>;
                #size-cells = <0>;
@@ -220,6 +231,11 @@
                        reg = <0xfc400000 0x4000>;
                };
 
+               tcsr_mutex_block: syscon@fd484000 {
+                       compatible = "syscon";
+                       reg = <0xfd484000 0x2000>;
+               };
+
                mmcc: clock-controller@fd8c0000 {
                        compatible = "qcom,mmcc-msm8974";
                        #clock-cells = <1>;
@@ -227,6 +243,22 @@
                        reg = <0xfd8c0000 0x6000>;
                };
 
+               tcsr_mutex: tcsr-mutex {
+                       compatible = "qcom,tcsr-mutex";
+                       syscon = <&tcsr_mutex_block 0 0x80>;
+
+                       #hwlock-cells = <1>;
+               };
+
+               smem@fa00000 {
+                       compatible = "qcom,smem";
+
+                       memory-region = <&smem_region>;
+                       reg = <0xfc428000 0x4000>;
+
+                       hwlocks = <&tcsr_mutex 3>;
+               };
+
                serial@f991e000 {
                        compatible = "qcom,msm-uartdm-v1.4", "qcom,msm-uartdm";
                        reg = <0xf991e000 0x1000>;