diff options
| author |   Olof Johansson <olof@lixom.net> | 2014-05-10 22:06:07 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-05-10 22:06:07 -0700 |
| commit | 3b27dcec920075b6f1f5f8014e32e764fcbb96f8 (patch) | |
| tree | 23f41a73480275c5c5222f24de59a2f07c5df73a /arch/arm/boot/dts | |
| parent | Merge tag 'sunxi-fixes-for-3.15' of https://github.com/mripard/linux into fixes (diff) | |
| parent | ARM: common: edma: Fix xbar mapping (diff) | |
| download | linux-dev-3b27dcec920075b6f1f5f8014e32e764fcbb96f8.tar.xz linux-dev-3b27dcec920075b6f1f5f8014e32e764fcbb96f8.zip | |
Merge tag 'davinci-fixes-for-v3.15-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into fixes
Pull "DaVinci fixes for v3.15" from Sekhar Nori:
The patch fixes EDMA crossbar mapping to actually
make it work. The patch has been tagged for stable.
* tag 'davinci-fixes-for-v3.15-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
ARM: common: edma: Fix xbar mapping
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts')
| -rw-r--r-- | arch/arm/boot/dts/am33xx.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi index 07f283c20eb1..9093c953a885 100644 --- a/arch/arm/boot/dts/am33xx.dtsi +++ b/arch/arm/boot/dts/am33xx.dtsi @@ -144,7 +144,7 @@ compatible = "ti,edma3"; ti,hwmods = "tpcc", "tptc0", "tptc1", "tptc2"; reg = <0x49000000 0x10000>, - <0x44e10f90 0x10>; + <0x44e10f90 0x40>; interrupts = <12 13 14>; #dma-cells = <1>; dma-channels = <64>; |