diff options
| author | Imre Kaloz <kaloz@openwrt.org> | 2013-11-15 12:23:17 +0000 |
|---|---|---|
| committer | Imre Kaloz <kaloz@openwrt.org> | 2013-11-15 12:23:17 +0000 |
| commit | e4eef7e6207078a4987b0e02d2ad4068083cf921 (patch) | |
| tree | ae97c3d14f8a010428d78dfc27dde471ad897232 /target/linux/omap/patches-3.12/409-ARM-dts-am33xx-mcasp-Add-new-dma-register-location-t.patch | |
| parent | 1f3478901593dd3bb4f32b2cdcb4c4cfecdbea5a (diff) | |
| download | upstream-e4eef7e6207078a4987b0e02d2ad4068083cf921.tar.gz upstream-e4eef7e6207078a4987b0e02d2ad4068083cf921.tar.bz2 upstream-e4eef7e6207078a4987b0e02d2ad4068083cf921.zip | |
replace the TI patch with a smaller patchset
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
SVN-Revision: 38816
Diffstat (limited to 'target/linux/omap/patches-3.12/409-ARM-dts-am33xx-mcasp-Add-new-dma-register-location-t.patch')
| -rw-r--r-- | target/linux/omap/patches-3.12/409-ARM-dts-am33xx-mcasp-Add-new-dma-register-location-t.patch | 56 |
1 files changed, 56 insertions, 0 deletions
diff --git a/target/linux/omap/patches-3.12/409-ARM-dts-am33xx-mcasp-Add-new-dma-register-location-t.patch b/target/linux/omap/patches-3.12/409-ARM-dts-am33xx-mcasp-Add-new-dma-register-location-t.patch new file mode 100644 index 0000000000..f0e5758126 --- /dev/null +++ b/target/linux/omap/patches-3.12/409-ARM-dts-am33xx-mcasp-Add-new-dma-register-location-t.patch @@ -0,0 +1,56 @@ +From 15ffa765da3f2427b506472baa72d0f3a90b6be5 Mon Sep 17 00:00:00 2001 +From: Jyri Sarha <jsarha@ti.com> +Date: Thu, 5 Sep 2013 21:49:35 +0300 +Subject: [PATCH 220/752] ARM/dts: am33xx: mcasp: Add new dma register + location to reg-property + +This patch adds an optional address range to reg property. The range +describes the register location for DMA controller on am33xx. The both +address ranges are named accordingly in the reg-names property. + +Signed-off-by: Hebbar, Gururaja <gururaja.hebbar@ti.com> +Signed-off-by: Darren Etheridge <detheridge@ti.com> +Signed-off-by: Jyri Sarha <jsarha@ti.com> +--- + arch/arm/boot/dts/am33xx.dtsi | 14 ++++++++++++-- + 1 file changed, 12 insertions(+), 2 deletions(-) + +diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi +index 4fb3521..b9e2ff3 100644 +--- a/arch/arm/boot/dts/am33xx.dtsi ++++ b/arch/arm/boot/dts/am33xx.dtsi +@@ -843,19 +843,29 @@ + mcasp0: mcasp@48038000 { + compatible = "ti,omap2-mcasp-audio"; + ti,hwmods = "mcasp0"; +- reg = <0x48038000 0x2000>; ++ reg = <0x48038000 0x2000>, ++ <0x46400000 0x400000>; ++ reg-names = "mpu", "dma"; + interrupts = <80 81>; + interrupts-names = "tx", "rx"; + status = "disabled"; ++ dmas = <&edma 8 ++ &edma 9>; ++ dma-names = "tx", "rx"; + }; + + mcasp1: mcasp@4803C000 { + compatible = "ti,omap2-mcasp-audio"; + ti,hwmods = "mcasp1"; +- reg = <0x4803C000 0x2000>; ++ reg = <0x4803C000 0x2000>, ++ <0x46400000 0x400000>; ++ reg-names = "mpu", "dma"; + interrupts = <82 83>; + interrupts-names = "tx", "rx"; + status = "disabled"; ++ dmas = <&edma 10 ++ &edma 11>; ++ dma-names = "tx", "rx"; + }; + + }; +-- +1.7.10.4 + |