From patchwork Thu Feb 22 13:16:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 129239 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp587250lja; Thu, 22 Feb 2018 05:18:40 -0800 (PST) X-Google-Smtp-Source: AH8x224pGRD1g36wleBmSdiy1ZaVotupUYdYRdVbkNgtKP64fsAK70j54dDzGq4NxtjdbApMRn1g X-Received: by 10.223.196.6 with SMTP id v6mr6424230wrf.205.1519305520201; Thu, 22 Feb 2018 05:18:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519305520; cv=none; d=google.com; s=arc-20160816; b=mAzJX9v0vLDas9/7ZGTlRjiE0aiuw1y9w1M81i8o0HL7FJrAHc/+H6XMtLw3tvGFMX i0ceYv7DlpmfpTwRRdirW/M+2XtGUaKdOmGYYcr2+xuo/30jkmELb1kJ3iwqFqLfp5fA +mQroZ4dJyPg2v2tHAPjc/F7HEJj1zOJMkMlGBZdxIi1mj3mZ4PYTzHNZvebhn+8Q8vW cC2y7vPRLKW6A/o8EvPGiql/g96bqgX8WufSdVHZViW7ZcQdnYxku4fyAd2dWexenvQS G68jCJYZkWpg/z1A1IHQNhJunEePyXNPHvZcjIYho+fa+pcy3AR2CA5rA7LQL/LpTKV1 EhIA== 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=ThU0CT+RaeB+zHXi0HTY6QUmIDmXuaS4hzsCVZJuZsc=; b=vAjNwsEwTzv7qlAtaZ17ra86ECMHm47UOJnRZYkv12p0XXzMEPhb3pcH57yHEou2TK pxWFT4wG4/XbZfToj6TQaoK7E7NSGbCLn5pkoJiNLIw++f+z5CRWspfMhRFqi57VhRQW zreyQp3vVTMy1roJVWRzDu8K4C+rtqPls75dWd/isP5XD2h/TrzzNiDBgilIw9CxJ988 vOKNztlpZ1VOHbCkq/ol61gcgVuAXWlVi0X+KCeXXQ605fytgDsLL1TZiki3UijwyfTd p2/54YC9+vyqBMEOtYXMKegWS2Lll1Lg41ATJ24xhoA71GwmB11BuWwubAVJWzAHhS0B d5ig== 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=brBA5NRh; 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 w205si236978wmw.186.2018.02.22.05.18.40; Thu, 22 Feb 2018 05:18:40 -0800 (PST) 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=brBA5NRh; 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 59B232677E8; Thu, 22 Feb 2018 14:17:23 +0100 (CET) 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 0F5592677D5; Thu, 22 Feb 2018 14:17:19 +0100 (CET) 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, SPF_PASS, T_RP_MATCHES_RCVD 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 5D78C26778B for ; Thu, 22 Feb 2018 14:16:54 +0100 (CET) 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=58Gg8oCo9YzuiSHpVqHwg2TPzXpyE722p0LXCvo8Dtg=; b=brBA5NRhOvRL dyI+9PYH6tDxX/ng3nSTLFkr4volJa90Z0jGxhmdNzViH7uUIDoLP/4+sma/Uq8PBRMx0POBAFzxq Xo9sK3aQTmZNAVzSxKBQsPwtw61no7yovxet9NqLhBdQF0zkCA9b78aVbWdf7XD1pAXQCN2uWkXvt b2BU4=; 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 1eoqjr-0002Ur-HJ; Thu, 22 Feb 2018 13:16:43 +0000 Received: from broonie by debutante with local (Exim 4.90_1) (envelope-from ) id 1eoqjr-0006MG-1N; Thu, 22 Feb 2018 13:16:43 +0000 From: Mark Brown To: Nicolin Chen In-Reply-To: <1513702819-42310-7-git-send-email-nicoleotsuka@gmail.com> Message-Id: Date: Thu, 22 Feb 2018 13:16:43 +0000 Cc: mail@maciej.szmigiero.name, arnaud.mouiche@invoxia.com, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, timur@tabi.org, caleb@crome.org, lgirdwood@gmail.com, broonie@kernel.org, kernel@pengutronix.de, lukma@denx.de, fabio.estevam@nxp.com, linuxppc-dev@lists.ozlabs.org Subject: [alsa-devel] Applied "ASoC: fsl_ssi: Add DAIFMT define for AC97" 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: fsl_ssi: Add DAIFMT define for AC97 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 b6c93f7f60a0d0b61c1fce2872b9d4f7263d6ec2 Mon Sep 17 00:00:00 2001 From: Nicolin Chen Date: Mon, 12 Feb 2018 14:03:16 -0800 Subject: [PATCH] ASoC: fsl_ssi: Add DAIFMT define for AC97 The _fsl_ssi_set_dai_fmt() bypasses an undefined format for AC97 mode. However, it's not really necessary if AC97 has its complete format defined. So this patch adds a DAIFMT macro of complete format including a clock direction and polarity. Signed-off-by: Nicolin Chen Tested-by: Caleb Crome Tested-by: Maciej S. Szmigiero Reviewed-by: Maciej S. Szmigiero Signed-off-by: Mark Brown --- sound/soc/fsl/fsl_ssi.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) -- 2.16.1 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c index 9f024a9afaa5..fc5768d243d1 100644 --- a/sound/soc/fsl/fsl_ssi.c +++ b/sound/soc/fsl/fsl_ssi.c @@ -90,6 +90,16 @@ SNDRV_PCM_FMTBIT_S24_LE) #endif +/* + * In AC97 mode, TXDIR bit is forced to 0 and TFDIR bit is forced to 1: + * - SSI inputs external bit clock and outputs frame sync clock -- CBM_CFS + * - Also have NB_NF to mark these two clocks will not be inverted + */ +#define FSLSSI_AC97_DAIFMT \ + (SND_SOC_DAIFMT_AC97 | \ + SND_SOC_DAIFMT_CBM_CFS | \ + SND_SOC_DAIFMT_NB_NF) + #define FSLSSI_SIER_DBG_RX_FLAGS \ (SSI_SIER_RFF0_EN | \ SSI_SIER_RLS_EN | \ @@ -964,8 +974,7 @@ static int _fsl_ssi_set_dai_fmt(struct device *dev, scr &= ~SSI_SCR_SYS_CLK_EN; break; default: - if (!fsl_ssi_is_ac97(ssi)) - return -EINVAL; + return -EINVAL; } stcr |= strcr; @@ -1372,7 +1381,7 @@ static int fsl_ssi_probe(struct platform_device *pdev) sprop = of_get_property(np, "fsl,mode", NULL); if (sprop) { if (!strcmp(sprop, "ac97-slave")) - ssi->dai_fmt = SND_SOC_DAIFMT_AC97; + ssi->dai_fmt = FSLSSI_AC97_DAIFMT; } /* Select DMA or FIQ */