linux-kernel - [PATCH 5/5] ASoC: rsnd: dma: use extended audio dmac registers when available

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Date:   Wed, 13 Mar 2019 14:58:11 +0900
From:   Jiada Wang <jiada_wang@...tor.com>
To:     <horms@...ge.net.au>, <magnus.damm@...il.com>,
        <robh+dt@...nel.org>, <mark.rutland@....com>,
        <lgirdwood@...il.com>, <broonie@...nel.org>, <perex@...ex.cz>,
        <tiwai@...e.com>, <kuninori.morimoto.gx@...esas.com>,
        <geert@...ux-m68k.org>
CC:     <linux-renesas-soc@...r.kernel.org>, <devicetree@...r.kernel.org>,
        <linux-kernel@...r.kernel.org>, <alsa-devel@...a-project.org>,
        <jiada_wang@...tor.com>
Subject: [PATCH 5/5] ASoC: rsnd: dma: use extended audio dmac registers when available

Some of SoCs have both basic and extended dmac registers set
basic set only supports busif0 ~ busif3, in order to use
busif4 ~ busif7, extended audio dmac registers need to be used.

This patch changes to use extended dmac registers set when it is
available in device-tree.

Signed-off-by: Jiada Wang <jiada_wang@...tor.com>
---
 sound/soc/sh/rcar/dma.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/sound/soc/sh/rcar/dma.c b/sound/soc/sh/rcar/dma.c
index 0324a5c39619..905502ccedba 100644
--- a/sound/soc/sh/rcar/dma.c
+++ b/sound/soc/sh/rcar/dma.c
@@ -830,7 +830,10 @@ int rsnd_dma_probe(struct rsnd_priv *priv)
 	/*
 	 * for Gen2 or later
 	 */
-	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "audmapp");
+	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "extaudmapp");
+	if (!res)
+		res = platform_get_resource_byname(pdev, IORESOURCE_MEM,
+						   "audmapp");
 	dmac = devm_kzalloc(dev, sizeof(*dmac), GFP_KERNEL);
 	if (!dmac || !res) {
 		dev_err(dev, "dma allocate failed\n");
-- 
2.19.2