diff options
| author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2015-03-10 01:39:55 +0000 |
|---|---|---|
| committer | Simon Horman <horms+renesas@verge.net.au> | 2015-03-11 09:40:30 +0900 |
| commit | d73a5013ed61bc605374f72ce879a358feba7f3e (patch) | |
| tree | 6265b67d6ce9899d9d485bde7fce3d8f8eeb5d87 /arch/arm/boot/dts/r8a7791.dtsi | |
| parent | 0c60267702244b8a6e62743a8e13a07823efbf6d (diff) | |
| download | talos-obmc-linux-d73a5013ed61bc605374f72ce879a358feba7f3e.tar.gz talos-obmc-linux-d73a5013ed61bc605374f72ce879a358feba7f3e.zip | |
ARM: shmobile: r8a7791: enable Audio DMAC peri peri via sound driver
Audio DMAC peri peri is no longer DMAEngine. it is supported by
sound driver. this patch enable it.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Diffstat (limited to 'arch/arm/boot/dts/r8a7791.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/r8a7791.dtsi | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/arch/arm/boot/dts/r8a7791.dtsi b/arch/arm/boot/dts/r8a7791.dtsi index 8631e023751e..a697b94525b6 100644 --- a/arch/arm/boot/dts/r8a7791.dtsi +++ b/arch/arm/boot/dts/r8a7791.dtsi @@ -357,13 +357,6 @@ dma-channels = <13>; }; - audmapp: dma-controller@ec740000 { - compatible = "renesas,rcar-audmapp"; - #dma-cells = <1>; - - reg = <0 0xec740000 0 0x200>; - }; - /* The memory map in the User's Manual maps the cores to bus numbers */ i2c0: i2c@e6508000 { #address-cells = <1>; @@ -1503,8 +1496,9 @@ reg = <0 0xec500000 0 0x1000>, /* SCU */ <0 0xec5a0000 0 0x100>, /* ADG */ <0 0xec540000 0 0x1000>, /* SSIU */ - <0 0xec541000 0 0x1280>; /* SSI */ - reg-names = "scu", "adg", "ssiu", "ssi"; + <0 0xec541000 0 0x1280>, /* SSI */ + <0 0xec740000 0 0x200>; /* Audio DMAC peri peri*/ + reg-names = "scu", "adg", "ssiu", "ssi", "audmapp"; clocks = <&mstp10_clks R8A7791_CLK_SSI_ALL>, <&mstp10_clks R8A7791_CLK_SSI9>, <&mstp10_clks R8A7791_CLK_SSI8>, |
