From patchwork Thu Jun 11 11:14:35 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zidan Wang X-Patchwork-Id: 6587661 Return-Path: X-Original-To: patchwork-alsa-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 37BB99F399 for ; Thu, 11 Jun 2015 11:15:20 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4FC3C204D8 for ; Thu, 11 Jun 2015 11:15:19 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id 1B2212047B for ; Thu, 11 Jun 2015 11:15:18 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 4491F26655E; Thu, 11 Jun 2015 13:15:17 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Status: No, score=-1.9 required=5.0 tests=BAD_ENC_HEADER,BAYES_00, NO_DNS_FOR_FROM,UNPARSEABLE_RELAY autolearn=no version=3.3.1 Received: from alsa0.perex.cz (localhost [IPv6:::1]) by alsa0.perex.cz (Postfix) with ESMTP id 408FD2664BD; Thu, 11 Jun 2015 13:14:13 +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 2087B2664B0; Thu, 11 Jun 2015 13:14:12 +0200 (CEST) Received: from na01-bn1-obe.outbound.protection.outlook.com (mail-bn1bon0112.outbound.protection.outlook.com [157.56.111.112]) by alsa0.perex.cz (Postfix) with ESMTP id 17BAC261A84 for ; Thu, 11 Jun 2015 13:14:02 +0200 (CEST) Received: from BY2PR03CA004.namprd03.prod.outlook.com (10.255.93.21) by BY1PR0301MB1253.namprd03.prod.outlook.com (10.161.203.25) with Microsoft SMTP Server (TLS) id 15.1.184.17; Thu, 11 Jun 2015 11:13:59 +0000 Received: from BY2FFO11FD041.protection.gbl (10.255.93.4) by BY2PR03CA004.outlook.office365.com (10.255.93.21) with Microsoft SMTP Server (TLS) id 15.1.190.14 via Frontend Transport; Thu, 11 Jun 2015 11:13:58 +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 BY2FFO11FD041.mail.protection.outlook.com (10.1.14.226) with Microsoft SMTP Server (TLS) id 15.1.190.9 via Frontend Transport; Thu, 11 Jun 2015 11:13:58 +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 t5BBDjKj015356; Thu, 11 Jun 2015 04:13:55 -0700 From: Zidan Wang To: Date: Thu, 11 Jun 2015 19:14:35 +0800 Message-ID: X-Mailer: git-send-email 1.9.1 In-Reply-To: References: X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11FD041; 1:WEI4xdZf1nlCF2sRY3QCcSWRHwM3JzOdHl6Hc4C0gf7wh++sLWctjT6/BcoEaJ/rI5T7787x3t/R9m68ZwMAzZlpP+rPzPh+Ggt8V+20W3KU/Mp/H4d7BG6Q6WJASpMtxQWYHE+DpA5OJ7bc6yonal3Y7h+Mh3xT5XhadGOJ0UGzS5lvLuYhrOnozIx9uToS8J0xaJP3Tx+h8j52jW6XtxPjE4TB0brgKM73V/yFiT0SNAeMFwGyLlmAaxeLDLC7oUBEnWZth7AH/0mC/gRfXNXmMxIYiRY8F5cXcWPO0IBLHzWxjASf9IgrUtLzBD/IiCqj+npXa1/cD0g6IxqysoDgdwg797upeYECXZN6+Go= X-Forefront-Antispam-Report: CIP:192.88.158.2; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(339900001)(199003)(189002)(50226001)(47776003)(76176999)(118296001)(48376002)(50466002)(19580405001)(19580395003)(6806004)(50986999)(106466001)(105606002)(36756003)(46102003)(33646002)(104016003)(77096005)(2351001)(229853001)(189998001)(5001960100002)(2950100001)(5001920100001)(107886002)(110136002)(87936001)(92566002)(62966003)(85426001)(77156002)(86362001)(4001430100001); DIR:OUT; SFP:1102; SCL:1; SRVR:BY1PR0301MB1253; H:az84smr01.freescale.net; FPR:; SPF:Fail; MLV:sfv; A:1; MX:1; LANG:en; MIME-Version: 1.0 X-Microsoft-Exchange-Diagnostics: 1; BY1PR0301MB1253; 2:aILHi9WwAjIJ+MG1DiM+uiAt3E+eL6YBanOgi8/PRVifr4qJfBXHsc+hjO4d6ovI; 2:QpIuwrkXoYKwe77ZRZSPOcMv3ru2Q6ctT5q+s+g+iu6G7Vn1nGtvzkYZCg8d4+rwENhwx1pRKqsFru2Zxne/s3tD128QPrm6Az8kdM22PCH4EgqTAYZIIHPosFiZxx43gpoDRWaashCVSogBhCpxboLyCxbRydXVjF8pGI1igchIUlBfT0VrtvmAmQg+wEpRXWgKYIhJ0EPFxtBzm5mbI6lNUZwtXJ5flImON22N5hM=; 6:eWQWK7MgveY8MX3nol6Doi/47ZrMEFv7wV3xS4skJ1udHO7w5b8uN/eRfBaXqQMOAhqPD3DWNkiJbI6FcJOWeGVaMNqt2UYLCVRAoamjz9ZeRApyE4K8btNSSqw3Xbd4lwHS8JVeM/+yELWVRdW2Br3yQvMw9t1vf5i3Wxb5EZo6gM+Px12z5gCGDhrgBG2wNDyiQFl3w9VoIkvEsjIUwSfoFPxnX4wgNNwfC0ZBPaGzw973/BiFWpYERxerI1bbnhwhFXtVISGShwbqjbA4j87PMS1qSjQ9SJ16KS5qCrGo+dyQ4Vq/WPfw9Zk47HK/PrrzVwaAOoiBzgbQy/NN4A== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BY1PR0301MB1253; 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:BY1PR0301MB1253; BCL:0; PCL:0; RULEID:; SRVR:BY1PR0301MB1253; X-Microsoft-Exchange-Diagnostics: 1; BY1PR0301MB1253; 3:cmVJvG/zlW1BiXYBA/ZEHUK6cVDUiTDWZuG0M527wHioc5MBrRbGLubKfpSLrxfl/ABAMyn6CvCCC7yQqjR6Qadbqff7mzDRmkpzHSW2gMKs0a3jx/XCjEgoi9ufWccLyniBHOvlhx4UViEiMfjO+BOBN3FcJNDy6KBHIOz2MiCvjo568yU60UZFd0wcxEoRvJqezN1Ea37vr7nZhfWwioh6c8Wh99Wuz5sC6MG2pdVeRnVV2S3+QSXQVZ+bP0+ARfZhMdVhhzSzgKJ9OTdFRPv8aOseykYtNPUL+Hl/W57FybFzbqajqil32zekMa4l X-Forefront-PRVS: 0604AFA86B X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY1PR0301MB1253; 9:txKTL+HROvH9M3LxhIRYW1WVfOkyHU7tuwn5VdNV?= =?us-ascii?Q?FL3oQjW8eGqcfyqgW7idynmvDbmgixxDxC9seE9RWt+1oTq/DeV7tgLpbhCs?= =?us-ascii?Q?w6FOVBG/Jx0vBRwNC3YjbQ5rk5aZgvfuaqLMAdlnUDlWLjO9FrNmcPDMhk8q?= =?us-ascii?Q?VjhTRAjPDS4pXvC8JyJwo1HaDDrDI2l2eRcDV1Zwf+DGSTOWHUDAr63UsjmW?= =?us-ascii?Q?7W7ngUtEkjl5677uonYYFyLs/8mX7QEF1tb9WgpCLz78UddqJc1OT25+deZr?= =?us-ascii?Q?li93EUSvvXxj3atWVOt+AqTiwFzxpcRyvyEj0mSxvB3PNO3dySaf5PQWRII5?= =?us-ascii?Q?/o3LIGyd+83C8/V3bV9U5VDeHbOY/HwORilK9kXRy+W2oU87I+dczgVCsghZ?= =?us-ascii?Q?4Ab+/x3+RJamZjt8DjvwBa3sBSmA/XXkAv4GY/y3SHqTkiJdj5qHq/aQrXBb?= =?us-ascii?Q?Y3KsGTmwjECO07VNpqM58AZGbehIUjWUUMdVlR+zwlkK15fl2xwtSRmKgNML?= =?us-ascii?Q?S/HWISJAsP1TQBHGH1aPqFLXgpJUQfgIvt1j9KEBp2urvqDyVyc7TghSa72A?= =?us-ascii?Q?3xLAtP1nAiCduhL5ea7zCuGONQL6YHm/GPZIsp89T47UMtifeaGm7V+OYEKT?= =?us-ascii?Q?c12RQbA3amiFXFcsjP+1bTiFEA4Rxq/4lfVBJYKBdWZkoMFdDhKNRywj4BBO?= =?us-ascii?Q?jk+WhUeQey5jMJf+WU+IKKAuEGi3GLqhlZi6leUQbIGJLr3yrRU9syb+8E4N?= =?us-ascii?Q?p0pMG/Ebsq2dxkJGB4TvaIQIiglUss7cT0GKYQqGlgcNZy4AIPVUimnhdheP?= =?us-ascii?Q?Dn2XOcLrtK7PqTJQfqfmVzq0MoDvuVW7dIzeo+ncKCWjuPbIaOizZ6ggGk8F?= =?us-ascii?Q?XDMwDekESrDeBIZU5vw+LDoDQx7dCHe4soVGjmi2UTXy/75xgWc9r94Tg+PQ?= =?us-ascii?Q?50hGAgv3RrKC+wU0XncbpPsRZz7yVJlTJpswLmRwFw=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; BY1PR0301MB1253; 3:cKc+hqSANkZ5QGwLAqowpGOBpGjBKB+RsQgM6hMGxzgQdVPFox30hpCca1N66gHeK7Etg5IKuqrVM9wwcXMx3L8h8ZnYLPVAymXaATnpjCxSA54sqCzRvGhzJvOHf0ET6KfpFXRS7OwOk0hAHcbEHg==; 10:gMN67aNMnHshzME/A0Tf/OucV1uwuxGi+sogbTO5+bxfrv4QCXycazv/NetPhiFVPLxh9w3tGgPwB8a5qCQAUwlpsg/EZGog22wSqJbjeNw=; 6:MOxtNjD7exDACCKTPpTUWI0qGGGeCZxlwP87F5gIZIYNrsjDLaqJV6JlzG9KDun0 X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jun 2015 11:13:58.6400 (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: BY1PR0301MB1253 Cc: alsa-devel@alsa-project.org, lars@metafoo.de, Zidan Wang , tiwai@suse.de, linux-kernel@vger.kernel.org, patches@opensource.wolfsonmicro.com, lgirdwood@gmail.com, ckeepax@opensource.wolfsonmicro.com Subject: [alsa-devel] [PATCH 3/4] 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 c1be15c..62246f1 100644 --- a/sound/soc/codecs/wm8960.c +++ b/sound/soc/codecs/wm8960.c @@ -141,6 +141,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_sel[] = { + "ldata = left ADC; rdata = right ADC", + "ldata = left ADC; rdata = left ADC", + "ldata = right ADC; rdata = right ADC", + "ldata = right ADC; rdata = left ADC", +}; static const struct soc_enum wm8960_enum[] = { SOC_ENUM_SINGLE(WM8960_DACCTL1, 5, 4, wm8960_polarity), @@ -149,6 +155,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_sel), }; static const int deemph_settings[] = { 0, 32000, 44100, 48000 }; @@ -279,6 +286,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[] = {