tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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"
+1
-13
+1
-13
arch/arm/boot/dts/qcom-msm8974.dtsi
+1
-13
arch/arm/boot/dts/qcom-msm8974.dtsi
···
1
1
/dts-v1/;
2
2
3
-
#include <dt-bindings/interrupt-controller/arm-gic.h>
3
+
#include <dt-bindings/interrupt-controller/irq.h>
4
4
#include <dt-bindings/clock/qcom,gcc-msm8974.h>
5
5
#include "skeleton.dtsi"
6
6
···
460
460
clock-names = "core", "iface";
461
461
#address-cells = <1>;
462
462
#size-cells = <0>;
463
-
dmas = <&blsp2_dma 20>, <&blsp2_dma 21>;
464
-
dma-names = "tx", "rx";
465
463
};
466
464
467
465
spmi_bus: spmi@fc4cf000 {
···
476
478
#size-cells = <0>;
477
479
interrupt-controller;
478
480
#interrupt-cells = <4>;
479
-
};
480
-
481
-
blsp2_dma: dma-controller@f9944000 {
482
-
compatible = "qcom,bam-v1.4.0";
483
-
reg = <0xf9944000 0x19000>;
484
-
interrupts = <GIC_SPI 239 IRQ_TYPE_LEVEL_HIGH>;
485
-
clocks = <&gcc GCC_BLSP2_AHB_CLK>;
486
-
clock-names = "bam_clk";
487
-
#dma-cells = <1>;
488
-
qcom,ee = <0>;
489
481
};
490
482
};
491
483