From patchwork Wed Oct 4 11:27:49 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 9984335 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 DEEF56028E for ; Wed, 4 Oct 2017 11:30:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CF99E28AA7 for ; Wed, 4 Oct 2017 11:30:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C3D0328ADA; Wed, 4 Oct 2017 11:30:03 +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 6EFF328AA7 for ; Wed, 4 Oct 2017 11:30:03 +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=d1cJ4mMicC0iykshC/IOjhVmZa32nkwKwVotXS6rDms=; b=b9e lcDRECQD5oZAR83Fqu3EoQ3rkIm315kR7zrcKNmAiQdbJZBYMDyXjTj/hSPEXPXjiIqO372uWV66n hZ7+9IvCgV48gBL7C08MC1xcDuSwkVKQv10rjnjgHw/phxNou2m+1r7WY9tmN0HkSqBCq5RHebLLe VpyzXhD3n4y/xJ37v9TgCNXDNmSB7NbhB2E8MMttPAkmM9QQxpcY4sbsEb2pt2+A9wa/wozvVSODo id502r/AhMlmw3M654L3KQm+jyCn4SCeKaADM/XkDVPq+xKewU1zHOnx01cMRKYm9bgD71zXrQAaP crQOzPjFZapMc5Unqx6yQUVRJT66tTA==; 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 1dzhsC-0007tF-GP; Wed, 04 Oct 2017 11:29:56 +0000 Received: from merlin.infradead.org ([2001:8b0:10b:1231::1]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dzhrX-0007Em-PA for linux-arm-kernel@bombadil.infradead.org; Wed, 04 Oct 2017 11:29:16 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.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=/4gdKqRuJIk8VpSG2YgPjJCiU/e5KDW2weGUh14G70s=; b=ytZ4qz7lnTXWQsrbm1Se4AmBE+ 6Yvb7ub7Qc0CXIdTExvONSs0evFj+SHPec/JeuOB2zmXa4u/YZqJ+5sa0IIcXnqNvhjMX4LVgxqW/ ix9ljjmZ+tlfMy9OvXZsMWlUAOsqIeq1KsayJbdEwLjwfSK+IRgJVse7tJ7h0Ih1QZcbNZEDSxj2f jN3pi/T8LRVkUjEf+QLOY9iT5nAqZhOR4eH1wdBITp7ZR05QDlAEsSjwXzNVvgV/tDCYs/nibe+Xp 4nfZtD1BZfFSyaNVr+slPv0R8f/5O1e82NkGQbv/hVezxJb8pIG5FMKcOyZjQHJcFNYRbjbsoZyk5 vQ1vG5DQ==; Received: from heliosphere.sirena.org.uk ([2a01:7e01::f03c:91ff:fed4:a3b6]) by merlin.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dzhrU-0007iV-QU for linux-arm-kernel@lists.infradead.org; Wed, 04 Oct 2017 11:29:13 +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=/4gdKqRuJIk8VpSG2YgPjJCiU/e5KDW2weGUh14G70s=; b=N+RMZK/SunVX zIKJkvL3uHNeB09wFV7vAU46BuEkdhzXG/c0VYMeGZ9MMZOpFm7bD0qnng/tzSooAhT/9m+zJxL7F x+V+Zp0RN3rb74Q36MNSJSEmfi4JGZdJupBDi5K2sWxAQ+9957FDpQk9vcrdgqBVhsBlq5FX2Dnik 3wKvg=; 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 1dzhq9-0006XF-Ia; Wed, 04 Oct 2017 11:27:49 +0000 Received: from broonie by debutante with local (Exim 4.89) (envelope-from ) id 1dzhq9-0004DL-4s; Wed, 04 Oct 2017 12:27:49 +0100 From: Mark Brown To: Lori Hikichi Subject: Applied "ASoC: cygnus: Remove support for 8 bit audio and for mono" to the asoc tree In-Reply-To: <1506637775-18293-5-git-send-email-lori.hikichi@broadcom.com> Message-Id: Date: Wed, 04 Oct 2017 12:27:49 +0100 X-Bad-Reply: In-Reply-To but no 'Re:' in Subject. 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 support for 8 bit audio and for mono 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 934e4885cb958566a34124e5a1dad2f9212a8ec6 Mon Sep 17 00:00:00 2001 From: Lori Hikichi Date: Thu, 28 Sep 2017 15:29:35 -0700 Subject: [PATCH] ASoC: cygnus: Remove support for 8 bit audio and for mono These modes of operation were not working properly and it is unclear if the hardware could fully support these modes properly. There is little to be gained by enabling these modes, therefore, we will just remove support. Signed-off-by: Lori Hikichi Signed-off-by: Mark Brown --- sound/soc/bcm/cygnus-ssp.c | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/sound/soc/bcm/cygnus-ssp.c b/sound/soc/bcm/cygnus-ssp.c index da14facb8a6f..cd8aef8ed8a5 100644 --- a/sound/soc/bcm/cygnus-ssp.c +++ b/sound/soc/bcm/cygnus-ssp.c @@ -655,23 +655,10 @@ static int cygnus_ssp_hw_params(struct snd_pcm_substream *substream, if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { value = readl(aio->cygaud->audio + aio->regs.bf_sourcech_cfg); value &= ~BIT(BF_SRC_CFGX_BUFFER_PAIR_ENABLE); - /* Configure channels as mono or stereo/TDM */ - if (params_channels(params) == 1) - value |= BIT(BF_SRC_CFGX_SAMPLE_CH_MODE); - else - value &= ~BIT(BF_SRC_CFGX_SAMPLE_CH_MODE); + value &= ~BIT(BF_SRC_CFGX_SAMPLE_CH_MODE); writel(value, aio->cygaud->audio + aio->regs.bf_sourcech_cfg); switch (params_format(params)) { - case SNDRV_PCM_FORMAT_S8: - if (aio->port_type == PORT_SPDIF) { - dev_err(aio->cygaud->dev, - "SPDIF does not support 8bit format\n"); - return -EINVAL; - } - bitres = 8; - break; - case SNDRV_PCM_FORMAT_S16_LE: bitres = 16; break; @@ -1148,11 +1135,10 @@ static const struct snd_soc_dai_ops cygnus_spdif_dai_ops = { #define INIT_CPU_DAI(num) { \ .name = "cygnus-ssp" #num, \ .playback = { \ - .channels_min = 1, \ + .channels_min = 2, \ .channels_max = 16, \ .rates = SNDRV_PCM_RATE_KNOT, \ - .formats = SNDRV_PCM_FMTBIT_S8 | \ - SNDRV_PCM_FMTBIT_S16_LE | \ + .formats = SNDRV_PCM_FMTBIT_S16_LE | \ SNDRV_PCM_FMTBIT_S32_LE, \ }, \ .capture = { \ @@ -1160,7 +1146,7 @@ static const struct snd_soc_dai_ops cygnus_spdif_dai_ops = { .channels_max = 16, \ .rates = SNDRV_PCM_RATE_KNOT, \ .formats = SNDRV_PCM_FMTBIT_S16_LE | \ - SNDRV_PCM_FMTBIT_S32_LE, \ + SNDRV_PCM_FMTBIT_S32_LE, \ }, \ .ops = &cygnus_ssp_dai_ops, \ .suspend = cygnus_ssp_suspend, \