diff options
| author | Olof Johansson <olof@lixom.net> | 2014-05-26 17:55:53 -0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-05-26 17:55:53 -0400 |
| commit | 7741fa197ccb4862403554e7829be727a8fa3ba0 (patch) | |
| tree | fee4e5f04eed6c0cc72ee2e0922137235b7af8d7 /arch/arm/boot/dts/am33xx.dtsi | |
| parent | 75d6bc5f7ab41a166deb6e9ebc8434706799fb00 (diff) | |
| parent | cf7eb979116c2568e8bc3b6a7269c7a359864ace (diff) | |
Merge tag 'davinci-fixes-for-v3.15-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/drivers
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
Diffstat (limited to 'arch/arm/boot/dts/am33xx.dtsi')
| -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 cb6811e5ae5a..7ad75b4e0663 100644 --- a/arch/arm/boot/dts/am33xx.dtsi +++ b/arch/arm/boot/dts/am33xx.dtsi | |||
| @@ -144,7 +144,7 @@ | |||
| 144 | compatible = "ti,edma3"; | 144 | compatible = "ti,edma3"; |
| 145 | ti,hwmods = "tpcc", "tptc0", "tptc1", "tptc2"; | 145 | ti,hwmods = "tpcc", "tptc0", "tptc1", "tptc2"; |
| 146 | reg = <0x49000000 0x10000>, | 146 | reg = <0x49000000 0x10000>, |
| 147 | <0x44e10f90 0x10>; | 147 | <0x44e10f90 0x40>; |
| 148 | interrupts = <12 13 14>; | 148 | interrupts = <12 13 14>; |
| 149 | #dma-cells = <1>; | 149 | #dma-cells = <1>; |
| 150 | dma-channels = <64>; | 150 | dma-channels = <64>; |