From patchwork Wed Oct 4 11:27:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 9984327 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 0C1EC6028E for ; Wed, 4 Oct 2017 11:29:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0013828A9A for ; Wed, 4 Oct 2017 11:29:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E849528AD0; Wed, 4 Oct 2017 11:29:38 +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=-4.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 6E8BC28A9A for ; Wed, 4 Oct 2017 11:29:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Date:Message-Id: In-Reply-To:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: References:List-Owner; bh=jeRNBzdcPbmJ8YtDlXxiCldh4Y1TeWxv114z0015Akg=; b=Ov7 9KwPCJcN59VtoEQo2ahEOYqHE9s1KsZdmTSyYXVHtWk1RN41/nT6Hiw8f923vO0CBqkGQal48SIBp O82aij3K/UTC3Myw5mChj5Jq7Am41WqJWIHjJUhqgQLzY1eA7ZDKdlAkLCaWCifCualnXP3A8RpMy rlQ7qc0H20ZduEkb5FEQVvAruDa3rhxCSuLd8G8nGS74gnwuXVGMI2mXllPh8RwNJbu6exSrUySsN oZjTiUHHOy+9VbIfSKtbIsaY6/oWGSPGOm61TYrh897l7Duu+/7uOj3suhVCDjcERKX2Xr9SP/OTZ 7qAm3MPo+XUjlj6/dfS1DhAMb6OYeSA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dzhro-0007We-MH; Wed, 04 Oct 2017 11:29:32 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dzhrU-0007Cv-T7 for linux-arm-kernel@bombadil.infradead.org; Wed, 04 Oct 2017 11:29:13 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; 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=wkRDvYbY6foYkvH3V0SM5lZEeIBDj2qdjgdcSn4pwfI=; b=RyQLGAB5ILxnJRVPIPyihvMFrd RuKrX1PlWmyW4RVDZ7Ma2nIVCTlTzhcZQ38tb9FAVd2J8nz6ucyKX5gpm6rFCxZvXsFej22iop0EG uuEAiXB/QKaBETObofXmb1um4TaH5rQQG945591pbos1TzoeyBQb0sYP0UFWdw5Jkvw4IsDzwlcHO AbVgjY2mhXEFd3MRQw01wN9EIS+y6HELS9H9e97EKaaCYiFGvH3cvMeUxgurNd+pAuc6mDEAH/zHm XpXwE8QEcMMPvoOogsJLjv3nuINPpkeU82HApU6rH6HfKYlPM49cuXkN2PIWj7s5c3N9Lsb0rbN54 MwGhvbUQ==; Received: from heliosphere.sirena.org.uk ([2a01:7e01::f03c:91ff:fed4:a3b6]) by casper.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dzhrQ-00076M-Vn for linux-arm-kernel@lists.infradead.org; Wed, 04 Oct 2017 11:29:11 +0000 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=wkRDvYbY6foYkvH3V0SM5lZEeIBDj2qdjgdcSn4pwfI=; b=JVJ2s54GzRZv 9GWeLCt+ZEFr2eNahlAfgy0ExpFujucbRvb26lmwnJIlliHE5oUa/tYvORKYM/jyyTo8D4AkiV+tA QcG+yohHcK6e34bOozZ1Rf1LAcEQscMzGG5N1ug4cwIPqGpRZblTyAISJYlB5wS5xaL5HsVZRBUuK GKqd0=; 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 1dzhqC-0006XN-Kc; Wed, 04 Oct 2017 11:27:52 +0000 Received: from broonie by debutante with local (Exim 4.89) (envelope-from ) id 1dzhqC-0004EQ-7A; Wed, 04 Oct 2017 12:27:52 +0100 From: Mark Brown To: Lori Hikichi Subject: Applied "ASoC: cygnus: Remove set_fmt from SPDIF dai ops" to the asoc tree In-Reply-To: <1506637775-18293-3-git-send-email-lori.hikichi@broadcom.com> Message-Id: Date: Wed, 04 Oct 2017 12:27:52 +0100 X-Bad-Reply: In-Reply-To but no 'Re:' in Subject. X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171004_122909_049315_12741E5C X-CRM114-Status: GOOD ( 18.67 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: alsa-devel@alsa-project.org, Scott Branden , Jon Mason , Ray Jui , Takashi Iwai , Liam Girdwood , Mark Brown , bcm-kernel-feedback-list@broadcom.com, linux-arm-kernel@lists.infradead.org, Jaroslav Kysela , linux-kernel@vger.kernel.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The patch ASoC: cygnus: Remove set_fmt from SPDIF dai ops has been applied to the asoc tree at git://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 fcf30f3b4377d2475aa709ce28964461990c3caa Mon Sep 17 00:00:00 2001 From: Lori Hikichi Date: Thu, 28 Sep 2017 15:29:34 -0700 Subject: [PATCH] ASoC: cygnus: Remove set_fmt from SPDIF dai ops The SPDIF port cannot modify its format so a set_fmt function is not needed. Previously, we used a generic set_fmt for all ports and returned an error code for the SPDIF port. It is cleaner to not populate the set_fmt field. Signed-off-by: Lori Hikichi Signed-off-by: Mark Brown --- sound/soc/bcm/cygnus-ssp.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/sound/soc/bcm/cygnus-ssp.c b/sound/soc/bcm/cygnus-ssp.c index e9c73a451cf6..da14facb8a6f 100644 --- a/sound/soc/bcm/cygnus-ssp.c +++ b/sound/soc/bcm/cygnus-ssp.c @@ -1137,6 +1137,13 @@ static const struct snd_soc_dai_ops cygnus_ssp_dai_ops = { .set_tdm_slot = cygnus_set_dai_tdm_slot, }; +static const struct snd_soc_dai_ops cygnus_spdif_dai_ops = { + .startup = cygnus_ssp_startup, + .shutdown = cygnus_ssp_shutdown, + .trigger = cygnus_ssp_trigger, + .hw_params = cygnus_ssp_hw_params, + .set_sysclk = cygnus_ssp_set_sysclk, +}; #define INIT_CPU_DAI(num) { \ .name = "cygnus-ssp" #num, \ @@ -1175,7 +1182,7 @@ static const struct snd_soc_dai_driver cygnus_spdif_dai_info = { .formats = SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S32_LE, }, - .ops = &cygnus_ssp_dai_ops, + .ops = &cygnus_spdif_dai_ops, .suspend = cygnus_ssp_suspend, .resume = cygnus_ssp_resume, };