target/linux/omap/patches-3.12/409-ARM-dts-am33xx-mcasp-Add-new-dma-register-location-t.patch

   1 From 15ffa765da3f2427b506472baa72d0f3a90b6be5 Mon Sep 17 00:00:00 2001
   2 From: Jyri Sarha <jsarha@ti.com>
   3 Date: Thu, 5 Sep 2013 21:49:35 +0300
   4 Subject: [PATCH 220/752] ARM/dts: am33xx: mcasp: Add new dma register
   5  location to reg-property
   6
   7 This patch adds an optional address range to reg property. The range
   8 describes the register location for DMA controller on am33xx. The both
   9 address ranges are named accordingly in the reg-names property.
  10
  11 Signed-off-by: Hebbar, Gururaja <gururaja.hebbar@ti.com>
  12 Signed-off-by: Darren Etheridge <detheridge@ti.com>
  13 Signed-off-by: Jyri Sarha <jsarha@ti.com>
  14 ---
  15  arch/arm/boot/dts/am33xx.dtsi |   14 ++++++++++++--
  16  1 file changed, 12 insertions(+), 2 deletions(-)
  17
  18 diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi
  19 index 4fb3521..b9e2ff3 100644
  20 --- a/arch/arm/boot/dts/am33xx.dtsi
  21 +++ b/arch/arm/boot/dts/am33xx.dtsi
  22 @@ -843,19 +843,29 @@
  23                 mcasp0: mcasp@48038000 {
  24                         compatible = "ti,omap2-mcasp-audio";
  25                         ti,hwmods = "mcasp0";
  26 -                       reg = <0x48038000 0x2000>;
  27 +                       reg = <0x48038000 0x2000>,
  28 +                             <0x46400000 0x400000>;
  29 +                       reg-names = "mpu", "dma";
  30                         interrupts = <80 81>;
  31                         interrupts-names = "tx", "rx";
  32                         status = "disabled";
  33 +                       dmas = <&edma 8
  34 +                               &edma 9>;
  35 +                       dma-names = "tx", "rx";
  36                 };
  37
  38                 mcasp1: mcasp@4803C000 {
  39                         compatible = "ti,omap2-mcasp-audio";
  40                         ti,hwmods = "mcasp1";
  41 -                       reg = <0x4803C000 0x2000>;
  42 +                       reg = <0x4803C000 0x2000>,
  43 +                             <0x46400000 0x400000>;
  44 +                       reg-names = "mpu", "dma";
  45                         interrupts = <82 83>;
  46                         interrupts-names = "tx", "rx";
  47                         status = "disabled";
  48 +                       dmas = <&edma 10
  49 +                               &edma 11>;
  50 +                       dma-names = "tx", "rx";
  51                 };
  52
  53         };
  54 --
  55 1.7.10.4
  56