From patchwork Fri Oct 19 12:34:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 149278 Delivered-To: patch@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp3250195lji; Fri, 19 Oct 2018 05:35:09 -0700 (PDT) X-Google-Smtp-Source: ACcGV62W8FlFkFmoRMD3qyMisxtbFTeMU5Qk/WwiezlGAYlTvQbBRq5uNuG9OkQITpPc/uXi+qWH X-Received: by 2002:a1c:f003:: with SMTP id a3-v6mr4771031wmb.50.1539952509121; Fri, 19 Oct 2018 05:35:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1539952509; cv=none; d=google.com; s=arc-20160816; b=cxTzUrwNqxp9W2lVV7NIYj0s7TCoLztal5nFEDmhbNUBmwGzlawCu6czbDKmxp0dLk WkoThZRdCWBA161S9x8gObEmnxx+hnNLt8DDjmxSJYwB0PY9v6LaAaSVRiW/6FQCPRJI FVg9omZBhx6J3LZxOWg4+y0qkz08EOgIksag+/7OijJLiTQlNP+N1TAtUgJmCLtOwykD onGnUW+X54SGQT4u8U3xKXkmgC6xN5ZMON3zHOPVcKMAkzvS21F803p2n++SIgJUuiMg Bvc15jcZ0DtxMTf9tSxK7R3A4dl6CP+SpPtl11Bln3WQ+sT6WlrbnJU0bypV913x0yec miqw== 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; bh=zYu9ZqxEiTqG8PL9Bf8eR2yWQam+lOh4uxv+4FqtRfg=; b=Mo3vm8zbCaHSsdHJLnB4K1DzzQE6sTkCe5KR91ZFaXeuDFYv1vEw+KRLfgd5/MdnBe pmKXHXYtGgqyQLmwHD+VsYLbof+I2kuJ6UBkF+G64wlssqpyq57Ggvd9OkRpPJBa3wH4 +S0rb1hgSgRE5ydVDsCYGnfCWD2FlF3LudeXGXbvUQUlBUZDFUxB0miUT3n69vu9/Eie Kv5PDYD2I+dHuU4FciXuE+U95+XqGSdYrlgsc2XCk7lG7bCLEUy87CAkGCzhKEawNM2q sr3xY7fkv/mduvVmfeO4LIJ/IHm/Uxx90VWJPyBcuw+GCC1peN88rzBzjNuojK5Ab7CW ibNQ== 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=a01oXa0X; 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 z5-v6si20265859wre.368.2018.10.19.05.35.08; Fri, 19 Oct 2018 05:35:09 -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=a01oXa0X; 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 CEDC5267A86; Fri, 19 Oct 2018 14:34:43 +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 77E41267A76; Fri, 19 Oct 2018 14:34:41 +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 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 EB8C6267950 for ; Fri, 19 Oct 2018 14:34:39 +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=tpJZ0tah3S9f6FNc4q0SbgfKXGgYzuWkGAzLu1JIYp0=; b=a01oXa0XUU2Z 5O4SgIGMsb57Q9udAHGYjxDp3wt54CGhrzuNy5MAZKIWFfUhDBuWW2Ux8wDNaCNfyPCxE5s3GbZLV +gGMhuJzcXRPs7DZbI0txliquLzmcw9uJFqQO0uU1nImwP+QHE0M2sMbE4dUpYfiwJHNokreSDxAD +HK2k=; Received: from cpc102320-sgyl38-2-0-cust46.18-2.cable.virginm.net ([82.37.168.47] helo=debutante.sirena.org.uk) by heliosphere.sirena.org.uk with esmtpa (Exim 4.89) (envelope-from ) id 1gDTzD-00007z-PZ; Fri, 19 Oct 2018 12:34:39 +0000 Received: by debutante.sirena.org.uk (Postfix, from userid 1000) id 7C76B1122548; Fri, 19 Oct 2018 13:34:39 +0100 (BST) From: Mark Brown To: Kuninori Morimoto In-Reply-To: Message-Id: <20181019123439.7C76B1122548@debutante.sirena.org.uk> Date: Fri, 19 Oct 2018 13:34:39 +0100 (BST) Cc: alsa-devel@alsa-project.org, Mark Brown Subject: [alsa-devel] Applied "ASoC: rsnd: enable TDM settings for SSI parent" 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: enable TDM settings for SSI parent 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 6817d7593f3e3c8a9c11e7a07cb5646c70371f0a Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto Date: Wed, 17 Oct 2018 01:55:37 +0000 Subject: [PATCH] ASoC: rsnd: enable TDM settings for SSI parent Some SSIs are sharing each pins (= WS/CLK pin for playback/capture). Then, SSI parent needs control WS/CLK setting for SSI slave. In such case, SSI parent needs TDM settings if SSI slave is working as TDM mode. But it is not cared in current driver. It can't capture TDM sound without this patch if SSIs were pin sharing. This patch is tested on R-Car H3 ulcb-kf board, SSI3/4 with TDM sound. Signed-off-by: Kuninori Morimoto Signed-off-by: Mark Brown --- sound/soc/sh/rcar/ssi.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) -- 2.19.0.rc2 _______________________________________________ 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/ssi.c b/sound/soc/sh/rcar/ssi.c index 3adcc4f778f7..b42a0e0feab7 100644 --- a/sound/soc/sh/rcar/ssi.c +++ b/sound/soc/sh/rcar/ssi.c @@ -399,6 +399,17 @@ static void rsnd_ssi_config_init(struct rsnd_mod *mod, if (rdai->sys_delay) cr_own |= DEL; + /* + * TDM Mode + * see + * rsnd_ssiu_init_gen2() + */ + wsr = ssi->wsr; + if (is_tdm) { + wsr |= WS_MODE; + cr_own |= CHNL_8; + } + /* * We shouldn't exchange SWSP after running. * This means, parent needs to care it. @@ -429,16 +440,6 @@ static void rsnd_ssi_config_init(struct rsnd_mod *mod, cr_mode = DIEN; /* PIO : enable Data interrupt */ } - /* - * TDM Extend Mode - * see - * rsnd_ssiu_init_gen2() - */ - wsr = ssi->wsr; - if (is_tdm) { - wsr |= WS_MODE; - cr_own |= CHNL_8; - } init_end: ssi->cr_own = cr_own; ssi->cr_mode = cr_mode;