diff options
| author | Andy Gross <andy.gross@linaro.org> | 2016-06-10 05:45:11 +0200 |
|---|---|---|
| committer | Andy Gross <andy.gross@linaro.org> | 2016-06-11 06:50:29 +0200 |
| commit | d44cbb1e9ca3488b5f144a3a71aa58f09b5422a1 (patch) | |
| tree | 5f17d8ab681ae785619b3f84a39ea1bdaac4b369 /arch/arm/boot/dts/qcom-msm8974.dtsi | |
| parent | Linux 4.7-rc1 (diff) | |
| download | linux-d44cbb1e9ca3488b5f144a3a71aa58f09b5422a1.tar.xz linux-d44cbb1e9ca3488b5f144a3a71aa58f09b5422a1.zip | |
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.
Diffstat (limited to 'arch/arm/boot/dts/qcom-msm8974.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/qcom-msm8974.dtsi | 12 |
1 files changed, 11 insertions, 1 deletions
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 { |