Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 92f27f98 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'qcom-fixes-for-4.6-rc2' of... 

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"
parents 56896ef5 10c0f0e9

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

+1 −13
Original line number Diff line number Diff line 
/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 {