From: Andy Gross <andy.gross@linaro.org>
Date: Fri, 10 Jun 2016 03:45:11 +0000 (-0500)
Subject: Revert "Revert "dts: msm8974: Add blsp2_bam dma node""
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=d44cbb1e9ca3488b5f144a3a71aa58f09b5422a1;p=linux-beck.git

Revert "Revert "dts: msm8974: Add blsp2_bam dma node""

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.
---

diff --git a/arch/arm/boot/dts/qcom-msm8974.dtsi b/arch/arm/boot/dts/qcom-msm8974.dtsi
index 6f164266a010..320564c8554b 100644
--- a/arch/arm/boot/dts/qcom-msm8974.dtsi
+++ b/arch/arm/boot/dts/qcom-msm8974.dtsi
@@ -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"
 
@@ -518,6 +518,16 @@
 			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 {