From patchwork Thu Dec 24 06:58:03 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zidan Wang X-Patchwork-Id: 7915411 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 CA067BEEE5 for ; Thu, 24 Dec 2015 06:55:39 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D405720495 for ; Thu, 24 Dec 2015 06:55:38 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id ABDD320444 for ; Thu, 24 Dec 2015 06:55:37 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 860E22665F4; Thu, 24 Dec 2015 07:55:31 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Status: No, score=-2.6 required=5.0 tests=BAD_ENC_HEADER,BAYES_00, RCVD_IN_DNSWL_LOW, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 2817A2665C0; Thu, 24 Dec 2015 07:55:24 +0100 (CET) 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 7949B2665CB; Thu, 24 Dec 2015 07:55:22 +0100 (CET) Received: from na01-bl2-obe.outbound.protection.outlook.com (mail-bl2on0121.outbound.protection.outlook.com [65.55.169.121]) by alsa0.perex.cz (Postfix) with ESMTP id E2DC52665BB for ; Thu, 24 Dec 2015 07:55:14 +0100 (CET) Received: from BY2PR03CA076.namprd03.prod.outlook.com (10.141.249.49) by DM2PR0301MB1261.namprd03.prod.outlook.com (10.160.219.26) with Microsoft SMTP Server (TLS) id 15.1.361.13; Thu, 24 Dec 2015 06:55:12 +0000 Received: from BL2FFO11FD035.protection.gbl (2a01:111:f400:7c09::153) by BY2PR03CA076.outlook.office365.com (2a01:111:e400:2c5d::49) with Microsoft SMTP Server (TLS) id 15.1.361.13 via Frontend Transport; Thu, 24 Dec 2015 06:55:11 +0000 Authentication-Results: spf=permerror (sender IP is 192.88.158.2) smtp.mailfrom=freescale.com; freescale.mail.onmicrosoft.com; dkim=none (message not signed) header.d=none; freescale.mail.onmicrosoft.com; dmarc=none action=none header.from=freescale.com; Received-SPF: PermError (protection.outlook.com: domain of freescale.com used an invalid SPF mechanism) Received: from az84smr01.freescale.net (192.88.158.2) by BL2FFO11FD035.mail.protection.outlook.com (10.173.161.131) with Microsoft SMTP Server (TLS) id 15.1.355.15 via Frontend Transport; Thu, 24 Dec 2015 06:55:11 +0000 Received: from b50113.ap.freescale.net (b50113.ap.freescale.net [10.192.241.68]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id tBO6t7wM024612; Wed, 23 Dec 2015 23:55:08 -0700 From: Zidan Wang To: Date: Thu, 24 Dec 2015 14:58:03 +0800 Message-ID: <72b882412e24df59de1a6fe63568ac5ee5d998ca.1450940174.git.zidan.wang@freescale.com> X-Mailer: git-send-email 1.9.1 X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD035; 1:qRMbZg5ChfXoGCPwjVDklCkwxAyZZafCaKoRsHRogley3eSW4Yw1J3AapdP49Mpj5o4NVaWzr/Ub0KROFM+A4KiZoKgASS+oc2QL+cpXEmlZpAFmvqFDcMcWVCbztviUCzFEU4NXipHwZxEtDMOgnCVlDuHZH4H2qLB+gyaTH/3iCin+EnDBnks8jmiHAQtcEkgRDWo8lof1TNaU53Sb7p3qScbbEZfSjKk5vSYRKno8DqH+1biGivCrn9t4Khe9XXz1cdcZX5WFLBk/EHqENWqbubrEJ9m04TdgXqozu1PSluWFFTBByIth9I5xbNirMVuewI+EYjIK1H6xs+UjgWvfT4m2Cm96x1qvH0Y9Vu+PnRm1syv6ng9ll/uGi96WMCUCjJHNI2j1lzx1GY+fWwFZnwveyxuU60jZnhAN4gR9exxBBguMyn657hiW8iAf X-Forefront-Antispam-Report: CIP:192.88.158.2; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(2980300002)(448002)(3190300001)(189002)(199003)(48376002)(86362001)(5003940100001)(50466002)(85326001)(106466001)(586003)(87936001)(92566002)(104016004)(189998001)(6806005)(4001430100002)(11100500001)(5008740100001)(1220700001)(50986999)(5001960100002)(47776003)(1096002)(50226001)(107886002)(110136002)(118296001)(19580405001)(229853001)(2351001)(77096005)(36756003)(33646002)(69596002)(81156007)(19580395003)(97736004); DIR:OUT; SFP:1102; SCL:1; SRVR:DM2PR0301MB1261; H:az84smr01.freescale.net; FPR:; SPF:PermError; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; MIME-Version: 1.0 X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB1261; 2:YFnG93Km/UHeAjQ/IIzJZUbkkn5TyA1iSzDkwFWPoWF6R6l5T3anCVxKBvKAgPG2RqeR+bRUFHa/Imt0zAP9SAChQpDRXGsht0i5nYJLWgUffD6tk0VUGQ543QHRjm+4YIceeL+0i0dOwhVbxRe48w==; 3:12FqfnllEPMdDZngkHtw2e2hjVHm7rqAqcNA3sVIY86zv72Fd8hdsPTBTG6dKZiP+0zXYj6PRdLzp8/FzYrZjo4DS4yXGdgZs+QRfbmyJRZvPcScCPHPvawpkvAPU/xs62Vj8vKXrvbIIADWyeJMDRrZhLer+WrNUdVim/ovBaizyuz9RiUzIlmho0tfLR+ustm8D71ie1oyCtIEm1OhxnhbR9hzyaE2vGptxVToTyE=; 25:EXKDzYMf0C42msERHJJvYlwbftGFe87PJ8U8Pge6QcufCvc8VI5Y2BH9OAr1tzp79C33NRdRyQzT2NDj4anc+8NzxHKdsoi81rqKhK7EpOrS6y8s8saVPY1HYjX2o7vtj1gjBNFNOM/G0SaYFhShj+tNMaMkW8S6ThmdCXaKxgG3q5Nt38O+lQERl99nplEz+BQ9mr3wMI+0rRnWKFsoAWx4E2d9iht42PCsDq6QOFx7o7Lyiw5jvjn3ZepOWJzQ X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:DM2PR0301MB1261; X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB1261; 20:U//n7VGIXXmpVPvL4RvKGpzn15HQ9MJV85b1+Mzf1f3rlfDMg32/XjHe0LW8dgFxMjg0PSUvwQ7lmGZeZ2fW9gGAKuGwUb4lJ/14JnWxBG+jKhASDi6MRqb8nJEbXnFNSo3HAwc2q5z9WHtpN5eFiaED6qVaY7DecffwYaUxNUdZrvcRSlYPxbEvMhlDS9fGfAT+7shMvWzT6jRWk/aLPaGnQrmIN2Yg9bVPaiTBMb/bO2Ri9xx2dTmNslGrXgl/NGbTzopqOe4Vonhn08YQW9Zkyj8MAQrTefwojyXVrF4p46xKjBAAQYwnSgeLPuAm50I8OgOfh5xzU9cT+rS06RsS/fibHbOPHzl+slS5hkE=; 4:l1oWtR5BxaIkxUMwqtblXGRLfkDmrNIxnJ//T0DuFqDc1Ik07oyllntMmhFn29ReompA45S7JlqnMG85LTsa7Souznu42JHE+G5A2aj9W+Tsg9OQ5O9b30TbHvhKuhpMe9bz01XfQpkGnj2pHNdjTzkAmTyRKsbXjp8jwoXt1UK05xPPbBFLyRKKk1hS9RH3CaMXdawBj2MkUwNuI9aZxwZsaQ3qvWXlPerqQM5kJtA4zYdmWKu3AdwTznTfulwE57Rjw09g2dMt6ONX0wwdq7S9STv2puewLJpHv2PaKYNwXzU4PGWGOmc8qi3eNF5cCGjN6iD0RF1wj6bi2lj+VK8658gICMFCqa4gawMOVMIu967iaP5Zc/JYRh1/sn2CVZOfppaMfIJqTZcijyG62lEJnCScULieOxTmAV0NjQ4= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(101931422205132); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(5005006)(520078)(8121501046)(10201501046)(3002001); SRVR:DM2PR0301MB1261; BCL:0; PCL:0; RULEID:; SRVR:DM2PR0301MB1261; X-Forefront-PRVS: 0800C0C167 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM2PR0301MB1261; 23:Y+y5RCagh5hjZjL1QHI8w7ZaiiDAEUIqf7Dl+zm?= =?us-ascii?Q?h1U5biSwNo702vCzExKSaXGCsdofY43aWo+VGr1sP5dh2mEIsT8VgNq0ZTlE?= =?us-ascii?Q?cu8LID8H+kXd5MqTZiC4UgTn8BH17g7zAtKHmD/38zvz0UWfeoUIObAv6/6S?= =?us-ascii?Q?aCZRm07SshFmA9Wlbv2wBjsjKniyZb3cwD9jiybfLpxMzhtF2A3P8PmimcKp?= =?us-ascii?Q?PB2Yjn2/oehe/uK7P8INAqR1+ZbblhTkUV/JgbWyoVHQEfHxEPqDS+AEutEp?= =?us-ascii?Q?TGaSAjzdxaPqCsOPkDio8tmEbiPfdvXC1RlloPB2dRyZ08LI0HjO4QLoO9V8?= =?us-ascii?Q?++Zf+rrYCaqhKvRG5eWN2+e4TGbnsA0ce5FxMRJJYKQazPiuWbgtbywyNCJ3?= =?us-ascii?Q?gGW3C37yQ0B+LavTPp4CqMM6FAtoecS0plSCLXYB5xoS09kXfR+ml5bc4+rH?= =?us-ascii?Q?9lPrs03y4k1SLedqwwIbrl3vdB9JvZlMTlEK2oJ05Z46x7b7h/bF9p3quGO8?= =?us-ascii?Q?ABEnsOtB7lq3OmxYC/S9kVKdZ4JHGRhknix3016LLu6genSO7TxEpRHMmw9l?= =?us-ascii?Q?7DELwCg2GyJ3ex3WyNo4jBESQS5AfIstymXXLDDQf/2a5LA0htNUBknvRxL7?= =?us-ascii?Q?DxKrvnoFaZjaleik+6qQcpRSSchV23r26nZIirP3UxIE/qPCWmflMBOPc5D5?= =?us-ascii?Q?rqR1ZJVcVb0xFJzW1Utk60rQWlm/b0nB/02sUkDLx3XQ1iaVb0c8gLkQGX6e?= =?us-ascii?Q?yTUuCwYC712hfU5o7O5cW4Fm5JmZ1L3Dlv6b7a6IE0DTck6tCHigH1tqL6tE?= =?us-ascii?Q?0l83clSwyPnlIOyeZHTp/6QS3nGx1sbeqgGaIRlDJcG+gmyOlzFLnbu9IFBo?= =?us-ascii?Q?UvvwUVeNJW4xCJiPC6BaouwLrumCs8xOx+YAxLACTGF+WmUgaSnEC6FfucT7?= =?us-ascii?Q?4Rp33OtlEPVbBqEAtpI75rEMEjpGeOj0IIZERVUdCSMgXs2C8KNs53Rbqp7T?= =?us-ascii?Q?yLYFmuFoptEYkzqzrxdJoScOBH++j0v+QpFaeLOIMOcCW5+0W7clM0kYPOQx?= =?us-ascii?Q?U0S625jEm5tozrSTulk1fv9CsS5Bk?= X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB1261; 5:1VcMBxJ7VAPEaxAe+fLYFUZmv/+fIEQAbbOu0EmXOxH/V73DmCIuvtQLoclW2y5OZWwfypR3eHSaJVWlvYt5zZ5AsEqiAe3OAAStKI1eFHtSxQxWr/eHfMtsQQJ6PkJkRwETyaXzcZyUaMdA2Eypdg==; 24:5/3JhWtf8zF7d3y9S9YLDMhEOFjDreUM2EzTuCJcARxglxKRgCMF/DwlOlmhUpUcgL3wPjXyUIL66SEQvTNybQ08tVUanHrxu4XmlKH47jA= X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Dec 2015 06:55:11.2746 (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: DM2PR0301MB1261 Cc: ckeepax@opensource.wolfsonmicro.com, alsa-devel@alsa-project.org, Zidan Wang Subject: [alsa-devel] [PATCH] ASoC: wm8960: add kcontrol to select ADC data 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 add kcontrol to select ADC data output. Signed-off-by: Zidan Wang --- sound/soc/codecs/wm8960.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sound/soc/codecs/wm8960.c b/sound/soc/codecs/wm8960.c index 5380798..162def8 100644 --- a/sound/soc/codecs/wm8960.c +++ b/sound/soc/codecs/wm8960.c @@ -147,6 +147,12 @@ 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_data_output_sel[] = { + "Left Data = Left ADC; Right Data = Right ADC", + "Left Data = Left ADC; Right Data = Left ADC", + "Left Data = Right ADC; Right Data = Right ADC", + "Left Data = Right ADC; Right Data = Left ADC", +}; static const struct soc_enum wm8960_enum[] = { SOC_ENUM_SINGLE(WM8960_DACCTL1, 5, 4, wm8960_polarity), @@ -155,6 +161,7 @@ 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, 2, 4, wm8960_adc_data_output_sel), }; static const int deemph_settings[] = { 0, 32000, 44100, 48000 }; @@ -295,6 +302,8 @@ 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 Data Output Select", wm8960_enum[6]), }; static const struct snd_kcontrol_new wm8960_lin_boost[] = {