diff options
author | Andy Gross <andy.gross@linaro.org> | 2016-06-10 05:45:27 +0200 |
---|---|---|
committer | Andy Gross <andy.gross@linaro.org> | 2016-06-11 06:50:43 +0200 |
commit | 938b4d4ea13535d99e6b7bc145b78171bdea7da4 (patch) | |
tree | a6261e4896ecae79b8168405663a8b7b236ff457 /arch/arm/boot/dts/qcom-msm8974.dtsi | |
parent | Revert "Revert "dts: msm8974: Add blsp2_bam dma node"" (diff) | |
download | linux-938b4d4ea13535d99e6b7bc145b78171bdea7da4.tar.xz linux-938b4d4ea13535d99e6b7bc145b78171bdea7da4.zip |
Revert "Revert "dts: msm8974: Add dma channels for blsp2_i2c1 node""
This adds back the dma channels for the i2c1 node. This is safe now
that the qcom,controlled-remotely changes are in place and will be used
on the boards that require it.
This reverts commit 10c0f0e92f019ab8d0c17da3696e35b0eef4ec16.
Diffstat (limited to 'arch/arm/boot/dts/qcom-msm8974.dtsi')
-rw-r--r-- | arch/arm/boot/dts/qcom-msm8974.dtsi | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/qcom-msm8974.dtsi b/arch/arm/boot/dts/qcom-msm8974.dtsi index 320564c8554b..e98b3738ee42 100644 --- a/arch/arm/boot/dts/qcom-msm8974.dtsi +++ b/arch/arm/boot/dts/qcom-msm8974.dtsi @@ -501,6 +501,8 @@ 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 { |