From patchwork Wed Aug 29 23:38:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matt Flax X-Patchwork-Id: 10581077 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D0178174C for ; Wed, 29 Aug 2018 23:39:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BFE732BC53 for ; Wed, 29 Aug 2018 23:39:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B3FB02BC59; Wed, 29 Aug 2018 23:39:50 +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=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham 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 35B2F2BC53 for ; Wed, 29 Aug 2018 23:39:50 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 6911C267917; Thu, 30 Aug 2018 01:39:42 +0200 (CEST) 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 1117C2678FC; Thu, 30 Aug 2018 01:39:37 +0200 (CEST) Received: from mx.flatmax.org (mx.flatmax.org [13.55.16.222]) by alsa0.perex.cz (Postfix) with ESMTP id 0CEFF2676BD for ; Thu, 30 Aug 2018 01:39:31 +0200 (CEST) Received: from flatmax by mx.flatmax.org with local (Exim 4.89) (envelope-from ) id 1fvA3a-0005oJ-7d; Thu, 30 Aug 2018 09:39:26 +1000 From: Matt Flax To: Mark Brown , alsa-devel@alsa-project.org, Brian Austin , Paul Handrigan , ckeepax@opensource.cirrus.com Date: Thu, 30 Aug 2018 09:38:00 +1000 Message-Id: <20180829233802.22032-1-flatmax@flatmax.org> X-Mailer: git-send-email 2.11.0 Cc: Matt Flax Subject: [alsa-devel] [PATCH v2 1/3] ASoC: cs4265: SOC_SINGLE register value error fix 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 The cs4265 driver declares the "MMTLR Data Switch" register setting with a 0 register value rather then the 0x12 register (CS4265_SPDIF_CTL2). This incorrect value causes alsamixer to fault with the output : cannot load mixer controls: Input/output error This patch corrects the register value. alsamixer now runs. Signed-off-by: Matt Flax --- Acked-by: Paul Handrigan Reviewed-by: Charles Keepax Identical to the original v1 patch, already acked and reviewed. --- sound/soc/codecs/cs4265.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sound/soc/codecs/cs4265.c b/sound/soc/codecs/cs4265.c index 275677de..15b4ae04 100644 --- a/sound/soc/codecs/cs4265.c +++ b/sound/soc/codecs/cs4265.c @@ -157,8 +157,7 @@ static const struct snd_kcontrol_new cs4265_snd_controls[] = { SOC_SINGLE("Validity Bit Control Switch", CS4265_SPDIF_CTL2, 3, 1, 0), SOC_ENUM("SPDIF Mono/Stereo", spdif_mono_stereo_enum), - SOC_SINGLE("MMTLR Data Switch", 0, - 1, 1, 0), + SOC_SINGLE("MMTLR Data Switch", CS4265_SPDIF_CTL2, 0, 1, 0), SOC_ENUM("Mono Channel Select", spdif_mono_select_enum), SND_SOC_BYTES("C Data Buffer", CS4265_C_DATA_BUFF, 24), }; From patchwork Wed Aug 29 23:38:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matt Flax X-Patchwork-Id: 10581075 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6E3DF1390 for ; Wed, 29 Aug 2018 23:39:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5118F2BC4E for ; Wed, 29 Aug 2018 23:39:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4413F2BC54; Wed, 29 Aug 2018 23:39:44 +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=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham 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 685E32BC4E for ; Wed, 29 Aug 2018 23:39:43 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 9E58B267830; Thu, 30 Aug 2018 01:39:40 +0200 (CEST) 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 A4A7A267830; Thu, 30 Aug 2018 01:39:35 +0200 (CEST) Received: from mx.flatmax.org (mx.flatmax.org [13.55.16.222]) by alsa0.perex.cz (Postfix) with ESMTP id 0E385267830 for ; Thu, 30 Aug 2018 01:39:31 +0200 (CEST) Received: from flatmax by mx.flatmax.org with local (Exim 4.89) (envelope-from ) id 1fvA3e-0005oQ-2L; Thu, 30 Aug 2018 09:39:30 +1000 From: Matt Flax To: Mark Brown , alsa-devel@alsa-project.org, Brian Austin , Paul Handrigan , ckeepax@opensource.cirrus.com Date: Thu, 30 Aug 2018 09:38:01 +1000 Message-Id: <20180829233802.22032-2-flatmax@flatmax.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180829233802.22032-1-flatmax@flatmax.org> References: <20180829233802.22032-1-flatmax@flatmax.org> Cc: Matt Flax Subject: [alsa-devel] [PATCH v2 2/3] ASoC: cs4265: Add native 32bit I2S transport 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 The cs4265 uses 32 bit transport on the I2S bus. This patch enables native 32 bit mode for machine drivers which use this sound card driver. Signed-off-by: Matt Flax Reviewed-by: Charles Keepax --- No changes from v1, however have tested the intended functionality and list discussion had firmed up its purpose. --- sound/soc/codecs/cs4265.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sound/soc/codecs/cs4265.c b/sound/soc/codecs/cs4265.c index 15b4ae04..17d7e6f0 100644 --- a/sound/soc/codecs/cs4265.c +++ b/sound/soc/codecs/cs4265.c @@ -495,7 +495,8 @@ static int cs4265_set_bias_level(struct snd_soc_component *component, SNDRV_PCM_RATE_176400 | SNDRV_PCM_RATE_192000) #define CS4265_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_U16_LE | \ - SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_U24_LE) + SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_U24_LE | \ + SNDRV_PCM_FMTBIT_S32_LE | SNDRV_PCM_FMTBIT_U32_LE) static const struct snd_soc_dai_ops cs4265_ops = { .hw_params = cs4265_pcm_hw_params, From patchwork Wed Aug 29 23:38:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matt Flax X-Patchwork-Id: 10581079 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0456F174C for ; Wed, 29 Aug 2018 23:39:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E8AEC2BC53 for ; Wed, 29 Aug 2018 23:39:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DC72D2BC59; Wed, 29 Aug 2018 23:39:58 +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=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham 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 7E82F2BC53 for ; Wed, 29 Aug 2018 23:39:57 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id EE873267924; Thu, 30 Aug 2018 01:39:43 +0200 (CEST) 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 161D0267830; Thu, 30 Aug 2018 01:39:37 +0200 (CEST) Received: from mx.flatmax.org (mx.flatmax.org [13.55.16.222]) by alsa0.perex.cz (Postfix) with ESMTP id 36CE1267837 for ; Thu, 30 Aug 2018 01:39:32 +0200 (CEST) Received: from flatmax by mx.flatmax.org with local (Exim 4.89) (envelope-from ) id 1fvA3f-0005oX-3F; Thu, 30 Aug 2018 09:39:31 +1000 From: Matt Flax To: Mark Brown , alsa-devel@alsa-project.org, Brian Austin , Paul Handrigan , ckeepax@opensource.cirrus.com Date: Thu, 30 Aug 2018 09:38:02 +1000 Message-Id: <20180829233802.22032-3-flatmax@flatmax.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180829233802.22032-1-flatmax@flatmax.org> References: <20180829233802.22032-1-flatmax@flatmax.org> Cc: Matt Flax Subject: [alsa-devel] [PATCH v2 3/3] ASoC: cs4265: Add a SPDIF enable switch 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 This patch adds a SPDIF enable switch as a SOC_SINGLE. Signed-off-by: Matt Flax Reviewed-by: Charles Keepax --- v2: - Changed to a SOC_SINGLE call --- sound/soc/codecs/cs4265.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/codecs/cs4265.c b/sound/soc/codecs/cs4265.c index 17d7e6f0..d9eebf6a 100644 --- a/sound/soc/codecs/cs4265.c +++ b/sound/soc/codecs/cs4265.c @@ -154,6 +154,7 @@ static const struct snd_kcontrol_new cs4265_snd_controls[] = { SOC_SINGLE("E to F Buffer Disable Switch", CS4265_SPDIF_CTL1, 6, 1, 0), SOC_ENUM("C Data Access", cam_mode_enum), + SOC_SINGLE("SPDIF Switch", CS4265_SPDIF_CTL2, 5, 1, 1), SOC_SINGLE("Validity Bit Control Switch", CS4265_SPDIF_CTL2, 3, 1, 0), SOC_ENUM("SPDIF Mono/Stereo", spdif_mono_stereo_enum),