projects
/
GitHub
/
moto-9609
/
android_kernel_motorola_exynos9610.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d44cbb1
)
Revert "Revert "dts: msm8974: Add dma channels for blsp2_i2c1 node""
author
Andy Gross
<andy.gross@linaro.org>
Fri, 10 Jun 2016 03:45:27 +0000
(22:45 -0500)
committer
Andy Gross
<andy.gross@linaro.org>
Sat, 11 Jun 2016 04:50:43 +0000
(23:50 -0500)
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
.
arch/arm/boot/dts/qcom-msm8974.dtsi
patch
|
blob
|
blame
|
history
diff --git
a/arch/arm/boot/dts/qcom-msm8974.dtsi
b/arch/arm/boot/dts/qcom-msm8974.dtsi
index 320564c8554b08618987cc39e89601d978d5e754..e98b3738ee424f3ac12a2ef8ed5bbe58d837c72a 100644
(file)
--- 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 {