From patchwork Mon Jun 18 12:00:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 138908 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp3867735lji; Mon, 18 Jun 2018 05:02:50 -0700 (PDT) X-Google-Smtp-Source: ADUXVKKpuqWeqras1vG9RVex6Muw1gI/dI5hsMbXLHmkKWvKTvwMQHoV+l5ORfoOoQL2kfkqFjy3 X-Received: by 2002:adf:96ad:: with SMTP id u42-v6mr10496819wrb.184.1529323370243; Mon, 18 Jun 2018 05:02:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529323370; cv=none; d=google.com; s=arc-20160816; b=g1OpX3tVTkFNVvWe227xBKXHQDhYvbJS6AhcJmLxXl5HdFpLF9a4WjW8OE35ahewA+ iii50dSUJMzSh9iZ+E0iDPsUze4ETzxneMD2sJqrFYI2EjfJy349zkHISs55qt1Pr73V kwTPRJHqp7e2lISEJsxL7ZLBEclmAopdQXy3F3gE9s3fzhVp3mHUVf0QMeUFHGKUEcHt fN5/U3T7hGSiW0hlsY7gFmEPtCxgTCmsE0powH/+AK6KFI183GtC8Y57CNx8b8mHY2KQ CU72gDMixCLBfqRWKJy0rkYafgpo1sT+dtvSWSo7PUpEURogQkm/2/EE9nfniG+O1fI/ l+Eg== 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=KESruAgSrOp7d4QcKZEd1eEUqiEU8DiQMiNZffdt3P4=; b=nwJ8S7HXJwdzIvVSglEmyCqeyjpo+1RkkibROAT30lUAjW/zTCcH5lppYq20r0jUGJ 2ViqAgx/wJXk6DzH+cRBxt1taHgg79HAQYRZqSSB9n0JI0wgKtVGrdu7yydO1RIpD9R+ 6NK2NSVYdtuMN0V/yWpjPcRdLFN58Qarvt+KWxVCYHmZtK/7z/UjJrrx3YXpnDTzFfk+ 9RVOrMT9sAP/GpA4ddrqIlGugpRgR/j/xHcz98xQUqTPgGy+4cxGnezGq4pR3sLtJiR0 CAgZL+v6oW6gD+1zwvbfAqhpEiUNDbzOrdDJdH2RFkAGQGVib0D6LQKf4ioeMfBb012L cxow== 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=Bd5nJUjR; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from alsa0.perex.cz (alsa0.perex.cz. [77.48.224.243]) by mx.google.com with ESMTP id 204-v6si7139605wmm.121.2018.06.18.05.02.49; Mon, 18 Jun 2018 05:02:50 -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=Bd5nJUjR; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 6424D26777B; Mon, 18 Jun 2018 14:00:45 +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 BC93D267770; Mon, 18 Jun 2018 14:00:40 +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 352DE267747 for ; Mon, 18 Jun 2018 14:00:33 +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=pMs+85px+z/cmJN9JjB588rgyiBr5yyUzRYOZpZ7Rzo=; b=Bd5nJUjRIePr UTe9e6xduSbfGCdpCoQouzz54ibs96i+2kIe23cB+rj7pHDy3dKgEvlBlVoA+9ycdprobS8zyxvhF QimTS4+zi1kIlUCFA3U7L8CbEuZleP8LVb3x/mufXwYMmmFNYAWxVO0P3MjL4lkaA0x51v7vkQ9OH xR7bI=; 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 1fUspj-0007zP-Ak; Mon, 18 Jun 2018 12:00:31 +0000 Received: from broonie by debutante with local (Exim 4.91) (envelope-from ) id 1fUspi-0000JR-TX; Mon, 18 Jun 2018 13:00:30 +0100 From: Mark Brown To: Kuninori Morimoto In-Reply-To: <87602osghu.wl%kuninori.morimoto.gx@renesas.com> Message-Id: Date: Mon, 18 Jun 2018 13:00:30 +0100 Cc: alsa-devel@alsa-project.org, Mark Brown , Hiroyuki Yokoyama Subject: [alsa-devel] Applied "ASoC: rsnd: has .symmetric_rates if SSIs are sharing WS pin" 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: has .symmetric_rates if SSIs are sharing WS pin 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 7cc90a5cadb1733d95d3c2bc147cbcf7843aa585 Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto Date: Tue, 12 Jun 2018 05:52:00 +0000 Subject: [PATCH] ASoC: rsnd: has .symmetric_rates if SSIs are sharing WS pin If SSIs are sharing WS pin, it should has .symmetric_rates. This patch sets it. Signed-off-by: Kuninori Morimoto Tested-by: Hiroyuki Yokoyama Signed-off-by: Mark Brown --- sound/soc/sh/rcar/core.c | 6 ++++++ sound/soc/sh/rcar/ssi.c | 5 +++-- 2 files changed, 9 insertions(+), 2 deletions(-) -- 2.17.1 _______________________________________________ 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 af04d41a4274..6bbdddef426e 100644 --- a/sound/soc/sh/rcar/core.c +++ b/sound/soc/sh/rcar/core.c @@ -1085,6 +1085,12 @@ static void __rsnd_dai_probe(struct rsnd_priv *priv, of_node_put(capture); } + if (rsnd_ssi_is_pin_sharing(io_capture) || + rsnd_ssi_is_pin_sharing(io_playback)) { + /* should have symmetric_rates if pin sharing */ + drv->symmetric_rates = 1; + } + dev_dbg(dev, "%s (%s/%s)\n", rdai->name, rsnd_io_to_mod_ssi(io_playback) ? "play" : " -- ", rsnd_io_to_mod_ssi(io_capture) ? "capture" : " -- "); diff --git a/sound/soc/sh/rcar/ssi.c b/sound/soc/sh/rcar/ssi.c index 9538f76f8e20..4e605648918b 100644 --- a/sound/soc/sh/rcar/ssi.c +++ b/sound/soc/sh/rcar/ssi.c @@ -1055,9 +1055,10 @@ struct rsnd_mod *rsnd_ssi_mod_get(struct rsnd_priv *priv, int id) int __rsnd_ssi_is_pin_sharing(struct rsnd_mod *mod) { - struct rsnd_ssi *ssi = rsnd_mod_to_ssi(mod); + if (!mod) + return 0; - return !!(rsnd_flags_has(ssi, RSND_SSI_CLK_PIN_SHARE)); + return !!(rsnd_flags_has(rsnd_mod_to_ssi(mod), RSND_SSI_CLK_PIN_SHARE)); } static u32 *rsnd_ssi_get_status(struct rsnd_dai_stream *io,