From patchwork Mon Nov 27 18:52:47 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 119775 Delivered-To: patch@linaro.org Received: by 10.80.225.132 with SMTP id k4csp2101819edl; Mon, 27 Nov 2017 10:55:46 -0800 (PST) X-Google-Smtp-Source: AGs4zMZKFIr12sxBzaVnVj8vxYuU9SA9XdqjiF/o+Tg2EVgUad7vmnMOsfVsFztH9f5wAoO06nD9 X-Received: by 10.223.134.75 with SMTP id 11mr34849175wrw.37.1511808946444; Mon, 27 Nov 2017 10:55:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1511808946; cv=none; d=google.com; s=arc-20160816; b=YCic/TxPpszXxYTNPyjGsw2QTlTwaE7vWlSBvm5feZmTtMGze+LQ13EFK4qcDgVoB2 H79Lmdg8GYcWjjbTQOg7NrZ2q5hMumX6qQGu0nVmAc8Ra3dfinNRoOPqXXnQk+e0ez9y C4eLCFlvd3JaCCPGvRySHBuLsYh2hIWwewEVIzFX8y4EH1sUwrsxTszz9B+SHqf6wuhy o35la+1bMTvczhsP0hkPSHH3jBvFPFg7J9fo+QpsV307zMtvd2A2b+Q7HM5OedsQgycO x2Bwqenn5KwXK+xN5FRML25ADP+d8tS3SPmNUA6bRzL3TLpLsqjbcmhcuElm/7ik66j2 p9GA== 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=Z4cgpZ2+hv7O8cdkThupwnlotyAuEt6wHM0V0zlHcgU=; b=W3Qv/GUZ48nQOxfWOj8ABirMdPtNlNqoalKImxcYX+TPvs152LUuTLz7FugEczlP3P X2lJN8uqhsv8YncA5a/ddQF7zqlxReYUaclIfg0clfFZIXF93VE/O4ROdIfCwhspMpQ3 z3g7uBVkiiTsHvHOOZIjfYJ54Q5radvfHaVkiuo6XD7yi/xi3AC9s2ddjnOpqikcB2V8 eZhxowiLSELcYvrPLxmG77J4AcAXnt5FAYDdUqNGOPK1BCPe+NoDbF0r7y4jL79siHWN ZXDKc4ALLnTmpvdNRvWDNXi2CQ55qXkYJryUCmVTvLYyLG+Ic6lsKdlQ9LkHZinln/HY NGaA== 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=W1nKCGQ3; 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 k124si11626024wmb.56.2017.11.27.10.55.46; Mon, 27 Nov 2017 10:55:46 -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=W1nKCGQ3; 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 48F67267657; Mon, 27 Nov 2017 19:53:39 +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 DAF48267657; Mon, 27 Nov 2017 19:53:38 +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.0 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 CA0EE267589 for ; Mon, 27 Nov 2017 19:52: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=SSMOeLzMdF8FrvGt7SjkQV+X6nCNM4t2ywpGtsSUky8=; b=W1nKCGQ31dW4 Ua0iXcHP5FTSrZKZvclYIqBO2dXN/5fd1pQ9m3/3EpUmX85ZuKt1Yuxq+kiVeSrr7kGHttKDKCpDE 3ejcsWQqZbb0mi6aImWhnCAreWxm6iICaMaPkP7KKcARojg9uKYbjXeQtNhsGpDQCXyrXFsBy9BuR Hx8zY=; 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 1eJOWN-000717-Tu; Mon, 27 Nov 2017 18:52:48 +0000 Received: from broonie by debutante with local (Exim 4.89) (envelope-from ) id 1eJOWN-00073R-Gi; Mon, 27 Nov 2017 18:52:47 +0000 From: Mark Brown To: Maciej S. Szmigiero In-Reply-To: Message-Id: Date: Mon, 27 Nov 2017 18:52:47 +0000 Cc: alsa-devel@alsa-project.org, Xiubo Li , Liam Girdwood , Takashi Iwai , Timur Tabi , stable@vger.kernel.org, linux-kernel , Nicolin Chen , Mark Brown , Fabio Estevam , linuxppc-dev@lists.ozlabs.org Subject: [alsa-devel] Applied "ASoC: fsl_ssi: AC'97 ops need regmap, clock and cleaning up on failure" 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: AC'97 ops need regmap, clock and cleaning up on failure 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 695b78b548d8a26288f041e907ff17758df9e1d5 Mon Sep 17 00:00:00 2001 From: "Maciej S. Szmigiero" Date: Mon, 20 Nov 2017 23:14:55 +0100 Subject: [PATCH] ASoC: fsl_ssi: AC'97 ops need regmap, clock and cleaning up on failure AC'97 ops (register read / write) need SSI regmap and clock, so they have to be set after them. We also need to set these ops back to NULL if we fail the probe. Signed-off-by: Maciej S. Szmigiero Acked-by: Nicolin Chen Signed-off-by: Mark Brown Cc: stable@vger.kernel.org --- sound/soc/fsl/fsl_ssi.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) -- 2.15.0 _______________________________________________ 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 f2f51e06e22c..c3a83ed0297e 100644 --- a/sound/soc/fsl/fsl_ssi.c +++ b/sound/soc/fsl/fsl_ssi.c @@ -1458,12 +1458,6 @@ static int fsl_ssi_probe(struct platform_device *pdev) sizeof(fsl_ssi_ac97_dai)); fsl_ac97_data = ssi_private; - - ret = snd_soc_set_ac97_ops_of_reset(&fsl_ssi_ac97_ops, pdev); - if (ret) { - dev_err(&pdev->dev, "could not set AC'97 ops\n"); - return ret; - } } else { /* Initialize this copy of the CPU DAI driver structure */ memcpy(&ssi_private->cpu_dai_drv, &fsl_ssi_dai_template, @@ -1574,6 +1568,14 @@ static int fsl_ssi_probe(struct platform_device *pdev) return ret; } + if (fsl_ssi_is_ac97(ssi_private)) { + ret = snd_soc_set_ac97_ops_of_reset(&fsl_ssi_ac97_ops, pdev); + if (ret) { + dev_err(&pdev->dev, "could not set AC'97 ops\n"); + goto error_ac97_ops; + } + } + ret = devm_snd_soc_register_component(&pdev->dev, &fsl_ssi_component, &ssi_private->cpu_dai_drv, 1); if (ret) { @@ -1657,6 +1659,10 @@ static int fsl_ssi_probe(struct platform_device *pdev) fsl_ssi_debugfs_remove(&ssi_private->dbg_stats); error_asoc_register: + if (fsl_ssi_is_ac97(ssi_private)) + snd_soc_set_ac97_ops(NULL); + +error_ac97_ops: if (ssi_private->soc->imx) fsl_ssi_imx_clean(pdev, ssi_private);