From patchwork Tue Dec 19 17:00:10 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolin Chen X-Patchwork-Id: 10123791 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 60281603B5 for ; Tue, 19 Dec 2017 17:02:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3F4FC290EB for ; Tue, 19 Dec 2017 17:02:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 33ECF29120; Tue, 19 Dec 2017 17:02:46 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, T_DKIM_INVALID autolearn=no version=3.3.1 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 67CA3290EB for ; Tue, 19 Dec 2017 17:02:45 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id DED532676FD; Tue, 19 Dec 2017 18:01:20 +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 C02742676EB; Tue, 19 Dec 2017 18:01:16 +0100 (CET) Received: from mail-pl0-f68.google.com (mail-pl0-f68.google.com [209.85.160.68]) by alsa0.perex.cz (Postfix) with ESMTP id 569762676E2 for ; Tue, 19 Dec 2017 18:01:14 +0100 (CET) Received: by mail-pl0-f68.google.com with SMTP id s10so7317806plj.5 for ; Tue, 19 Dec 2017 09:01:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=sablbdllq5PPjBJf69WCrqSj38LhJ7W2QwG+4NmPkOI=; b=kcf6ZKrTU+deKSwH3csxbaQu35OBK7IyK8mNXKRR2o81K6dfZbmPqHvTbXIjGIw/zC s2UcJCMlGLNW4FlYKsVVPh2h0ZnkJw0WUfWqe4piR4eW6aqvEUq2bfkLgAQLk09RVNlY 1U+bpmdoFS8qj0mGVdKxGnnLi/ilKVW/DpvIvoybzs5L5z0PYji9hlSLhjUFkfyRqHt2 BMq0SirVpzov+ps1mrrK0zQsRvS40/LfWKAD9l60IYEHlVniwD/zgtN+stijP81RTQeV PK0iDQ4xmvaEnAlsFulWWtSAcNrtqG1TXnnGI5N1btsR90kYVk7IJlNoSamlPHMNLdgO tipg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=sablbdllq5PPjBJf69WCrqSj38LhJ7W2QwG+4NmPkOI=; b=QXzrfbPEq9/hNDGWgP0UvQDOzZRR2ucwzi2DvPmtZMm/RB9RqcLrkT3KzLRhIX3LYl maBAHQrdfv6JRa6fbzOPgIzeNzJJrEWrbKcZm3LYoRC0a8qLsxGo0BWLnrOTrj6ZF3fQ 8gCIlDWJA2zuBfvG5tzWqlveRLCGDa9kQ6aXvlRFM8mEOoL/mJiiwhSG5rpQ4iM9BcaT HYAhvf5z4mEuZ8PGXcdsbByM07554ZOWnuh8xc/zP0ptxYQ0sCAhVsyIZwePQfT+B6j3 ZmzAlwJgamHRLSwWGBdAdKFei6gjYSSGuP2MEpZMAXQAsa5tsyZDWRZ0OA/G11/pfe5b 2YLw== X-Gm-Message-State: AKGB3mLNcQzYCPTtYGkdRoM99aMWW3ApuO27b23/HevRVE5edIixR6VO Hkm8mSUWyc+XM4RubNsu8hhlvg== X-Google-Smtp-Source: ACJfBotE1e3uvuJ2thbcPQQgzym9TJomgfT/hQGqrGlGRLN+SX+HMzvNdjtuuQutF+NPVMg4Xhuj0w== X-Received: by 10.84.193.129 with SMTP id f1mr3872303pld.355.1513702873189; Tue, 19 Dec 2017 09:01:13 -0800 (PST) Received: from Asurada-CZ80.localdomain (c-73-231-2-134.hsd1.ca.comcast.net. [73.231.2.134]) by smtp.gmail.com with ESMTPSA id q9sm34490181pfl.116.2017.12.19.09.01.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 19 Dec 2017 09:01:12 -0800 (PST) From: Nicolin Chen To: timur@tabi.org, broonie@kernel.org Date: Tue, 19 Dec 2017 09:00:10 -0800 Message-Id: <1513702819-42310-7-git-send-email-nicoleotsuka@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1513702819-42310-1-git-send-email-nicoleotsuka@gmail.com> References: <1513702819-42310-1-git-send-email-nicoleotsuka@gmail.com> Cc: mail@maciej.szmigiero.name, kernel@pengutronix.de, lgirdwood@gmail.com, alsa-devel@alsa-project.org, caleb@crome.org, linux-kernel@vger.kernel.org, arnaud.mouiche@invoxia.com, lukma@denx.de, fabio.estevam@nxp.com, linuxppc-dev@lists.ozlabs.org Subject: [alsa-devel] [PATCH v1 06/15] ASoC: fsl_ssi: Add DAIFMT define for AC97 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 X-Virus-Scanned: ClamAV using ClamSMTP 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 --- sound/soc/fsl/fsl_ssi.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c index d8c8656..2d9d81d 100644 --- a/sound/soc/fsl/fsl_ssi.c +++ b/sound/soc/fsl/fsl_ssi.c @@ -86,6 +86,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 | \ @@ -954,8 +964,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; @@ -1362,7 +1371,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 */