diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-04-23 22:10:48 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-04-23 22:10:48 +0200 |
| commit | 92f27f98ceb2d457c97cb032349bbf2f776420d0 (patch) | |
| tree | 92c0e2b170ba4d1c001273631726111b2ab4f31a /arch | |
| parent | 56896ef5b990a3822da45f92e548c4c8ac301bb4 (diff) | |
| parent | 10c0f0e92f019ab8d0c17da3696e35b0eef4ec16 (diff) | |
| download | linux-92f27f98ceb2d457c97cb032349bbf2f776420d0.tar.gz linux-92f27f98ceb2d457c97cb032349bbf2f776420d0.tar.bz2 linux-92f27f98ceb2d457c97cb032349bbf2f776420d0.zip | |
Merge tag 'qcom-fixes-for-4.6-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux into fixes
Merge "Qualcomm Fixes for v4.6-rc2" from Andy Gross:
* Revert BAM usage on MSM8974 boards
* tag 'qcom-fixes-for-4.6-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux:
Revert "dts: msm8974: Add dma channels for blsp2_i2c1 node"
Revert "dts: msm8974: Add blsp2_bam dma node"
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/qcom-msm8974.dtsi | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/arch/arm/boot/dts/qcom-msm8974.dtsi b/arch/arm/boot/dts/qcom-msm8974.dtsi index ef5330578431..8193139d0d87 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/arm-gic.h> +#include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/clock/qcom,gcc-msm8974.h> #include "skeleton.dtsi" @@ -460,8 +460,6 @@ clock-names = "core", "iface"; #address-cells = <1>; #size-cells = <0>; - dmas = <&blsp2_dma 20>, <&blsp2_dma 21>; - dma-names = "tx", "rx"; }; spmi_bus: spmi@fc4cf000 { @@ -479,16 +477,6 @@ 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 { |