Message ID | 898610f35e157ce9d5b1e53a85f5a6ed822eadae.1439522138.git.zidan.wang@freescale.com (mailing list archive) |
---|---|
State | Accepted |
Commit | e134cb2041359c927b735b81568373624ea26baf |
Headers | show
Return-Path: <alsa-devel-bounces@alsa-project.org> 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 AA411C05AC for <patchwork-alsa-devel@patchwork.kernel.org>; Fri, 14 Aug 2015 03:20:52 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9870820431 for <patchwork-alsa-devel@patchwork.kernel.org>; Fri, 14 Aug 2015 03:20:51 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id 1CA522038A for <patchwork-alsa-devel@patchwork.kernel.org>; Fri, 14 Aug 2015 03:20:50 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 891BA2650BA; Fri, 14 Aug 2015 05:20:48 +0200 (CEST) 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 [IPv6:::1]) by alsa0.perex.cz (Postfix) with ESMTP id 26318265041; Fri, 14 Aug 2015 05:20:40 +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 61CC8265044; Fri, 14 Aug 2015 05:20:39 +0200 (CEST) Received: from na01-bl2-obe.outbound.protection.outlook.com (mail-bl2on0125.outbound.protection.outlook.com [65.55.169.125]) by alsa0.perex.cz (Postfix) with ESMTP id C5B28264FF9 for <alsa-devel@alsa-project.org>; Fri, 14 Aug 2015 05:20:31 +0200 (CEST) Received: from BN3PR0301CA0083.namprd03.prod.outlook.com (10.160.152.179) by DM2PR0301MB1264.namprd03.prod.outlook.com (10.160.220.11) with Microsoft SMTP Server (TLS) id 15.1.225.19; Fri, 14 Aug 2015 03:20:29 +0000 Received: from BN1AFFO11FD031.protection.gbl (2a01:111:f400:7c10::104) by BN3PR0301CA0083.outlook.office365.com (2a01:111:e400:401e::51) with Microsoft SMTP Server (TLS) id 15.1.231.21 via Frontend Transport; Fri, 14 Aug 2015 03:20:29 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) 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.168.50 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Received: from tx30smr01.am.freescale.net (192.88.168.50) by BN1AFFO11FD031.mail.protection.outlook.com (10.58.52.185) with Microsoft SMTP Server (TLS) id 15.1.243.9 via Frontend Transport; Fri, 14 Aug 2015 03:20:28 +0000 Received: from b50113.ap.freescale.net (b50113.ap.freescale.net [10.192.241.89]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id t7E3KNR3012424; Thu, 13 Aug 2015 20:20:24 -0700 From: Zidan Wang <zidan.wang@freescale.com> To: <broonie@kernel.org> Date: Fri, 14 Aug 2015 11:22:16 +0800 Message-ID: <898610f35e157ce9d5b1e53a85f5a6ed822eadae.1439522138.git.zidan.wang@freescale.com> X-Mailer: git-send-email 1.9.1 X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11FD031; 1:XQm8cgmXc5K9TzCvY+xiHkZ7rBE0WZFZJfG2rTP15aVoyzBEkyRMpmLUSl78STl+JUjdfxs5Ci7UDy2T4smdwosNhtJ8bMz7eWB8+OGn7buPQxh9IzzLwNkwEc7ZR25y/9JerHOzGdiRRKiO+QCD0e2q1XEzmoL1lHD3umzXDUZ2v5llmCtxIXdFTyroa63obYMdU9/C4xXctc2sV6LAWanG1ATY/MLbXizFm9FB2KsHcbIWEXfUwcjYIZ45U2EIXTxFFBwuU11ki39WZ9mfCriOqQAMIFlX/tDvBiDEL7Up5lvT36u4XKIatJtII7BscdH6A7sltMVJZLVn3YYvwLWZq9umnnOHTtukHujZkH5g+DUZJTaYpouX+P5WgBdWteNo8giXBDk23VeUXWQ2SNE/OsleeR9GdxuUy1geFQo= X-Forefront-Antispam-Report: CIP:192.88.168.50; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(2980300002)(1060300003)(339900001)(3050300001)(189002)(199003)(118296001)(19580395003)(6806004)(33646002)(19580405001)(2351001)(87936001)(86362001)(4001540100001)(50466002)(104016003)(229853001)(64706001)(62966003)(47776003)(46102003)(77096005)(97736004)(110436001)(5001860100001)(68736005)(85426001)(77156002)(48376002)(110136002)(107886002)(92566002)(4290100001)(81156007)(36756003)(5001960100002)(5001830100001)(50226001)(106466001)(50986999)(105606002)(5003940100001)(4001430100001); DIR:OUT; SFP:1102; SCL:1; SRVR:DM2PR0301MB1264; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; MIME-Version: 1.0 X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB1264; 2:gWFPfsGBltPGpshFQp5OPqE/3NIV4GMYrcOt5vlNvD68EEo7BdIRAdoo3BQaDlYZEalkVBBZ/bGMj26oYDopHjIDqQee025W87KMNbYOO5GkAKx15sRvWfIwHs2/SSSmP8DOfX7oU0jB+qQWzXn5dOBesqlVB6IH1PGTOMwiCIw=; 3:0j0tU2M/2Ib5oRi1/TJJi9HPD0z1M0SI+qmps9GDOuWEpADVvJtDMYME6pFk/CD47pyhLiN0THG/4hL1dNToKRkh9ajgouIVanKWDpYkITNTzgBIH384nuwVPhUQjMHmUYVj+Pv1PL6sC8EF2NEfls590Uhp1GOl5Ic3cIBh1QixF+Ro0SmEH84b4H+fOHzu8A0mt/fOk0kmd74khNCB/fXKzrwjp9anVjdxQknWK9w=; 25:wtQ3OYGjNIJt949JJRq8BxB1Sb5hAbEJBjsAgGQimfUGVNCNGnl+b9N3fHTgygqpd805aiYHbSfjxFS+52f8P3TAzMslTMHqZS+7AlJ5i6NJhsIedovWoBHgHwdtldjdUaLvkUv1T3SsiOf2YTEpDuJ4HTntx+wlfBBEJ/+JamCcnMP+JqDJGSNV6sRwZqsvbmZ6XmpiotRNPeMPn0+8S8mzaYGdsl/NT/PmnXWrDZl70c5DIjpCGI9KJRCA8z9O X-Microsoft-Antispam: UriScan:;BCL:1;PCL:0;RULEID:;SRVR:DM2PR0301MB1264; X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB1264; 20:COT1PvTNrCBTXHwTQWZ79pmSMuc3SgDKTZG2dJiNpX3LvQhSFXNAtv7jEaUwYvRLAn20CIDmWtEz5vEvp9Uv7grQMQ/ugNCdM+uSQpdbpulsiTBO+XtTVNw4n3Ke2upssVb/nV2waNFgxBmxiwvLfEWr7I3BXvzrPx4sgq+WU4T/FeFsyjKV43qQ4Ja9tFRdYh9dTcwoKIKJJrb4PtgOLMeD3Ay4qhzpz+jpBoeSBwUTvqEFX8lFEzxE7vL4IdYSBJ4AiFOJbbeBeNBbR32WSSfSmHejFve0yrGHXkMXO8H64owwTs1F5Aglf3wdU2gwpZytRvWNz1i4o9DhHRwtLmUiU6jXbk8nzQqmHsUeGRM=; 4:cSPFXdNOpLIOoiLH+3mhpp5sHKCcfBkvqZdUC9Wid2ifavOTMF/b6pg1AmRzd7KtXQoV2ZIHmPsErY5h3oLmaR4JUEwnFky8tnQhVMu54qqXJlDr65lBiLsolI5sElam7SyvKsAzMS90+Hm34/ftlFCBS2wCS9q9jebVMonRCKGwqvBQ0eRY+gDs7t5p+uSE3Z4UWguQJv81yEuBKCVeTbZ6tuTdFWfUOe5aY14sWh5QZ3VsAtdJey6/UJf9MDh+Usms4xR9UKBll4Jld05NgM5WBZOHYtDGGAG2i+oaB5vShoLwRN8JoozlN2CRLS1B X-Microsoft-Antispam-PRVS: <DM2PR0301MB126434B7812EF63305DBABA1907C0@DM2PR0301MB1264.namprd03.prod.outlook.com> X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:1; PCL:0; RULEID:(601004)(1201001)(5005006)(3002001); SRVR:DM2PR0301MB1264; BCL:1; PCL:0; RULEID:; SRVR:DM2PR0301MB1264; X-Forefront-PRVS: 066898046A X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM2PR0301MB1264; 23:hLovHL5fkfz13lRZadL246eHEGWuzMI72RhJyUh?= =?us-ascii?Q?EQUIAYprMq+w3sx4lUj3lNAGghC3AYw4N0ts+k/VVkoVlNldaumoXMUWBDOx?= =?us-ascii?Q?yaSuI6qc1WxG5eVwmKpctI/nqHNyinCHDOpJlL0/4lkRjIz2SFrsbnUXUOjC?= =?us-ascii?Q?vNvdRClNbqGDb95LzjnnwuoZCAISSyJPBe6+uhoY7NjFvJyLrtp5he6Z3gnl?= =?us-ascii?Q?HciNjlKrnWTjhISj3ssAl9GgXPyDrzVDYba+2DrnBm93EFpTM/Ghc5ubAyi+?= =?us-ascii?Q?RLj11tMYbeSUdTBOBV1y3wVKpOGJhq10ruMbsqvT4gLPB7Nmr0szjwukx6im?= =?us-ascii?Q?+5YX6PxHnJnGpdYC0DFZ0vrZdBZmGOD0dEhAN66l4gM4UwHL/7H9ZDex1oYh?= =?us-ascii?Q?lYACci/WyFTvhRrP6juo9+sWFdahQ2XFTXJnhov/y9ycJ88Au62Pu3y86UTx?= =?us-ascii?Q?vVw8BspUuM0uJH/mysCzj3SsqxT0DEyKMmzOQBVbQVp4S2qhiRll3cdhKiXr?= =?us-ascii?Q?A236Kqpe+9E7i3mW+oZcBI2L7wR/tTU9PnPMoKi6Bp/wi1MTBzhOYydnhjNH?= =?us-ascii?Q?5V3dMvEgWRUZmb95VURF9N1OQvwIpI1/sGT4rm6XbJV+wtzzRHDnnYJAERl8?= =?us-ascii?Q?uYcDKF/dyhGt7zpT5N+UDUzVQssGPBsbvEh5it8KMPZgvUt2NevZj74Ief9h?= =?us-ascii?Q?dOlcDYjfPBoWqtmr9m5fX4IF7i/dzA8Oz7DwE4nvxKKlqwRReQuEvZXhM5fC?= =?us-ascii?Q?LnCXBMHwyfPtcLZ/WWEYBJ+Pilf8SmmjWkP0Rxj4TlsEWiRYFB+MCljRiIPB?= =?us-ascii?Q?/FiQ7KOU7VRg0E1HPA5tsVtSuhU8/7ZuPP27mUG6Im6eNKRTeoFYwTTK7F3S?= =?us-ascii?Q?8jpKQEEaE9asRBfnatVEqmmTLtL0gDDmHbPw+b6vQSz5W1pRViHsi3px6/Tx?= =?us-ascii?Q?Iqsi66b0GwsxOTgU5uZ5skkNfJjoVQj79G35lhj/fWs8c/FUEx70rr3D5iXy?= =?us-ascii?Q?erzmAx7OhQT2eMJqFFipCwf07mt427Aa4LjNgzsxSmmfNH55OGb4syCGFDKX?= =?us-ascii?Q?otAc1fR9owv6q0MyRh6iQ8vuvAfrrGne25Qhk84b2DG8MC2HT6oz8NaiVhd3?= =?us-ascii?Q?dJwUTIAvYZ8P2BIwMFiCCVsJcc5YrIhoPVt4UA1j14mFx1axtR14mPmxpMX0?= =?us-ascii?Q?Rxv0hjDm60SQ3XxQYuwQ6f1P2oGFNqpYExJGP?= X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB1264; 5:fzS1tmhppFyJu/2UdB0Pv34BeKU+z0Mx0fsrM3ErxA0/Buia3lUOd6DZxNqpdwCqxAFg50Gfs3dWrY6shMJwZ0AW00PmYlQdkyNACxjh+6h8Y7RxNsOd/tH5LungLQlPvPR+afqaUKpLSwzhFE5Y7Q==; 24:bJTHzux/I9UVlw9hLcmyWj1iK/sR4gi4OQ3Tk/lIuDi7H289nXQSroxKnlC4eaLu4wXB2HeY9CzccC4v4Wp02n20IX9v+buHN/nZ8Vr6fLw=; 20:YQ0a5c7k/Rc9PMgp9PME9TI48gCHm2cmC65lP15jOLcURdVy3pfUglWCpwiGeWfMoB9lbkFZlWWPs0go2KwgnQ== X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Aug 2015 03:20:28.9702 (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.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM2PR0301MB1264 Cc: fabio.estevam@freescale.com, alsa-devel@alsa-project.org, Zidan Wang <zidan.wang@freescale.com>, patches@opensource.wolfsonmicro.com, tiwai@suse.com, ckeepax@opensource.wolfsonmicro.com Subject: [alsa-devel] [PATCH] ASoC: wm8994: fix add dynamic path error 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" <alsa-devel.alsa-project.org> List-Unsubscribe: <http://mailman.alsa-project.org/mailman/options/alsa-devel>, <mailto:alsa-devel-request@alsa-project.org?subject=unsubscribe> List-Archive: <http://mailman.alsa-project.org/pipermail/alsa-devel/> List-Post: <mailto:alsa-devel@alsa-project.org> List-Help: <mailto:alsa-devel-request@alsa-project.org?subject=help> List-Subscribe: <http://mailman.alsa-project.org/mailman/listinfo/alsa-devel>, <mailto:alsa-devel-request@alsa-project.org?subject=subscribe> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP |
diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c index 962e1d3..2ccbb32 100644 --- a/sound/soc/codecs/wm8994.c +++ b/sound/soc/codecs/wm8994.c @@ -1942,14 +1942,16 @@ static const struct snd_soc_dapm_route intercon[] = { { "AIF2ADCDAT", NULL, "AIF2ADC Mux" }, /* AIF3 output */ - { "AIF3ADCDAT", "AIF1ADCDAT", "AIF1ADC1L" }, - { "AIF3ADCDAT", "AIF1ADCDAT", "AIF1ADC1R" }, - { "AIF3ADCDAT", "AIF1ADCDAT", "AIF1ADC2L" }, - { "AIF3ADCDAT", "AIF1ADCDAT", "AIF1ADC2R" }, - { "AIF3ADCDAT", "AIF2ADCDAT", "AIF2ADCL" }, - { "AIF3ADCDAT", "AIF2ADCDAT", "AIF2ADCR" }, - { "AIF3ADCDAT", "AIF2DACDAT", "AIF2DACL" }, - { "AIF3ADCDAT", "AIF2DACDAT", "AIF2DACR" }, + { "AIF3ADC Mux", "AIF1ADCDAT", "AIF1ADC1L" }, + { "AIF3ADC Mux", "AIF1ADCDAT", "AIF1ADC1R" }, + { "AIF3ADC Mux", "AIF1ADCDAT", "AIF1ADC2L" }, + { "AIF3ADC Mux", "AIF1ADCDAT", "AIF1ADC2R" }, + { "AIF3ADC Mux", "AIF2ADCDAT", "AIF2ADCL" }, + { "AIF3ADC Mux", "AIF2ADCDAT", "AIF2ADCR" }, + { "AIF3ADC Mux", "AIF2DACDAT", "AIF2DACL" }, + { "AIF3ADC Mux", "AIF2DACDAT", "AIF2DACR" }, + + { "AIF3ADCDAT", NULL, "AIF3ADC Mux" }, /* Loopback */ { "AIF1 Loopback", "ADCDAT", "AIF1ADCDAT" },
If there don't exist dynamic sink or source widget, it will failed to add dynamic path. "AIF3ADCDAT" is snd_soc_dapm_aif_out, can't be dynamic sink widget. So change the audio route to fix this issue. Signed-off-by: Zidan Wang <zidan.wang@freescale.com> --- sound/soc/codecs/wm8994.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-)