From patchwork Thu Sep 11 14:52:46 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Handrigan X-Patchwork-Id: 4888891 Return-Path: X-Original-To: patchwork-alsa-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 864B4C0338 for ; Thu, 11 Sep 2014 15:14:06 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2A16120256 for ; Thu, 11 Sep 2014 15:14:05 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id 3E32D200DF for ; Thu, 11 Sep 2014 15:14:00 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 55AF0265066; Thu, 11 Sep 2014 17:13:57 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from alsa0.perex.cz (localhost [IPv6:::1]) by alsa0.perex.cz (Postfix) with ESMTP id 3B0B1264FBB; Thu, 11 Sep 2014 17:07:37 +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 2C072264FBB; Thu, 11 Sep 2014 17:07:36 +0200 (CEST) Received: from na01-bn1-obe.outbound.protection.outlook.com (mail-bn1on0144.outbound.protection.outlook.com [157.56.110.144]) by alsa0.perex.cz (Postfix) with ESMTP id 72CB72656DB for ; Thu, 11 Sep 2014 16:53:33 +0200 (CEST) Received: from BY2FFO11FD050.protection.gbl (10.1.14.32) by BY2FFO11HUB030.protection.gbl (10.1.14.115) with Microsoft SMTP Server (TLS) id 15.0.1019.14; Thu, 11 Sep 2014 14:53:30 +0000 Received: from mail1.cirrus.com (141.131.3.20) by BY2FFO11FD050.mail.protection.outlook.com (10.1.15.187) with Microsoft SMTP Server id 15.0.1019.14 via Frontend Transport; Thu, 11 Sep 2014 14:53:30 +0000 Received: from ex3.ad.cirrus.com (ex3.ad.cirrus.com [141.131.36.34]) by mail1.cirrus.com (Postfix) with ESMTP id 9FF5834032; Thu, 11 Sep 2014 09:56:32 -0500 (CDT) Received: from localhost (141.131.108.102) by EX3.ad.cirrus.com (141.131.36.39) with Microsoft SMTP Server id 14.3.174.1; Thu, 11 Sep 2014 09:53:29 -0500 From: Paul Handrigan To: Date: Thu, 11 Sep 2014 09:52:46 -0500 Message-ID: <1410447166-2336-1-git-send-email-Paul.Handrigan@cirrus.com> X-Mailer: git-send-email 1.9.1 MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:141.131.3.20; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(438002)(199003)(189002)(74502001)(64706001)(92726001)(74662001)(20776003)(44976005)(76506005)(19580405001)(47776003)(104166001)(99396002)(62966002)(95666004)(81542001)(229853001)(106466001)(50226001)(80022001)(57986006)(21056001)(36756003)(31966008)(89996001)(83322001)(110136001)(2351001)(86362001)(107046002)(92566001)(50466002)(19580395003)(77096002)(93916002)(79102001)(77982001)(87286001)(90102001)(76482001)(85306004)(48376002)(46102001)(85852003)(102836001)(87936001)(77156001)(4396001)(50986999)(83072002); DIR:OUT; SFP:1102; SCL:1; SRVR:BY2FFO11HUB030; H:mail1.cirrus.com; FPR:; MLV:sfv; PTR:mail1.cirrus.com; A:1; MX:1; LANG:en; X-Microsoft-Antispam: BCL:0;PCL:0;RULEID:;UriScan:; X-Forefront-PRVS: 03319F6FEF Received-SPF: Pass (protection.outlook.com: domain of cirrus.com designates 141.131.3.20 as permitted sender) receiver=protection.outlook.com; client-ip=141.131.3.20; helo=mail1.cirrus.com; Authentication-Results: spf=pass (sender IP is 141.131.3.20) smtp.mailfrom=Paul.Handrigan@cirrus.com; X-OriginatorOrg: cirrus.com Cc: broonie@kernel.org, lgirdwood@gmail.com, Paul Handrigan Subject: [alsa-devel] [PATCH] Fix register address to set SPDIF data type. 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: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP ASoC: cs4265: Fix register address to set the proper data type. The SPDIF control register must be written to set the data type in hw_params not the ADC control register. Signed-off-by: Paul Handrigan --- sound/soc/codecs/cs4265.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sound/soc/codecs/cs4265.c b/sound/soc/codecs/cs4265.c index e299948..4fdd47d 100644 --- a/sound/soc/codecs/cs4265.c +++ b/sound/soc/codecs/cs4265.c @@ -459,12 +459,12 @@ static int cs4265_pcm_hw_params(struct snd_pcm_substream *substream, if (params_width(params) == 16) { snd_soc_update_bits(codec, CS4265_DAC_CTL, CS4265_DAC_CTL_DIF, (1 << 5)); - snd_soc_update_bits(codec, CS4265_ADC_CTL, + snd_soc_update_bits(codec, CS4265_SPDIF_CTL2, CS4265_SPDIF_CTL2_DIF, (1 << 7)); } else { snd_soc_update_bits(codec, CS4265_DAC_CTL, CS4265_DAC_CTL_DIF, (3 << 5)); - snd_soc_update_bits(codec, CS4265_ADC_CTL, + snd_soc_update_bits(codec, CS4265_SPDIF_CTL2, CS4265_SPDIF_CTL2_DIF, (1 << 7)); } break; @@ -473,7 +473,7 @@ static int cs4265_pcm_hw_params(struct snd_pcm_substream *substream, CS4265_DAC_CTL_DIF, 0); snd_soc_update_bits(codec, CS4265_ADC_CTL, CS4265_ADC_DIF, 0); - snd_soc_update_bits(codec, CS4265_ADC_CTL, + snd_soc_update_bits(codec, CS4265_SPDIF_CTL2, CS4265_SPDIF_CTL2_DIF, (1 << 6)); break;