From patchwork Thu Aug 7 11:55:49 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolin Chen X-Patchwork-Id: 4690801 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 E78CCC0338 for ; Thu, 7 Aug 2014 11:54:30 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1C4C420148 for ; Thu, 7 Aug 2014 11:54:30 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id EA05320103 for ; Thu, 7 Aug 2014 11:54:27 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 78D19265205; Thu, 7 Aug 2014 13:54:26 +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, DKIM_ADSP_CUSTOM_MED, FREEMAIL_FROM,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from alsa0.perex.cz (localhost [IPv6:::1]) by alsa0.perex.cz (Postfix) with ESMTP id CBBA22650FA; Thu, 7 Aug 2014 13:54:14 +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 B50442650FE; Thu, 7 Aug 2014 13:54:10 +0200 (CEST) Received: from na01-bn1-obe.outbound.protection.outlook.com (mail-bn1lp0139.outbound.protection.outlook.com [207.46.163.139]) by alsa0.perex.cz (Postfix) with ESMTP id 5F4CA2650E4 for ; Thu, 7 Aug 2014 13:54:02 +0200 (CEST) Received: from BN3PR0301CA0021.namprd03.prod.outlook.com (25.160.180.159) by BL2PR03MB356.namprd03.prod.outlook.com (10.141.89.27) with Microsoft SMTP Server (TLS) id 15.0.995.14; Thu, 7 Aug 2014 11:53:59 +0000 Received: from BN1AFFO11FD026.protection.gbl (2a01:111:f400:7c10::114) by BN3PR0301CA0021.outlook.office365.com (2a01:111:e400:4000::31) with Microsoft SMTP Server (TLS) id 15.0.1005.10 via Frontend Transport; Thu, 7 Aug 2014 11:53:59 +0000 Received: from tx30smr01.am.freescale.net (192.88.168.50) by BN1AFFO11FD026.mail.protection.outlook.com (10.58.52.86) with Microsoft SMTP Server (TLS) id 15.0.990.10 via Frontend Transport; Thu, 7 Aug 2014 11:53:59 +0000 Received: from rio.ap.freescale.net (rio.ap.freescale.net [10.192.242.9]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id s77Brn0G003801; Thu, 7 Aug 2014 04:53:50 -0700 From: Nicolin Chen To: Date: Thu, 7 Aug 2014 19:55:49 +0800 Message-ID: <1407412549-14983-1-git-send-email-nicoleotsuka@gmail.com> X-Mailer: git-send-email 1.8.4 X-EOPAttributedMessage: 0 X-Matching-Connectors: 130518860393085916; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.168.50; CTRY:US; IPV:CAL; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10009003)(6009001)(199002)(189002)(99396002)(62966002)(21056001)(92726001)(46102001)(81542001)(2351001)(31966008)(73392001)(74662001)(48376002)(81442001)(26826002)(229853001)(61266001)(104016003)(74502001)(19580395003)(44976005)(50986999)(6806004)(19580405001)(110136001)(104166001)(86362001)(97736001)(93916002)(107046002)(77156001)(64706001)(87572001)(47776003)(82202001)(73972005)(36756003)(80022001)(89996001)(20776003)(102836001)(33646002)(81342001)(88136002)(4396001)(68736004)(84676001)(106466001)(105596002)(50466002)(79102001)(87286001)(92566001)(95666004)(85306004)(87936001)(85852003)(50226001)(55446002)(83072002)(77982001); DIR:OUT; SFP:1101; SCL:1; SRVR:BL2PR03MB356; H:tx30smr01.am.freescale.net; FPR:; MLV:ovrnspm; PTR:InfoDomainNonexistent; MX:1; LANG:en; MIME-Version: 1.0 X-Microsoft-Antispam: BCL:0;PCL:0;RULEID: X-Forefront-PRVS: 029651C7A1 Received-SPF: SoftFail (protection.outlook.com: domain of transitioning gmail.com discourages use of 192.88.168.50 as permitted sender) Authentication-Results: spf=softfail (sender IP is 192.88.168.50) smtp.mailfrom=nicoleotsuka@gmail.com; Cc: alsa-devel@alsa-project.org, tiwai@suse.de, patches@opensource.wolfsonmicro.com, b02247@freescale.com, lgirdwood@gmail.com, linux-kernel@vger.kernel.org, B18700@freescale.com, ckeepax@opensource.wolfsonmicro.com, rf@opensource.wolfsonmicro.com Subject: [alsa-devel] [PATCH] ASoC: wm8962: Correct the bit offset to enable mono speaker output 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 As WM8962 datasheet describes for SPK_MONO bit of R51: When SPK_MONO is set to '1', both speakers output the signal from the left channel. So for mono speaker widget, we shall enable Left Channel whose enable bit is 6 instead of 7 (Right Channel). This patches just simply corrects the bit offset. Signed-off-by: Peter Chan Signed-off-by: Nicolin Chen --- @Peter I cced you just to let you know that I'm merging your fix to upstream. And because you patch can't be applied to the upstream tree directly, I used my own commit with your signed-off. Thank you for the fix. sound/soc/codecs/wm8962.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c index 1098ae3..105deec 100644 --- a/sound/soc/codecs/wm8962.c +++ b/sound/soc/codecs/wm8962.c @@ -2185,7 +2185,7 @@ SND_SOC_DAPM_MIXER("Speaker Mixer", WM8962_MIXER_ENABLES, 1, 0, spkmixl, ARRAY_SIZE(spkmixl)), SND_SOC_DAPM_MUX_E("Speaker PGA", WM8962_PWR_MGMT_2, 4, 0, &spkoutl_mux, out_pga_event, SND_SOC_DAPM_POST_PMU), -SND_SOC_DAPM_PGA("Speaker Output", WM8962_CLASS_D_CONTROL_1, 7, 0, NULL, 0), +SND_SOC_DAPM_PGA("Speaker Output", WM8962_CLASS_D_CONTROL_1, 6, 0, NULL, 0), SND_SOC_DAPM_OUTPUT("SPKOUT"), };