Revert "Revert "dts: msm8974: Add blsp2_bam dma node""
authorAndy Gross <andy.gross@linaro.org>
Fri, 10 Jun 2016 03:45:11 +0000 (22:45 -0500)
committerAndy Gross <andy.gross@linaro.org>
Sat, 11 Jun 2016 04:50:29 +0000 (23:50 -0500)
This puts back in place the blsp2_bam node.  This can be safely added
due to the addition of the special qcom,controlled-remotely flag that
will be used on specific boards that require it.

This reverts commit 338d51889851cb2ac900d2ec75c8185afcde8caf.

arch/arm/boot/dts/qcom-msm8974.dtsi

index 6f164266a01053f4c5e291aca8c36b5f953ff54e..320564c8554b08618987cc39e89601d978d5e754 100644 (file)
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-#include <dt-bindings/interrupt-controller/irq.h>
+#include <dt-bindings/interrupt-controller/arm-gic.h>
 #include <dt-bindings/clock/qcom,gcc-msm8974.h>
 #include "skeleton.dtsi"
 
                        interrupt-controller;
                        #interrupt-cells = <4>;
                };
+
+               blsp2_dma: dma-controller@f9944000 {
+                       compatible = "qcom,bam-v1.4.0";
+                       reg = <0xf9944000 0x19000>;
+                       interrupts = <GIC_SPI 239 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&gcc GCC_BLSP2_AHB_CLK>;
+                       clock-names = "bam_clk";
+                       #dma-cells = <1>;
+                       qcom,ee = <0>;
+               };
        };
 
        smd {