From patchwork Fri Aug 14 11:11:09 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zidan Wang X-Patchwork-Id: 7014371 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 A0D96C05AC for ; Fri, 14 Aug 2015 11:09:48 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D234F2076A for ; Fri, 14 Aug 2015 11:09:47 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id B587F206A2 for ; Fri, 14 Aug 2015 11:09:45 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 3C0D126549B; Fri, 14 Aug 2015 13:09:44 +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 02C772652B7; Fri, 14 Aug 2015 13:09:36 +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 1510A2652E2; Fri, 14 Aug 2015 13:09:35 +0200 (CEST) Received: from na01-by2-obe.outbound.protection.outlook.com (mail-by2on0129.outbound.protection.outlook.com [207.46.100.129]) by alsa0.perex.cz (Postfix) with ESMTP id 338D82652AC for ; Fri, 14 Aug 2015 13:09:27 +0200 (CEST) Received: from DM2PR03CA0051.namprd03.prod.outlook.com (10.141.96.50) by DM2PR0301MB1263.namprd03.prod.outlook.com (10.160.219.28) with Microsoft SMTP Server (TLS) id 15.1.225.19; Fri, 14 Aug 2015 11:09:24 +0000 Received: from BL2FFO11FD044.protection.gbl (2a01:111:f400:7c09::148) by DM2PR03CA0051.outlook.office365.com (2a01:111:e400:2428::50) with Microsoft SMTP Server (TLS) id 15.1.231.21 via Frontend Transport; Fri, 14 Aug 2015 11:09:24 +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 BL2FFO11FD044.mail.protection.outlook.com (10.173.161.140) with Microsoft SMTP Server (TLS) id 15.1.243.9 via Frontend Transport; Fri, 14 Aug 2015 11:09:22 +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 t7EB9IHi031982; Fri, 14 Aug 2015 04:09:19 -0700 From: Zidan Wang To: Date: Fri, 14 Aug 2015 19:11:09 +0800 Message-ID: X-Mailer: git-send-email 1.9.1 X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD044; 1:qhLCkpeXDi17Car8BlsgsRKyAbUf5U2YPUGmsllucfSpfyIDgvwhcghI7BEBmSQSwW9HdiIOD3zTv3ftzjJeS3Ld4pw8DXcW+7gpcL5T1KMOL3qOTxFG1qsPk17XKnOq0/xQNaTslCMC/hssamLXF+Bskv6cdcugfNA+537n9gmYVfuMg0PLp2nMdmjmWfN9t3IMJ6D8NK5CvJ537ptcLYe4I89vRwHeyXa9XQj9kuIY6Uc4donBgvftlzYrh7QFFdkT5jT9GD1pJAujlPCmuU0lIP3ctNj36cnQs+ftfoG9zVcOdgjfNWoXvuTQ8h6rLC7fbnB1DvqWA1BBX3vBDErtbHhg1p96z/bTscyHL/u+qBO8JmSaDDoQy/5FwQ9cCREGvyBcHYhz/rIuoiSjiEk8LXQ/ChUmDTstXyH3dTc= X-Forefront-Antispam-Report: CIP:192.88.158.2; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(2970300002)(1060300003)(339900001)(3050300001)(199003)(189002)(46102003)(106466001)(69596002)(36756003)(118296001)(6806004)(230783001)(62966003)(85426001)(107886002)(77156002)(110136002)(19580395003)(87936001)(19580405001)(5001960100002)(50466002)(4001540100001)(105606002)(77096005)(81156007)(5001860100001)(92566002)(97736004)(50226001)(104016003)(110436001)(4290100001)(68736005)(5001830100001)(48376002)(229853001)(2351001)(5003940100001)(47776003)(64706001)(50986999)(33646002)(86362001)(4001430100001); DIR:OUT; SFP:1102; SCL:1; SRVR:DM2PR0301MB1263; H:az84smr01.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:3; MX:3; LANG:en; MIME-Version: 1.0 X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB1263; 2:Bt8oK0bl0UVcmkYefdPEiGloJPGt95Rra6uzsMnwiHThY8y1CzhG63cgKYKNvjSUSHZ/SV9Tdb+P9hJpuLId6hBFejwImoUQJR7dQM71ltgiYRaMza+0IJajSeK5k9XmDqnAvuIgaqV33SlOoqPMiSotdvC+bqIDmWcLqOPq6QU=; 3:OMPwNhwTF460AN+ehS+OQIjCVS7AEvZsRbkfrmYt7HuzsmSbCPdA5Zqr6tIddnKazgqT8yixWgHbiFSEe7frzx1+nWzg9tqcVU4ceiE1reQvqxWrL1fEQw8YmDy8SEE5RwIgXnABEBbPwCLescQyCeo/8+it5Z7K6TBl05c9zoFzp09NUlgs9kgF8LKtA08lQ8Z/GVcYvEiRLXOzbQ9/sB+dPVfpJ7EvFTevwHBwdLU=; 25:oUr9F2gJA8eAyRW4KOhGhTUsEJ6Ge8N/Ff/CDFltA1jFTqVKxoTTuSfxrfJWHW8g4dgLum90Yr6dVPOASo+dAfW7pMPWwNFNJ370P6oleKOlxJwNDkJqrnoOZhVFOGbLrMfqhRO6qjJc4DxGvgryYMwaehV8thHudpT9QnoncJbX/Mqa9D/tDBmG/JFbs8zZ8+OvjMkqBH5HURfKLXQh0esd1ulVl9tP0BAyeMzes0MnMFdccRLaOC1MnWsq4qdLNSyYIFHhukn2lj3MwnSIGg== X-Microsoft-Antispam: UriScan:;BCL:1;PCL:0;RULEID:;SRVR:DM2PR0301MB1263; X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB1263; 20:KZ3/rRHbs6PberHplSBt5pogkyji5r6UBHSPVR83yW4HFRbq+XrBTGpSzQ8ZEZg7CJS0zGQmg7fXXjISWE+FZEkrBJdJe+t3LdVDEm1FPgadRyba1EUuwiNtLmGjuFUI7W/F8tXP6/0TKDrqiMB/mFJHdN2zmGluZ/bTQPLBcdddwgoVX7yvozqDPawsY8g+G1F7ryPoqFhAJUCsamA02YD5nIRMKwmShMIBimxq/HT3j0FzbfQXLsd/urBp4oRgOMIPB6KrgALP0GVSuKFmZje4ZN+/EoRVTjTuO2RZXWQwHKy7bloP8BqXbHNJZcwuc3FjUm2ETJ76r3zhCfA6JySRQlgFiTsrYax/MTqNub4=; 4:5mtURGZIU5/V8Ut3ho9LWqLip/JkHVfSI+zmAlw45UmsfqirLDgaUEcnCDo9HdBHizE7n1Cj41UoKm7rGJJyCEsrQWVufkepjdEwCH79/0hZfJJWOIH+ikUV6cKBZb8ZhHOMgduZOQhhcOwXyADwa285DJReMid0htFjMshRSWqnq+NzhC/ayCLWWZSUvqiJKd7bgEZFF0Uvt6R9Sl4uUifftZw4fxyt706Qju4jJT6h1+Xiejfg29BVZEc1tbMEpdSLMiW5WDpt3oKnIF4Il6Vz/zPO7t29nBxwzpdfVBl/zU5jdONqe46LvlFLmGXq X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:1; PCL:0; RULEID:(601004)(5005006)(1201001)(3002001); SRVR:DM2PR0301MB1263; BCL:1; PCL:0; RULEID:; SRVR:DM2PR0301MB1263; X-Forefront-PRVS: 066898046A X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM2PR0301MB1263; 23:ZqtZjOT/ICWawBV5xTCSzLMVHnM4z8PZWBVFdoZ?= =?us-ascii?Q?BV3QOvnHcMuncBczyzsSD6pMBgmEO5XsHdkkeKS6CQZSTh6FhtCF4BXYIdXP?= =?us-ascii?Q?AwpBT0DaWvP/izpDfSblyVHVdds2Uz7+KjRruD5ZERmqP7b0R6GGYeVvTpk9?= =?us-ascii?Q?VKzy9mb7hSg/t3p+UqkLFL48pPmS27yVvsQ2+b1a9781wFQZnHKjXlkpoDIA?= =?us-ascii?Q?j1yYSoPCWeqp73MO95mzqwZEsBbyMJMDfX2DTB3UD5L0vKgdT3yoAMOp5SHz?= =?us-ascii?Q?PkkhdYY6iDxzTjnYx6in/FGanC10UX/L1cCXEsjVe1SCkv2jYRP4pY1XzTsJ?= =?us-ascii?Q?q1hWbOF4EdVpDmvOJHxw2SiB+HZB+nc0lc/GH58jkkBxzcchdoqdGXGsyRHr?= =?us-ascii?Q?hO4iw80lP2LmVqnzHsp8Ek+IUEPjIJw5aoieZ402wS4IMq6ZQOLYN4Puw1DG?= =?us-ascii?Q?mlxN8KkBKs3Jf1KdAk1tsHrqi7cJiXQxkBjD3AHW3P3nnCE3/qqHVPYlT6wh?= =?us-ascii?Q?1A7PHfQORwRaXcAy5ch6Snf+36GTmhNmtac+ER7nV/NCpiJVxLwLm/WCoMoz?= =?us-ascii?Q?GuDJoX9ihg/RTF5f45bWAW40Qp9d6xTQfttKDzBXU+NQNmbi/pZnsalYNrCz?= =?us-ascii?Q?qXrUAJNZM+b2lkwTm+7hSQ+8oBXm9DvBsTYwueUZ4lTxvIoMI7jfB8F0pH5G?= =?us-ascii?Q?3CvpcxrbCvdOAHEunsdCSxzMlP35AMGypPrJH/PAAp0rBr5yUvAum53jt5/R?= =?us-ascii?Q?nL2BdiFRpQH7pplWLs2AJSS75LRGn7HkY23Zm3CEqkVVCUci+GYFY5e+av3j?= =?us-ascii?Q?9dzK93pQ6WfPcR4OeWlaRFF2C/ak/ZkZiZUiBIMFnPnYepzOYp2Dy+80f/9i?= =?us-ascii?Q?2QY9n7JuTQ8oXZkmaJpg0svipZBUzzYXaZdCljut0/7UTv1sJDj8YaR3BqSG?= =?us-ascii?Q?NxJsqVXP7qqHZNAp+7IthIqCl/ADs7YLdE0Ko8Onv0OKhM+ooZFEkyvVer4d?= =?us-ascii?Q?nbQHjyRQhbVpM+l1vNbKoFp02MTrNXJRxavXXpg3VUVUBQcQfsYB4+CpOGCA?= =?us-ascii?Q?6hSc1QA0uwlXZRiVJAZ4GX3G0j1/uo6eHqWEF2VWKaKSkBC3T8a4lrGGiEX/?= =?us-ascii?Q?5EqOosGsYLenkqrZMKEj6vh297s8nB1X42bXeRPbEEOjD4oP1ui6jK8NADNP?= =?us-ascii?Q?EfutnvPTb10Gu9ZSvxvpI8fH7iQjAKF4N/GEnNWC+NdrlYdskCcgZiN6Ufnb?= =?us-ascii?Q?zPE9jzDMAzc4rN6kbtyM=3D?= X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB1263; 5:KFUS2ateH62oEzr7kTvioXojWMa7JVComP9ftJ2BiF1qfwiW72qY1Cd7ismSLkdOxzezmcYPYhoRPN6/ScxYOBPH0FbauPsEaXUD6QdYqtjixb3Zk5aJhoU3ubctnbLCdkd3kkOOevtorigbvyZs7Q==; 24:0SZTyPqQL36l0ZZ7wTvylUqyT+2ZNrHvKJD8R8Iu0U9KVV3VC2jFt5jqFakuXE7lshS2r4kOJh5gLIjjXSROdNQv5HT8BNIdoGamJFYeSkk=; 20:VLjRlmR8L8dC4VH7mKMpZRKcHBxHICsTE4W5bPczQmRXJ098ynbRD9sS4jG0ivD01icW20rssojbscoJpDXPew== X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Aug 2015 11:09:22.7527 (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: DM2PR0301MB1263 Cc: alsa-devel@alsa-project.org, broonie@kernel.org, tiwai@suse.com, Zidan Wang Subject: [alsa-devel] [PATCH v2] ASoC: fsl-asoc-card: add wm8960 support 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 wm8960 support for fsl-asoc-card Signed-off-by: Zidan Wang Acked-by: Nicolin Chen --- sound/soc/fsl/fsl-asoc-card.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sound/soc/fsl/fsl-asoc-card.c b/sound/soc/fsl/fsl-asoc-card.c index 040362f..5aeb6ed 100644 --- a/sound/soc/fsl/fsl-asoc-card.c +++ b/sound/soc/fsl/fsl-asoc-card.c @@ -23,6 +23,7 @@ #include "../codecs/sgtl5000.h" #include "../codecs/wm8962.h" +#include "../codecs/wm8960.h" #define RX 0 #define TX 1 @@ -479,6 +480,12 @@ static int fsl_asoc_card_probe(struct platform_device *pdev) priv->codec_priv.fll_id = WM8962_SYSCLK_FLL; priv->codec_priv.pll_id = WM8962_FLL; priv->dai_fmt |= SND_SOC_DAIFMT_CBM_CFM; + } else if (of_device_is_compatible(np, "fsl,imx-audio-wm8960")) { + codec_dai_name = "wm8960-hifi"; + priv->card.set_bias_level = fsl_asoc_card_set_bias_level; + priv->codec_priv.fll_id = WM8960_SYSCLK_AUTO; + priv->codec_priv.pll_id = WM8960_SYSCLK_AUTO; + priv->dai_fmt |= SND_SOC_DAIFMT_CBM_CFM; } else { dev_err(&pdev->dev, "unknown Device Tree compatible\n"); return -EINVAL; @@ -582,6 +589,7 @@ static const struct of_device_id fsl_asoc_card_dt_ids[] = { { .compatible = "fsl,imx-audio-cs42888", }, { .compatible = "fsl,imx-audio-sgtl5000", }, { .compatible = "fsl,imx-audio-wm8962", }, + { .compatible = "fsl,imx-audio-wm8960", }, {} };