From patchwork Fri Apr 13 11:22:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 133361 Delivered-To: patch@linaro.org Received: by 10.46.84.18 with SMTP id i18csp620439ljb; Fri, 13 Apr 2018 04:22:58 -0700 (PDT) X-Google-Smtp-Source: AIpwx4/B0ERR+m+CHiq4zrQxgUd+vu5+xsSL7HUoEaqSphTl7tcIcAVskIdxtZ7qN41fUtzxABpd X-Received: by 10.223.182.68 with SMTP id i4mr3315422wre.262.1523618577988; Fri, 13 Apr 2018 04:22:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523618577; cv=none; d=google.com; s=arc-20160816; b=xX9031yFNNsRPylQ+8n+hA3rrCsPbv7+9pDTUDlgGnzCrN0jZalPuikhOOH4b0PRVe HUu+YAaKJO8vq1LAepMea3+7UnXFvbZ5KDFNkNHP6WsF6IjhcodbsQQGttP4LzWM3zJd Y+TnC1ljftWYVK0qWEqKtmyj1ZJbUxQA9ljNBakOIdOZNvsGvd54ZNcTTkatnZ9ZcnsM KNOLlUp4Eca7nR43veGtfnlGPuzL9r1lD9WkF2LZgxpIZr6+IFt6pHDEgrGCAsbEei8W C/IS0G3n6SX87vVRmFcTUmDAsfDKaxdsyP2NYdGYBWDgSI/puAY5/s7GpYBXqe7B4gOH yKCQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:date:message-id:in-reply-to:to:from :dkim-signature:delivered-to:arc-authentication-results; bh=IY7cCkBxZcqAfIUla/CMa5uY9Z8Z4ixhHs7VdWU+j3E=; b=XsRx1Gfu0uNvwus7RgeZYT6dl3AS5i+sONy2d8J1MKJCBUrrvtJvLJy3h3/FDcfuyT VIu3qDBqdXfJ37VLD2UN02/XiK+mBe/fauGAwjXy44qeS/a76+ufocrQZtTrBPUflJ8R DmyNZEFXpdEvn6bdr03gHP0SXOtBeUg9wn+bYbuzWPlrBbEo0dzEb3RKI1F8HppsBPrJ ZbyshyrXoqQy4k1bR8plQ0m2Yl9YL0X4vTfHyzRiYIKK+DcxP39SU0j+CmArTl+mXgMG eT00C0mFCUl/VjiOKkeMng/WPVU576DMwB9AK4qgXRBHXccqDszRdT2xVZ5iUTIHQl8W vx1g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=J+mi8dln; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org Return-Path: Received: from alsa0.perex.cz (alsa0.perex.cz. [77.48.224.243]) by mx.google.com with ESMTP id 26si4213637wrv.130.2018.04.13.04.22.57; Fri, 13 Apr 2018 04:22:57 -0700 (PDT) Received-SPF: pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) client-ip=77.48.224.243; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=J+mi8dln; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id C7FE126735C; Fri, 13 Apr 2018 13:22:56 +0200 (CEST) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id 4741326738C; Fri, 13 Apr 2018 13:22:55 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mail1.perex.cz X-Spam-Level: X-Spam-Status: No, score=0.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=disabled version=3.4.0 Received: from heliosphere.sirena.org.uk (heliosphere.sirena.org.uk [172.104.155.198]) by alsa0.perex.cz (Postfix) with ESMTP id BAB9F267356 for ; Fri, 13 Apr 2018 13:22:52 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sirena.org.uk; s=20170815-heliosphere; h=Date:Message-Id:In-Reply-To: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:References: List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner: List-Archive; bh=L6coKeQP/0xc/N9LtSwVvBjweZwoFMVtw+VMOCIfkY8=; b=J+mi8dln0wEa 1eK6SmU/NQurWFzpCtZikRLkTwJY4LfCNEWSb8UinSVA56pFPvg1pE+lRh5H5XP6qLhBCYFoPQMIJ DVcqAlCnIKOC6bMBHvpwXX6/RhiFVKSl6uGIpgxujOAd+CdpijfVfoXUlXeBCNp7qOJkqMGPTX0q1 /A6a0=; Received: from debutante.sirena.org.uk ([2001:470:1f1d:6b5::3] helo=debutante) by heliosphere.sirena.org.uk with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1f6wn4-0008Av-KJ; Fri, 13 Apr 2018 11:22:50 +0000 Received: from broonie by debutante with local (Exim 4.90_1) (envelope-from ) id 1f6wn4-0008Pm-5N; Fri, 13 Apr 2018 12:22:50 +0100 From: Mark Brown To: Kuninori Morimoto In-Reply-To: <87sh82fqcc.wl%kuninori.morimoto.gx@renesas.com> Message-Id: Date: Fri, 13 Apr 2018 12:22:50 +0100 Cc: Mark Brown , Nguyen Viet Dung , "Yokoyama \(Renesas\)" , alsa-devel@alsa-project.org Subject: [alsa-devel] Applied "ASoC: rsnd: add RSND_GEN3 for R-Car Gen3" to the asoc tree X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org The patch ASoC: rsnd: add RSND_GEN3 for R-Car Gen3 has been applied to the asoc tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From 53041ccf8b8883d2e22525d36ddfff16b80541b6 Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto Date: Wed, 11 Apr 2018 02:10:29 +0000 Subject: [PATCH] ASoC: rsnd: add RSND_GEN3 for R-Car Gen3 rsnd driver is supporting Gen3. The difference between Gen1 and Gen2 were very big, but, between Gen2 and Gen3 are not so much. Thus, it is assuming Gen2 and Gen3 have compatible, therefore, there is no RSND_GEN3 and rsnd_is_gen3() macro. But in the future, it will need Gen2 and Gen3 different operation, and for Gen4. This patch adds missing RSND_GEN3 and rsnd_is_gen3() macro. Signed-off-by: Kuninori Morimoto Tested-by: Nguyen Viet Dung Signed-off-by: Mark Brown --- sound/soc/sh/rcar/core.c | 2 +- sound/soc/sh/rcar/dma.c | 4 ++-- sound/soc/sh/rcar/gen.c | 3 ++- sound/soc/sh/rcar/rsnd.h | 2 ++ 4 files changed, 7 insertions(+), 4 deletions(-) -- 2.17.0 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c index 6a76688a8ba9..47a55d6bfd80 100644 --- a/sound/soc/sh/rcar/core.c +++ b/sound/soc/sh/rcar/core.c @@ -111,7 +111,7 @@ static const struct of_device_id rsnd_of_match[] = { { .compatible = "renesas,rcar_sound-gen1", .data = (void *)RSND_GEN1 }, { .compatible = "renesas,rcar_sound-gen2", .data = (void *)RSND_GEN2 }, - { .compatible = "renesas,rcar_sound-gen3", .data = (void *)RSND_GEN2 }, /* gen2 compatible */ + { .compatible = "renesas,rcar_sound-gen3", .data = (void *)RSND_GEN3 }, {}, }; MODULE_DEVICE_TABLE(of, rsnd_of_match); diff --git a/sound/soc/sh/rcar/dma.c b/sound/soc/sh/rcar/dma.c index 41de23417c4a..32ac97be26f1 100644 --- a/sound/soc/sh/rcar/dma.c +++ b/sound/soc/sh/rcar/dma.c @@ -695,7 +695,7 @@ static int rsnd_dma_alloc(struct rsnd_dai_stream *io, struct rsnd_mod *mod, rsnd_dma_of_path(mod, io, is_play, &mod_from, &mod_to); - /* for Gen2 */ + /* for Gen2 or later */ if (mod_from && mod_to) { ops = &rsnd_dmapp_ops; attach = rsnd_dmapp_attach; @@ -773,7 +773,7 @@ int rsnd_dma_probe(struct rsnd_priv *priv) return 0; /* - * for Gen2 + * for Gen2 or later */ res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "audmapp"); dmac = devm_kzalloc(dev, sizeof(*dmac), GFP_KERNEL); diff --git a/sound/soc/sh/rcar/gen.c b/sound/soc/sh/rcar/gen.c index f04c4100043a..25642e92dae0 100644 --- a/sound/soc/sh/rcar/gen.c +++ b/sound/soc/sh/rcar/gen.c @@ -414,7 +414,8 @@ int rsnd_gen_probe(struct rsnd_priv *priv) ret = -ENODEV; if (rsnd_is_gen1(priv)) ret = rsnd_gen1_probe(priv); - else if (rsnd_is_gen2(priv)) + else if (rsnd_is_gen2(priv) || + rsnd_is_gen3(priv)) ret = rsnd_gen2_probe(priv); if (ret < 0) diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h index ab4d55548ed1..b1896f1eb214 100644 --- a/sound/soc/sh/rcar/rsnd.h +++ b/sound/soc/sh/rcar/rsnd.h @@ -538,6 +538,7 @@ struct rsnd_priv { #define RSND_GEN_MASK (0xF << 0) #define RSND_GEN1 (1 << 0) #define RSND_GEN2 (2 << 0) +#define RSND_GEN3 (3 << 0) /* * below value will be filled on rsnd_gen_probe() @@ -609,6 +610,7 @@ struct rsnd_priv { #define rsnd_is_gen1(priv) (((priv)->flags & RSND_GEN_MASK) == RSND_GEN1) #define rsnd_is_gen2(priv) (((priv)->flags & RSND_GEN_MASK) == RSND_GEN2) +#define rsnd_is_gen3(priv) (((priv)->flags & RSND_GEN_MASK) == RSND_GEN3) #define rsnd_flags_has(p, f) ((p)->flags & (f)) #define rsnd_flags_set(p, f) ((p)->flags |= (f))