From patchwork Mon Jun 15 10:34:33 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zidan Wang X-Patchwork-Id: 6607981 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.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id D6EFFC0020 for ; Mon, 15 Jun 2015 10:33:41 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 01EA8204D8 for ; Mon, 15 Jun 2015 10:33:41 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id 4AE79204DF for ; Mon, 15 Jun 2015 10:33:38 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 583B6261AE0; Mon, 15 Jun 2015 12:33:37 +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 1231A260A5D; Mon, 15 Jun 2015 12:33:08 +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 EBCA7261583; Mon, 15 Jun 2015 12:33:05 +0200 (CEST) Received: from na01-bn1-obe.outbound.protection.outlook.com (mail-bn1bon0143.outbound.protection.outlook.com [157.56.111.143]) by alsa0.perex.cz (Postfix) with ESMTP id 698D1260A5D for ; Mon, 15 Jun 2015 12:32:58 +0200 (CEST) Received: from DM2PR03CA0038.namprd03.prod.outlook.com (10.141.96.37) by BN3PR0301MB1252.namprd03.prod.outlook.com (10.161.207.28) with Microsoft SMTP Server (TLS) id 15.1.190.14; Mon, 15 Jun 2015 10:32:56 +0000 Received: from BY2FFO11FD036.protection.gbl (2a01:111:f400:7c0c::120) by DM2PR03CA0038.outlook.office365.com (2a01:111:e400:2428::37) with Microsoft SMTP Server (TLS) id 15.1.190.14 via Frontend Transport; Mon, 15 Jun 2015 10:32:56 +0000 Authentication-Results: spf=fail (sender IP is 192.88.158.2) smtp.mailfrom=freescale.com; freescale.mail.onmicrosoft.com; dkim=none (message not signed) header.d=none; Received-SPF: Fail (protection.outlook.com: domain of freescale.com does not designate 192.88.158.2 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.158.2; helo=az84smr01.freescale.net; Received: from az84smr01.freescale.net (192.88.158.2) by BY2FFO11FD036.mail.protection.outlook.com (10.1.14.221) with Microsoft SMTP Server (TLS) id 15.1.190.9 via Frontend Transport; Mon, 15 Jun 2015 10:32:55 +0000 Received: from b50113.ap.freescale.net (b50113.ap.freescale.net [10.192.241.89]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id t5FAWoCf017751; Mon, 15 Jun 2015 03:32:50 -0700 From: Zidan Wang To: Date: Mon, 15 Jun 2015 18:34:33 +0800 Message-ID: <1434364473-27130-1-git-send-email-zidan.wang@freescale.com> X-Mailer: git-send-email 1.9.1 X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11FD036; 1:R/1l6QwCKf+f+hG1AU7fMr4ODPwKvGznKBjM61P6xFrV1tzpJw5aR4POX4DNHWe/rsTO43tzK5b5nFKpVhbp5a8LeYSL5hNoO9K1XD5kijHxUjZKvC1lIVyia5rstTYXcP9L6kavGY3pAFODZMuSka9fmiBVorFuJkzfCp4SwjlrG/U9fdEhxdjVgLTe0M3+Ju2wSaxj8RAMUwGANpl1PQ4zvho9t07AzsoxkaRzUDejrg+5/JcHT35PWN0B7nU4xc7bXG6o5sdrTQlJpa+xSm+cxCzHOWXSZCysJSxtrA4FdvoHMOgFeETPOiYQIPQYDghtcwDxTFnZi2u7zFrhc6RzlsWlx3eXzGUiEMCKgBI= X-Forefront-Antispam-Report: CIP:192.88.158.2; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(339900001)(189002)(199003)(92566002)(77156002)(62966003)(47776003)(107886002)(110136002)(189998001)(46102003)(5001920100001)(5001960100002)(77096005)(19580395003)(19580405001)(87936001)(50986999)(105606002)(86362001)(85426001)(104016003)(229853001)(50226001)(33646002)(106466001)(2351001)(50466002)(48376002)(6806004)(36756003)(4001430100001); DIR:OUT; SFP:1102; SCL:1; SRVR:BN3PR0301MB1252; H:az84smr01.freescale.net; FPR:; SPF:Fail; MLV:sfv; MX:1; A:1; LANG:en; MIME-Version: 1.0 X-Microsoft-Exchange-Diagnostics: 1; BN3PR0301MB1252; 2:gtj1g2BGJ+5KvjGaH7ZIP13njWyW6g9psCb85gqAseK53+PgZmRX2lZqoONZc9oo; 2:vyf4p78W0MXZwWEnPjvyOVOHb1qQ2rRSVRh8rZm17aAqXaJ72oPAQMXziopTGLORZsSV0aj2YBr6AQwzo4XfcP8LzmkWPntZ3YR3NU27j8i0VV/bb/FGTC0kQqZ1PUSYMIN0eZsq4huVxuBLDHczD/RSNFZWoYgiyCjrpUywjSs64UMGB+qI9nT3IaDDhkuEjLy3aDSaxn5sbChIlzdFcZn/aionJrzQ8/qXLTVr1gQ=; 6:SLJHLIzI97YfYhRbS5Y5aVzizEyUqYmX90M0NPwiERbiZLYfg/geKshke68UkGGUS6M+ybm5pyFfj/qgqCT7baGTyPqYy1Zf+OYRwISKQvpUI+LjdPqj8LVMAo8hfESapEczCwLI23AWBZ9p34JRjUHRiaUk4WL1qGbTm7mk4axwnjg1PFiE+aqPih07lNkz/qAEDuULy9y8Wq5agf9tOdlLMoSJGBz8gIAOFDUJR8ysnOTP5w7mRHiTnOIwyY/AAVkEbScOEBCmssQFIhgGdAQL7aQ+tqNBpARvSMtXjtzJK7I0fRkW4raqo5AESNf+XsTb3VWxAhkpm8UdB8hLlQ== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BN3PR0301MB1252; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(520003)(5005006)(3002001); SRVR:BN3PR0301MB1252; BCL:0; PCL:0; RULEID:; SRVR:BN3PR0301MB1252; X-Microsoft-Exchange-Diagnostics: 1; BN3PR0301MB1252; 3:3t9bCyj5W6w0WU9q4N4AJvr4yD2nVN8d2j2jU/x3LoR/jczs+cnG0RnLHol73hYjb3G9dP0eh6T+VF2cPHTXig1RPW/7X+n3Os6bJdZbcqNO2mZttWsu4RftQpww86rQFVe6GTcnxvUDLVe4GhHYQCs9Nn/YW66UVnJE79qsbA8sXduwGKXgV2JNws4DVBv6URAeXmD+UKfVhJLuTbh99t4zOc1lb6uNrkTSGD0RTf20UTxpYyR4vNOT08T3mB7xor1RpQuR5Nof6ndyKB8h3TMXKm9yrOIvp4xY8MlC3CSLE8eM/ebSXLH4v9QYhGRn X-Forefront-PRVS: 0608DEDB67 X-Microsoft-Exchange-Diagnostics: 1; BN3PR0301MB1252; 9:h83utpdEi5rFlSv6XOnaBLpgPjrjH+npmQNBzjdvBewDW3xUsEjePhK7BUEP3WyUx/pTbcDAmR9M2VrJt4Ssi7vPS3OhxvAIBv2Eg9CjZD0pamU2jO4zo76PEdn1DT/yMEC3wkilWrR0Ship3+1As8n5X2cd2YosJTeXaMj1gVVpW4ZDh5LGmVjF3I4ePGIuStmtVMk4qeJGILK3CyoEcTTsp0k1VvWM0sZ1eTxjpwnPeNmbj9zZmPgcHuNlabme7RI/lv/MLGtywVsKWATMw8aPKXfZBxqNxvZcXLJNAbHbpHveZFPU31nPaafMY9nyWxdtP0ET0w6LquLMUlvJGJ3sVrWnXR+qidytiK1Xy6ir98ejDTrHqyAJRRP4VuLVeiAcf7n4nGuUKkHpAtqvBIdDT2sFsG7jvppTEzOqD+O7CJN/DRY1HHLT29ybbOJCIBD1m0OzevtAUW7/KWkKjxNpMYA3KqtNMaMuGdRExoIeA5z9p8P3HOY1KtmGij+KY9oVJ8dyuZ3Pub1FrcfjvAMBv5r0czIGyI6eAw5Ucbzu6MyLK9y4l78GtVXALinOp6idLH9Mz1kjgfv3hIsXdwjU4g9TjQ6GoiQAFzARNGYjCQX8bJaBddKZiqsznB9Cvq3AhbwuvKpa80XVDl69F78Nxf/CLPfHTHT2hVCTEv6L2dzypZccyvYatFI3+d8ypLWrTR0u9BwlNV3PK0bS0fGPPJVYoQQgJCoDpanbvn5UY43MhtekyG5Z07Du9KO1GQVockUNpqHBguFSMTPcUIvSFZKL9tp/C/SkGXrzsCgAucHF5pDGByszZHBWo8Ah3ucbpBXv2piPVQEGmCLAHv3zFIfh3n+rkQAt7lFtp7MhL7+qR72oT2uvghwgMOsG X-Microsoft-Exchange-Diagnostics: 1; BN3PR0301MB1252; 3:zi/kY2hoRXbUKjNtdLC8OkFHY5/Az3FBc+BuOSn5GVh6VTbUgXwHZW4F7OjUCdAUDnUYmWJRaRIW6h2C1/WdMuTQmV7Fld7LLfrDhCZZo0G2pVJ+KXfAC2TRhazl2Ehv5xeqbUEXKPTjxNzDFiCFPQ==; 10:kRmrzjhi0QNC7uFympT8XEAubmB+GriHTuUOoLZCv4L621Z5jFa3UktaZ4rPbiOuQx5s4azXKQcHtD/SnnCSdYrJwVEG7gkwiUys1/6fnc0=; 6:HMklHN7JNjAg/JyRG/8sURCVBlj7x5iNZjPrdSwa9PxPI/t8O9a+7bbjF/fZV345 X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jun 2015 10:32:55.6425 (UTC) X-MS-Exchange-CrossTenant-Id: 710a03f5-10f6-4d38-9ff4-a80b81da590d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=710a03f5-10f6-4d38-9ff4-a80b81da590d; Ip=[192.88.158.2]; Helo=[az84smr01.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN3PR0301MB1252 Cc: alsa-devel@alsa-project.org, lars@metafoo.de, Zidan Wang , tiwai@suse.de, patches@opensource.wolfsonmicro.com, linux-kernel@vger.kernel.org, ckeepax@opensource.wolfsonmicro.com Subject: [alsa-devel] [PATCH] ASoC: wm8960: add two kcontrols to select ADC left/right channel source 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 Add two kcontrols to select ADC left/right channel source, one to select the left channel source and one for the right channel source. Signed-off-by: Zidan Wang --- sound/soc/codecs/wm8960.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sound/soc/codecs/wm8960.c b/sound/soc/codecs/wm8960.c index 023e898..8f9aed1 100644 --- a/sound/soc/codecs/wm8960.c +++ b/sound/soc/codecs/wm8960.c @@ -141,6 +141,8 @@ static const char *wm8960_3d_upper_cutoff[] = {"High", "Low"}; static const char *wm8960_3d_lower_cutoff[] = {"Low", "High"}; static const char *wm8960_alcfunc[] = {"Off", "Right", "Left", "Stereo"}; static const char *wm8960_alcmode[] = {"ALC", "Limiter"}; +static const char *wm8960_adc_left_source[] = {"left ADC", "right ADC"}; +static const char *wm8960_adc_right_source[] = {"right ADC", "left ADC"}; static const struct soc_enum wm8960_enum[] = { SOC_ENUM_SINGLE(WM8960_DACCTL1, 5, 4, wm8960_polarity), @@ -149,6 +151,8 @@ static const struct soc_enum wm8960_enum[] = { SOC_ENUM_SINGLE(WM8960_3D, 5, 2, wm8960_3d_lower_cutoff), SOC_ENUM_SINGLE(WM8960_ALC1, 7, 4, wm8960_alcfunc), SOC_ENUM_SINGLE(WM8960_ALC3, 8, 2, wm8960_alcmode), + SOC_ENUM_SINGLE(WM8960_ADDCTL1, 3, 2, wm8960_adc_left_source), + SOC_ENUM_SINGLE(WM8960_ADDCTL1, 2, 2, wm8960_adc_right_source), }; static const int deemph_settings[] = { 0, 32000, 44100, 48000 }; @@ -279,6 +283,9 @@ SOC_SINGLE_TLV("Right Output Mixer Boost Bypass Volume", WM8960_BYPASS2, 4, 7, 1, bypass_tlv), SOC_SINGLE_TLV("Right Output Mixer RINPUT3 Volume", WM8960_ROUTMIX, 4, 7, 1, bypass_tlv), + +SOC_ENUM("ADC Left Channel Source", wm8960_enum[6]), +SOC_ENUM("ADC Right Channel Source", wm8960_enum[7]), }; static const struct snd_kcontrol_new wm8960_lin_boost[] = {