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: 850974 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3z1QNC04z2z9t2f for ; Wed, 20 Dec 2017 04:47:39 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="MidAirCE"; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3z1QNB4rPbzDqhq for ; Wed, 20 Dec 2017 04:47:38 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="MidAirCE"; dkim-atps=neutral X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gmail.com (client-ip=2607:f8b0:400e:c00::243; helo=mail-pf0-x243.google.com; envelope-from=nicoleotsuka@gmail.com; receiver=) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="MidAirCE"; dkim-atps=neutral Received: from mail-pf0-x243.google.com (mail-pf0-x243.google.com [IPv6:2607:f8b0:400e:c00::243]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3z1PLp2rwjzDx6D for ; Wed, 20 Dec 2017 04:01:22 +1100 (AEDT) Received: by mail-pf0-x243.google.com with SMTP id u25so11368708pfg.5 for ; Tue, 19 Dec 2017 09:01:22 -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=c+XQvw6ldbHm4xrLTpwlQCRmHNtQL5D1/yQzOenp5uFcw3VjWYCYlBIMv8cW8cZ8RL h1i2xyIymnkYmjEc0d1gGxb6xcQma/JMqaGf2jYgCRDIlVOTKoLZzcAPlxwLX/pi8eRG JjQb5JDBQ9P+cbky+ZTmYYMGn0jnGy4zwNOFbFG/GhMM80oo14+GUS9CaIc2fT3/0xoN 8XrlyPXPoOUEcDALLLOmxMydSfv8/TIzGSo1PRQj0XQSsnEwqCCO+DI8eDF0s06Up2wI vLVpE2kd81bzZonbQlIJAwPZVQAcYZVY33aBBWKQBfJJ3xIeitwyIwwxQebX0tSY7YDH Da4w== X-Gm-Message-State: AKGB3mJROhtn24H+FapVqy7drC7Si2IW8L57GJSYKWXlFuC8dliZFsAe UM8C71jvTO1QIy26/TEOQk4= 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 Subject: [PATCH v1 11/15] ASoC: fsl_ssi: Setup AC97 in dai_probe() 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> X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.24 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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 Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" 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;