From patchwork Tue Dec 19 17:00:15 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolin Chen X-Patchwork-Id: 10123809 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 5F918603B5 for ; Tue, 19 Dec 2017 17:04:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 42B602903E for ; Tue, 19 Dec 2017 17:04:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 37536290F6; Tue, 19 Dec 2017 17:04:10 +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 7912E2903E for ; Tue, 19 Dec 2017 17:04:09 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 55D18267737; Tue, 19 Dec 2017 18:01:29 +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 B379C26770B; Tue, 19 Dec 2017 18:01:24 +0100 (CET) Received: from mail-pf0-f194.google.com (mail-pf0-f194.google.com [209.85.192.194]) by alsa0.perex.cz (Postfix) with ESMTP id 3949A267700 for ; Tue, 19 Dec 2017 18:01:20 +0100 (CET) Received: by mail-pf0-f194.google.com with SMTP id a90so11381441pfk.1 for ; Tue, 19 Dec 2017 09:01:19 -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=D065w8/wqW2UndXjYQBEmKZZshDVpsbMCdjrhtG4/OI=; b=MidAirCEpOb1InjuBvonBN4eq5s9Q4Nh6io4ooeDLQ4/shaJ9UDHc0B8Im7KP5CWGG hSgYxMM+ojVkhcfMDoOiF+XgQ48nIPKFaQqrueJhrNkeRtnBd4OSOAddlAhrFa3NUlKV kD7yP76ZfdrZfopBh+yydbWaYy8I+qZ43H5vSszvmYJJIYCObVFmEipTnmnukBLJ7Ox4 D/YOoYrirmGyGqG7Ie6iBvdFY7aQzXdSQZ3jopDuiDVylSg8EqU6YZa9oMAgHs5PzMeu tv5tRIPgePTFFbuOTsQOqfdHwCPcRLdQANQNIZChAL+x91IWQdH0s/xGyvYxrNuxoGgH 3lSQ== 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=D065w8/wqW2UndXjYQBEmKZZshDVpsbMCdjrhtG4/OI=; b=Ni4neWvdCeYVsOjSE3IZYCB+PBlxenS9V4PheW3hYlhlZWeaC331waL5Ll66Z8dvLm Et9LB3C4rhm9rmmkMLZKUkUi9ysLC6kvBZTH8BSAyjRDRwBvAwv0xCya/DeqibAzuN8W tqZWel+VaYs5UsUSh+Pzf2NBKK1jKXIu5JgM9P4AqYPmISXgXWD0Wd9RQ62vqvGMqqC6 DVvlJPzFvh0WbkV/3L911b33LdUd5/yqJpWT0DBC70ldTV5lCQq18Ikx3RtkuOzEDpIZ yWTbngI6wdDyKoWyBWGIl/llw75SpqMyWTBzCcNt9TAGdRsViVDZeRg5pu+uBkd2v7k/ Hq8g== X-Gm-Message-State: AKGB3mJHzsTVBymjXMotXfdd4/WonuGt6KZREyS2EEnCGAq8FGYQMvOl q1x6H1sTYU97zeK+hSHOePI= X-Google-Smtp-Source: ACJfBotOuzC3Ns5q3NhrOJp5ue1pFNdbFQvGXFS4JrpZS7JiVc5AHVusx2rlVr50XbZz4CeMduzuqg== X-Received: by 10.98.19.202 with SMTP id 71mr3865683pft.181.1513702878955; Tue, 19 Dec 2017 09:01:18 -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.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 19 Dec 2017 09:01:18 -0800 (PST) From: Nicolin Chen To: timur@tabi.org, broonie@kernel.org Date: Tue, 19 Dec 2017 09:00:15 -0800 Message-Id: <1513702819-42310-12-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 11/15] ASoC: fsl_ssi: Setup AC97 in dai_probe() 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 AC97 configures some registers earlier to start a communication with CODECs, so this patch moves those register settings to the dai_probe() as well, along with other register configurations. It also applies _fsl_ssi_set_dai_fmt() to AC97 only since other formats would be configured via fsl_ssi_set_dai_fmt() directly. Meanwhile, this patch adds fsl_ssi_dai_ac97_remove() to cleanup some control bits for AC97. Signed-off-by: Nicolin Chen --- sound/soc/fsl/fsl_ssi.c | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c index 4673709..2fdae78 100644 --- a/sound/soc/fsl/fsl_ssi.c +++ b/sound/soc/fsl/fsl_ssi.c @@ -977,9 +977,6 @@ static int _fsl_ssi_set_dai_fmt(struct device *dev, regmap_write(regs, REG_SSI_SRCR, srcr); regmap_write(regs, REG_SSI_SCR, scr); - if ((fmt & SND_SOC_DAIFMT_FORMAT_MASK) == SND_SOC_DAIFMT_AC97) - fsl_ssi_setup_ac97(ssi); - return 0; } @@ -1108,6 +1105,26 @@ static int fsl_ssi_dai_probe(struct snd_soc_dai *dai) regmap_update_bits(ssi->regs, REG_SSI_SCR, SSI_SCR_TCH_EN, SSI_SCR_TCH_EN); + /* AC97 should start earlier to communicate with CODECs */ + if (fsl_ssi_is_ac97(ssi)) { + _fsl_ssi_set_dai_fmt(ssi->dev, ssi, ssi->dai_fmt); + fsl_ssi_setup_ac97(ssi); + } + + return 0; +} + +/** + * Disable register bits for AC97 + */ +static int fsl_ssi_dai_ac97_remove(struct snd_soc_dai *dai) +{ + struct fsl_ssi *ssi = snd_soc_dai_get_drvdata(dai); + + regmap_write(ssi->regs, REG_SSI_SCR, 0); + regmap_write(ssi->regs, REG_SSI_SACNT, 0); + regmap_write(ssi->regs, REG_SSI_SOR, 0); + return 0; } @@ -1147,6 +1164,7 @@ static const struct snd_soc_component_driver fsl_ssi_component = { static struct snd_soc_dai_driver fsl_ssi_ac97_dai = { .bus_control = true, .probe = fsl_ssi_dai_probe, + .remove = fsl_ssi_dai_ac97_remove, .playback = { .stream_name = "AC97 Playback", .channels_min = 2, @@ -1524,9 +1542,6 @@ static int fsl_ssi_probe(struct platform_device *pdev) } done: - if (ssi->dai_fmt) - _fsl_ssi_set_dai_fmt(dev, ssi, ssi->dai_fmt); - if (fsl_ssi_is_ac97(ssi)) { u32 ssi_idx;