From patchwork Wed Dec 6 02:35:01 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 10094869 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 609B860329 for ; Wed, 6 Dec 2017 02:36:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 613CF200DF for ; Wed, 6 Dec 2017 02:36:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 559E828931; Wed, 6 Dec 2017 02:36:07 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.8 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, DKIM_SIGNED, RCVD_IN_DNSWL_NONE, T_DKIM_INVALID autolearn=no version=3.3.1 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BB524200DF for ; Wed, 6 Dec 2017 02:36:05 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 763E22678B9; Wed, 6 Dec 2017 03:36:04 +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 14B1426791F; Wed, 6 Dec 2017 03:36:03 +0100 (CET) Received: from relmlie1.idc.renesas.com (relmlor2.renesas.com [210.160.252.172]) by alsa0.perex.cz (Postfix) with ESMTP id E1F792678B6 for ; Wed, 6 Dec 2017 03:35:06 +0100 (CET) Received: from unknown (HELO relmlir1.idc.renesas.com) ([10.200.68.151]) by relmlie1.idc.renesas.com with ESMTP; 06 Dec 2017 11:35:05 +0900 Received: from relmlii1.idc.renesas.com (relmlii1.idc.renesas.com [10.200.68.65]) by relmlir1.idc.renesas.com (Postfix) with ESMTP id 57FCE70E08; Wed, 6 Dec 2017 11:35:05 +0900 (JST) X-IronPort-AV: E=Sophos;i="5.45,366,1508770800"; d="scan'208";a="264280340" Received: from mail-hk2apc01lp0215.outbound.protection.outlook.com (HELO APC01-HK2-obe.outbound.protection.outlook.com) ([65.55.88.215]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-SHA256; 06 Dec 2017 11:35:04 +0900 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=renesasgroup.onmicrosoft.com; s=selector1-renesas-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=TGt29eou1QAzpt/vkKl2x7xLW07ZpVyvAmX28Ffg3Fs=; b=pMRIugBd/pEEL+8lncgRpCvg23ikCuwzPWVZsOdSEswjI4Bo+sjOtSfQ3DP0mnCQcOuEZl7iCCO+DrXfpgXKTBJcjZL37pT8WeFETG9sWrIaMWrLCbojV3QXrMpM6nOuKiwhumxIYwax6DFY/S4QW+kTMGySB8H169Wy5hdIUoY= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=kuninori.morimoto.gx@renesas.com; Received: from morimoto-PC.renesas.com (211.11.155.138) by PS1PR0601MB1882.apcprd06.prod.outlook.com (2603:1096:803:8::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.302.9; Wed, 6 Dec 2017 02:35:01 +0000 Message-ID: <87bmjczj6c.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto User-Agent: Wanderlust/2.15.9 Emacs/24.3 Mule/6.0 MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") To: Mark Brown In-Reply-To: <87mv2wzjb8.wl%kuninori.morimoto.gx@renesas.com> References: <87mv2wzjb8.wl%kuninori.morimoto.gx@renesas.com> Date: Wed, 6 Dec 2017 02:35:01 +0000 X-Originating-IP: [211.11.155.138] X-ClientProxiedBy: HK2PR02CA0151.apcprd02.prod.outlook.com (2603:1096:201:1f::11) To PS1PR0601MB1882.apcprd06.prod.outlook.com (2603:1096:803:8::20) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ef1e4472-6920-472e-693b-08d53c51f392 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(5600026)(4604075)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(48565401081)(2017052603286); SRVR:PS1PR0601MB1882; X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1882; 3:0DiMpnXJNyCZ7jOiv7oaaoKVc7S0XAWYD8TVa8Ke17RoWl+IYAq4MvZURgbGesG8gH88LiUYgBblOSHyxj6zyDhIuMTX7cuAd+QbiHjxdnee0FP3hPglPTUnX2ZK3LsN2LKO3tjn0mvC9JEo/iJp3EUFJrRswjby4SnnVX4tFUOVzxMvNjAS+NAOZ4CMkkBl0YlE/tRYikPh0Lxm3RKM+DE/niGxUnSyw6rac49XR2hX0oqC8komGkUhoeuAR/sr; 25:BhP53bD3xyF9y+DwRZGON0wuEwaT1ABROXc8+ONohNb+BybW2CzUbmLeWWqGq29xw26KCIEyAj3d4hTSOfpzPUCCk+excxdHc4XwWbBBSUiWVF2SaZrCGvy3FMUubKWNf/v8QuNEHIPT4Jas4VzhFQNnovOZpmtXVRrXJVxjhYXm0KtIP2pqW0HTEIHwyQcivEIQiUNakMP3W4UPaGYjWw2vl6+I51VBUTTVtGz/EgYkXCWxvdZJxpHNhlfXeesx68p4/cqiNhjZblvg1B9nlR/4CCn7UNuen7v+6d1Jp3F0r5TUsAndC+CyLBPdqTRQBcxmRjb+wp9LaCQVLwbJfA==; 31:UizBWQ4SCeX5AzBBCt8XVYtBTdrMkJxzwioJklsbHwUODTC15F58gfre+k9a+yP1QUqF3N8VQSNr8DCZ+Or4Pd7aESSSkfyArvOUmyKjLi1A58LbxAKtpEIMCUy+ndfb3oPEGRsx/IaFzCrhQWVU2rKKj2YJLA4Y4qGp4Rk/0F6rHZNRNknr+hnOP4hTuxfO8O0k1lg5KdFoMohisCGVHCer5/uVn2HcF9pGvPobbH8= X-MS-TrafficTypeDiagnostic: PS1PR0601MB1882: X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1882; 20:1GxWiYrptGZigtMaG/GguoTL1X9SUDKZgIc+WUf65+vP+eXTDUwso+xBKcCiWm0ptLaZpdzAmqL0UY1Zr2HFRQrlbfduYz3k8476K7CKoXqj4giiKUNaGdn0MtuZ3g80t/cOWCq/3OMhIOI5n7T70RnbfqxGXBUZuorWaFt4Iu4OefW6rO3r4PjT646N7RLbJxrlZac9Xczt89ntbICRtogWHIAVyct3LviKq/Q8M/zkiTBrV3uwqKtmTbhvTKWvekQuYDHv8Vw07XtdwavF0XJEyBvXGpj4yK1bNxzjvZjxRSX5WAR1T1Yt3OhcFnvOx8Iv6wtTbLt1imk2jMvEYLmZcV2hIt3qAHz20lhbvQ9KpbP3RqIbrXrhw9QbVgG8COWQsS6i2oqRInFQQY00BXrT6ShJOBy12Oomaq9mWcH7SqSapmRQ0n4ze+aCq/m46cZ11g/mUJYk8iXElE8YPs8/qzSGnJ7BMp/pxNauDuS7kT9pCgzEDFzO8suPmCGP; 4:KrQAJ3G6G+6CU4+vq5I1taIh68Vq2euXOfjCnyxpqhYnL+ByjEAHtEMwKPRMRXb/2G7gJ+wvT9NxMjkGGf6Obz/1FA0XZuvBHi+pt0WE0rB847Wb46JuYrRFlbOrNpnolDB4ce5aTeKcQnKqR7teHyE4/+P06F+kSnT1N3WWBKed6albd+IR4RbKiFxMyhq559JX2f9gjTr7OVcurKH/PI8m059jfuBZZHZt2UqCaXmDyedbdxSHuSHXHgVmM7lMRE82Dsd/Dy/BkYc2obonxtd+of+5Ngb5+l9BVjcdSO1x/rYEmeZoHyUcm3w/hyEcwSNr6KeLNo7fPeAHCzWwTQ== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(20558992708506)(788757137089); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040450)(2401047)(8121501046)(5005006)(3002001)(10201501046)(93006095)(93001095)(3231022)(6055026)(6041248)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123558100)(20161123560025)(20161123555025)(20161123562025)(20161123564025)(6072148)(201708071742011); SRVR:PS1PR0601MB1882; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:PS1PR0601MB1882; X-Forefront-PRVS: 05134F8B4F X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(979002)(39860400002)(346002)(366004)(376002)(199004)(189003)(54906003)(68736007)(8936002)(4326008)(53936002)(25786009)(478600001)(36756003)(66066001)(16526018)(6486002)(47776003)(50466002)(7736002)(6116002)(3846002)(305945005)(81156014)(2906002)(575784001)(86362001)(83506002)(8676002)(53416004)(81166006)(7696005)(58126008)(316002)(23726003)(16586007)(76176011)(52116002)(105586002)(106356001)(33646002)(69596002)(6916009)(2950100002)(5660300001)(97736004)(101416001)(21314002)(16060500001)(969003)(989001)(999001)(1009001)(1019001); DIR:OUT; SFP:1102; SCL:1; SRVR:PS1PR0601MB1882; H:morimoto-PC.renesas.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: renesas.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; PS1PR0601MB1882; 23:D3lOo64BlY4ZFdED4vyavE0L6hpoXZj0EJCub/9?= =?us-ascii?Q?S/6uCNqrkbDKkzRaWQ8IekelRfdDicrBNNJxG1nk3S7Uqz02qtL/7FwzlHdn?= =?us-ascii?Q?g4hTR2Jdc73/Jh1pbP+9lOAr2/MXpHCRNd8nojLrHN5TLDpbyFswb1mDopPW?= =?us-ascii?Q?mJ65JnaWX4B0TK0db+jFtD0azCJUgHg+UnHGxKatr9olyClzPlp+W5jgxI23?= =?us-ascii?Q?rlm+NESlFtVtUwTvfozTHLPxnSHgSectOPji8NaeZqRjgfAgnW/m3ZhUegDw?= =?us-ascii?Q?yr4otV2pLmfOM4bwB6rU6KLBByffkGHj9bhlfu/cCaugkeUMJ1zJFpxdXcfA?= =?us-ascii?Q?lvaRHmsn+Osbz9najiBcGNJ4hQ18juzsUyvk8gLME22EMgiHmzGP72+nPsbb?= =?us-ascii?Q?hZrASWQJxK4j7CMkKGHK5qGdGd5xqbus8fvjqPLa0iX40gf6ijQGOmyswUQM?= =?us-ascii?Q?lC3HQ1jOGRZl63xYhsEdLGs9bcqjULzOCOBTHzbOY0n7E5Do0sA4/tjUcJUI?= =?us-ascii?Q?G76S4uDYzp4CowdN9VcPi/kcEp3vtsf4UE4fmAGiQrSJt/JuHrerVDCHQLjK?= =?us-ascii?Q?WbPwwpCN6AwPHw4+UadrV2pE3U0D6tb8YKJyjBA08lmObmjQPGizWo0vV1gN?= =?us-ascii?Q?9BaLx2WXCu9re2NDb9cHi7XfGsmbvmi2Tjac1NB8Y3SKjztOIJbprc5If5fA?= =?us-ascii?Q?bD/Z3tE5Xtp8/xy7EA9+vT58H2VTuWcpLJ3WOw2kG3ysaoNkjB7s/DkUwp2O?= =?us-ascii?Q?GRKfMLILPbpB0hAzFb7jd7vrI56QVAzoMbmQpzMrNXijwx2pPxN4Xt29OhvE?= =?us-ascii?Q?BR7o29nccSTAZ7GOkX+Gs/clvuwQhU1Xl6K/8BEgggup2qVcS0aRy2NFe3i+?= =?us-ascii?Q?K7PYu89KNdTOeAJAp3faj/FGIDyWJ64k8yQBwx+Dw6Y5XPeCjV8KVkQYfPYu?= =?us-ascii?Q?CbpR+pRUzi4Y739nDLpLZ1o7Ramho+gtpvtRl6LLIjtpDVoH597SWw4K06rS?= =?us-ascii?Q?Fi3Z2aGFZcyel1LDQvhpd4Xoa1DRIZDSvFJKAjHNL48ciD5hsWTwDZN1DyzZ?= =?us-ascii?Q?WLt/PcWnriCItdVTK6VwIQzfP25hDkXOFMAXbCSri/TXYM6eIys1TymnVzpl?= =?us-ascii?Q?8UK5UFVbLGtTWmu1/uRCIZzAwPRK6OotBYJt0xUlb8APQylpxg+OJxlegyXz?= =?us-ascii?Q?2uS6zDApaFnV0wCWYhzF4uW2T032QkxOgBWLACOqgvNpEZSJps3jKDdVJEkP?= =?us-ascii?Q?hMd2ZswjyLiHO3ifQY6w=3D?= X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1882; 6:R9/JA8AY4QdQ65BolmLrSGaPFnr0pIraXIk0WWC4fHxTSjS9HhvdGvNU73aoqv357gtflCF9E3hNUEWKDytgOeNIYDKHnOng87f4UzfmTDfXFHjfvPwWzUAUFBu+ECPOz+1ke3dvxFrhVud0M8yGnQF8BeyQ7kKwiH4GIzPKZhzNvCSEo3hyhFLGW3KIXTpYbPOkjdELMxJWXHAx1cV7Yo9MnyRLl5XRSY5xZmFbZAb/kIvJhWkIfLtdC4XLNLYcAJHwyLQwR3aQ65f7/FAziS2ReYTcLK00Ab6ZHb9vYSzMRi4iCv6c1n6gCkKQdAP244uwnzZuVP+qtNuBBymlsW7L7LDShpjcDFLakCaec5k=; 5:fOU1FGNVgXKz4iYN3XQ9cNRXomZNhnPq4PjicmduMKOvkis7jDii1P0t0RjbsYj7j9+T5qFp6oQpBkYYxhE0KR0X9xzDIcANWXs7nJQ+NvZvYtfUbY8TyvjcMQlJGIdXh1wfgfFbYDfF2myJqeMB6n5C2UjXK70OMQQ/bD+f3Xo=; 24:bNDQQ78Qi9m0JNwkyqSaz4xBfAoq28x6tgOpAiyM5i9g43xyG9S7XCl7S5lj3TU9sBntc9UKe1EqAOzOZuFBQ5wuxLpq+yI+7iFZmv/0EhI=; 7:WbJubRzH02Ol2mNYG5nAjbxKxp9mBHlxI1MvyVLxRZVzMGP91ReRMgw2evk99bCcY7PI65xa9Qvf1/UJdmwzlwEAXSl8gAdYR4l4pA+i38i63CRibwhNfIKqQcBYWRo+CMPi/sd7qGZaA4b061ISqJvcWF20dLO0/dDFwzipFw1bf6SoVSvMntXwBrveqY6XAv0fWE435Q+6gBK5Y7jM+PubANomw8KzSDVI3o0JUeJJFXjWU6glMWmtAUOhz6Yw SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1882; 20:9fJ2J3x/XjxINS/A5GsvlXxBBcXsj8Nx3bP1Ngj5qLhPOxGdjWiQjGaPSzzNA9ZuVkO4hwzsqcD4CIvhmd1qaaQg6+ZOJQvr1AxTeqh+SgLWdjyFW9DqwQunN5gAh8fe5J3+AjiaII/95ASVKixko6pS2mAWZEkh+TmRpt44Tf8= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Dec 2017 02:35:01.0988 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ef1e4472-6920-472e-693b-08d53c51f392 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-Transport-CrossTenantHeadersStamped: PS1PR0601MB1882 Cc: Linux-ALSA , Simon Subject: [alsa-devel] [PATCH 8/x][RFC] ASoC: wm0010: replace codec to component 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 Now we can replace Codec to Component. Let's do it. Note: xxx_codec_xxx() -> xxx_component_xxx() .idle_bias_off = 1 -> .idle_bias_on = 0 .ignore_pmdown_time = 0 -> .pmdown_time = 1 - -> .endianness = 1 - -> .non_legacy_dai_naming = 1 Signed-off-by: Kuninori Morimoto --- sound/soc/codecs/wm0010.c | 181 +++++++++++++++++++++++----------------------- 1 file changed, 89 insertions(+), 92 deletions(-) diff --git a/sound/soc/codecs/wm0010.c b/sound/soc/codecs/wm0010.c index 0147d2f..ab1ad33 100644 --- a/sound/soc/codecs/wm0010.c +++ b/sound/soc/codecs/wm0010.c @@ -90,7 +90,7 @@ enum wm0010_state { }; struct wm0010_priv { - struct snd_soc_codec *codec; + struct snd_soc_component *component; struct mutex lock; struct device *dev; @@ -157,9 +157,9 @@ static const char *wm0010_state_to_str(enum wm0010_state state) } /* Called with wm0010->lock held */ -static void wm0010_halt(struct snd_soc_codec *codec) +static void wm0010_halt(struct snd_soc_component *component) { - struct wm0010_priv *wm0010 = snd_soc_codec_get_drvdata(codec); + struct wm0010_priv *wm0010 = snd_soc_component_get_drvdata(component); unsigned long flags; enum wm0010_state state; @@ -193,7 +193,7 @@ static void wm0010_halt(struct snd_soc_codec *codec) struct wm0010_boot_xfer { struct list_head list; - struct snd_soc_codec *codec; + struct snd_soc_component *component; struct completion *done; struct spi_message m; struct spi_transfer t; @@ -218,13 +218,13 @@ static void wm0010_mark_boot_failure(struct wm0010_priv *wm0010) static void wm0010_boot_xfer_complete(void *data) { struct wm0010_boot_xfer *xfer = data; - struct snd_soc_codec *codec = xfer->codec; - struct wm0010_priv *wm0010 = snd_soc_codec_get_drvdata(codec); + struct snd_soc_component *component = xfer->component; + struct wm0010_priv *wm0010 = snd_soc_component_get_drvdata(component); u32 *out32 = xfer->t.rx_buf; int i; if (xfer->m.status != 0) { - dev_err(codec->dev, "SPI transfer failed: %d\n", + dev_err(component->dev, "SPI transfer failed: %d\n", xfer->m.status); wm0010_mark_boot_failure(wm0010); if (xfer->done) @@ -233,11 +233,11 @@ static void wm0010_boot_xfer_complete(void *data) } for (i = 0; i < xfer->t.len / 4; i++) { - dev_dbg(codec->dev, "%d: %04x\n", i, out32[i]); + dev_dbg(component->dev, "%d: %04x\n", i, out32[i]); switch (be32_to_cpu(out32[i])) { case 0xe0e0e0e0: - dev_err(codec->dev, + dev_err(component->dev, "%d: ROM error reported in stage 2\n", i); wm0010_mark_boot_failure(wm0010); break; @@ -245,82 +245,82 @@ static void wm0010_boot_xfer_complete(void *data) case 0x55555555: if (wm0010->state < WM0010_STAGE2) break; - dev_err(codec->dev, + dev_err(component->dev, "%d: ROM bootloader running in stage 2\n", i); wm0010_mark_boot_failure(wm0010); break; case 0x0fed0000: - dev_dbg(codec->dev, "Stage2 loader running\n"); + dev_dbg(component->dev, "Stage2 loader running\n"); break; case 0x0fed0007: - dev_dbg(codec->dev, "CODE_HDR packet received\n"); + dev_dbg(component->dev, "CODE_HDR packet received\n"); break; case 0x0fed0008: - dev_dbg(codec->dev, "CODE_DATA packet received\n"); + dev_dbg(component->dev, "CODE_DATA packet received\n"); break; case 0x0fed0009: - dev_dbg(codec->dev, "Download complete\n"); + dev_dbg(component->dev, "Download complete\n"); break; case 0x0fed000c: - dev_dbg(codec->dev, "Application start\n"); + dev_dbg(component->dev, "Application start\n"); break; case 0x0fed000e: - dev_dbg(codec->dev, "PLL packet received\n"); + dev_dbg(component->dev, "PLL packet received\n"); wm0010->pll_running = true; break; case 0x0fed0025: - dev_err(codec->dev, "Device reports image too long\n"); + dev_err(component->dev, "Device reports image too long\n"); wm0010_mark_boot_failure(wm0010); break; case 0x0fed002c: - dev_err(codec->dev, "Device reports bad SPI packet\n"); + dev_err(component->dev, "Device reports bad SPI packet\n"); wm0010_mark_boot_failure(wm0010); break; case 0x0fed0031: - dev_err(codec->dev, "Device reports SPI read overflow\n"); + dev_err(component->dev, "Device reports SPI read overflow\n"); wm0010_mark_boot_failure(wm0010); break; case 0x0fed0032: - dev_err(codec->dev, "Device reports SPI underclock\n"); + dev_err(component->dev, "Device reports SPI underclock\n"); wm0010_mark_boot_failure(wm0010); break; case 0x0fed0033: - dev_err(codec->dev, "Device reports bad header packet\n"); + dev_err(component->dev, "Device reports bad header packet\n"); wm0010_mark_boot_failure(wm0010); break; case 0x0fed0034: - dev_err(codec->dev, "Device reports invalid packet type\n"); + dev_err(component->dev, "Device reports invalid packet type\n"); wm0010_mark_boot_failure(wm0010); break; case 0x0fed0035: - dev_err(codec->dev, "Device reports data before header error\n"); + dev_err(component->dev, "Device reports data before header error\n"); wm0010_mark_boot_failure(wm0010); break; case 0x0fed0038: - dev_err(codec->dev, "Device reports invalid PLL packet\n"); + dev_err(component->dev, "Device reports invalid PLL packet\n"); break; case 0x0fed003a: - dev_err(codec->dev, "Device reports packet alignment error\n"); + dev_err(component->dev, "Device reports packet alignment error\n"); wm0010_mark_boot_failure(wm0010); break; default: - dev_err(codec->dev, "Unrecognised return 0x%x\n", + dev_err(component->dev, "Unrecognised return 0x%x\n", be32_to_cpu(out32[i])); wm0010_mark_boot_failure(wm0010); break; @@ -342,10 +342,10 @@ static void byte_swap_64(u64 *data_in, u64 *data_out, u32 len) data_out[i] = cpu_to_be64(le64_to_cpu(data_in[i])); } -static int wm0010_firmware_load(const char *name, struct snd_soc_codec *codec) +static int wm0010_firmware_load(const char *name, struct snd_soc_component *component) { - struct spi_device *spi = to_spi_device(codec->dev); - struct wm0010_priv *wm0010 = snd_soc_codec_get_drvdata(codec); + struct spi_device *spi = to_spi_device(component->dev); + struct wm0010_priv *wm0010 = snd_soc_component_get_drvdata(component); struct list_head xfer_list; struct wm0010_boot_xfer *xfer; int ret; @@ -359,9 +359,9 @@ static int wm0010_firmware_load(const char *name, struct snd_soc_codec *codec) INIT_LIST_HEAD(&xfer_list); - ret = request_firmware(&fw, name, codec->dev); + ret = request_firmware(&fw, name, component->dev); if (ret != 0) { - dev_err(codec->dev, "Failed to request application(%s): %d\n", + dev_err(component->dev, "Failed to request application(%s): %d\n", name, ret); return ret; } @@ -377,25 +377,25 @@ static int wm0010_firmware_load(const char *name, struct snd_soc_codec *codec) /* First record should be INFO */ if (rec->command != DFW_CMD_INFO) { - dev_err(codec->dev, "First record not INFO\r\n"); + dev_err(component->dev, "First record not INFO\r\n"); ret = -EINVAL; goto abort; } if (inforec->info_version != INFO_VERSION) { - dev_err(codec->dev, + dev_err(component->dev, "Unsupported version (%02d) of INFO record\r\n", inforec->info_version); ret = -EINVAL; goto abort; } - dev_dbg(codec->dev, "Version v%02d INFO record found\r\n", + dev_dbg(component->dev, "Version v%02d INFO record found\r\n", inforec->info_version); /* Check it's a DSP file */ if (dsp != DEVICE_ID_WM0010) { - dev_err(codec->dev, "Not a WM0010 firmware file.\r\n"); + dev_err(component->dev, "Not a WM0010 firmware file.\r\n"); ret = -EINVAL; goto abort; } @@ -405,7 +405,7 @@ static int wm0010_firmware_load(const char *name, struct snd_soc_codec *codec) rec = (void *)&rec->data[rec->length]; while (offset < fw->size) { - dev_dbg(codec->dev, + dev_dbg(component->dev, "Packet: command %d, data length = 0x%x\r\n", rec->command, rec->length); len = rec->length + 8; @@ -416,7 +416,7 @@ static int wm0010_firmware_load(const char *name, struct snd_soc_codec *codec) goto abort; } - xfer->codec = codec; + xfer->component = component; list_add_tail(&xfer->list, &xfer_list); out = kzalloc(len, GFP_KERNEL | GFP_DMA); @@ -460,18 +460,18 @@ static int wm0010_firmware_load(const char *name, struct snd_soc_codec *codec) rec = (void *)&rec->data[rec->length]; if (offset >= fw->size) { - dev_dbg(codec->dev, "All transfers scheduled\n"); + dev_dbg(component->dev, "All transfers scheduled\n"); xfer->done = &done; } ret = spi_async(spi, &xfer->m); if (ret != 0) { - dev_err(codec->dev, "Write failed: %d\n", ret); + dev_err(component->dev, "Write failed: %d\n", ret); goto abort1; } if (wm0010->boot_failed) { - dev_dbg(codec->dev, "Boot fail!\n"); + dev_dbg(component->dev, "Boot fail!\n"); ret = -EINVAL; goto abort1; } @@ -496,10 +496,10 @@ static int wm0010_firmware_load(const char *name, struct snd_soc_codec *codec) return ret; } -static int wm0010_stage2_load(struct snd_soc_codec *codec) +static int wm0010_stage2_load(struct snd_soc_component *component) { - struct spi_device *spi = to_spi_device(codec->dev); - struct wm0010_priv *wm0010 = snd_soc_codec_get_drvdata(codec); + struct spi_device *spi = to_spi_device(component->dev); + struct wm0010_priv *wm0010 = snd_soc_component_get_drvdata(component); const struct firmware *fw; struct spi_message m; struct spi_transfer t; @@ -508,14 +508,14 @@ static int wm0010_stage2_load(struct snd_soc_codec *codec) int i; int ret = 0; - ret = request_firmware(&fw, "wm0010_stage2.bin", codec->dev); + ret = request_firmware(&fw, "wm0010_stage2.bin", component->dev); if (ret != 0) { - dev_err(codec->dev, "Failed to request stage2 loader: %d\n", + dev_err(component->dev, "Failed to request stage2 loader: %d\n", ret); return ret; } - dev_dbg(codec->dev, "Downloading %zu byte stage 2 loader\n", fw->size); + dev_dbg(component->dev, "Downloading %zu byte stage 2 loader\n", fw->size); /* Copy to local buffer first as vmalloc causes problems for dma */ img = kzalloc(fw->size, GFP_KERNEL | GFP_DMA); @@ -541,19 +541,19 @@ static int wm0010_stage2_load(struct snd_soc_codec *codec) t.speed_hz = wm0010->sysclk / 10; spi_message_add_tail(&t, &m); - dev_dbg(codec->dev, "Starting initial download at %dHz\n", + dev_dbg(component->dev, "Starting initial download at %dHz\n", t.speed_hz); ret = spi_sync(spi, &m); if (ret != 0) { - dev_err(codec->dev, "Initial download failed: %d\n", ret); + dev_err(component->dev, "Initial download failed: %d\n", ret); goto abort; } /* Look for errors from the boot ROM */ for (i = 0; i < fw->size; i++) { if (out[i] != 0x55) { - dev_err(codec->dev, "Boot ROM error: %x in %d\n", + dev_err(component->dev, "Boot ROM error: %x in %d\n", out[i], i); wm0010_mark_boot_failure(wm0010); ret = -EBUSY; @@ -570,10 +570,10 @@ static int wm0010_stage2_load(struct snd_soc_codec *codec) return ret; } -static int wm0010_boot(struct snd_soc_codec *codec) +static int wm0010_boot(struct snd_soc_component *component) { - struct spi_device *spi = to_spi_device(codec->dev); - struct wm0010_priv *wm0010 = snd_soc_codec_get_drvdata(codec); + struct spi_device *spi = to_spi_device(component->dev); + struct wm0010_priv *wm0010 = snd_soc_component_get_drvdata(component); unsigned long flags; int ret; struct spi_message m; @@ -590,7 +590,7 @@ static int wm0010_boot(struct snd_soc_codec *codec) spin_unlock_irqrestore(&wm0010->irq_lock, flags); if (wm0010->sysclk > 26000000) { - dev_err(codec->dev, "Max DSP clock frequency is 26MHz\n"); + dev_err(component->dev, "Max DSP clock frequency is 26MHz\n"); ret = -ECANCELED; goto err; } @@ -598,7 +598,7 @@ static int wm0010_boot(struct snd_soc_codec *codec) mutex_lock(&wm0010->lock); wm0010->pll_running = false; - dev_dbg(codec->dev, "max_spi_freq: %d\n", wm0010->max_spi_freq); + dev_dbg(component->dev, "max_spi_freq: %d\n", wm0010->max_spi_freq); ret = regulator_bulk_enable(ARRAY_SIZE(wm0010->core_supplies), wm0010->core_supplies); @@ -623,19 +623,19 @@ static int wm0010_boot(struct snd_soc_codec *codec) if (!wait_for_completion_timeout(&wm0010->boot_completion, msecs_to_jiffies(20))) - dev_err(codec->dev, "Failed to get interrupt from DSP\n"); + dev_err(component->dev, "Failed to get interrupt from DSP\n"); spin_lock_irqsave(&wm0010->irq_lock, flags); wm0010->state = WM0010_BOOTROM; spin_unlock_irqrestore(&wm0010->irq_lock, flags); - ret = wm0010_stage2_load(codec); + ret = wm0010_stage2_load(component); if (ret) goto abort; if (!wait_for_completion_timeout(&wm0010->boot_completion, msecs_to_jiffies(20))) - dev_err(codec->dev, "Failed to get interrupt from DSP loader.\n"); + dev_err(component->dev, "Failed to get interrupt from DSP loader.\n"); spin_lock_irqsave(&wm0010->irq_lock, flags); wm0010->state = WM0010_STAGE2; @@ -676,14 +676,14 @@ static int wm0010_boot(struct snd_soc_codec *codec) ret = spi_sync(spi, &m); if (ret) { - dev_err(codec->dev, "First PLL write failed: %d\n", ret); + dev_err(component->dev, "First PLL write failed: %d\n", ret); goto abort_swap; } /* Use a second send of the message to get the return status */ ret = spi_sync(spi, &m); if (ret) { - dev_err(codec->dev, "Second PLL write failed: %d\n", ret); + dev_err(component->dev, "Second PLL write failed: %d\n", ret); goto abort_swap; } @@ -692,7 +692,7 @@ static int wm0010_boot(struct snd_soc_codec *codec) /* Look for PLL active code from the DSP */ for (i = 0; i < len / 4; i++) { if (*p == 0x0e00ed0f) { - dev_dbg(codec->dev, "PLL packet received\n"); + dev_dbg(component->dev, "PLL packet received\n"); wm0010->pll_running = true; break; } @@ -702,9 +702,9 @@ static int wm0010_boot(struct snd_soc_codec *codec) kfree(img_swap); kfree(out); } else - dev_dbg(codec->dev, "Not enabling DSP PLL."); + dev_dbg(component->dev, "Not enabling DSP PLL."); - ret = wm0010_firmware_load("wm0010.dfw", codec); + ret = wm0010_firmware_load("wm0010.dfw", component); if (ret != 0) goto abort; @@ -723,7 +723,7 @@ static int wm0010_boot(struct snd_soc_codec *codec) kfree(out); abort: /* Put the chip back into reset */ - wm0010_halt(codec); + wm0010_halt(component); mutex_unlock(&wm0010->lock); return ret; @@ -735,22 +735,22 @@ static int wm0010_boot(struct snd_soc_codec *codec) return ret; } -static int wm0010_set_bias_level(struct snd_soc_codec *codec, +static int wm0010_set_bias_level(struct snd_soc_component *component, enum snd_soc_bias_level level) { - struct wm0010_priv *wm0010 = snd_soc_codec_get_drvdata(codec); + struct wm0010_priv *wm0010 = snd_soc_component_get_drvdata(component); switch (level) { case SND_SOC_BIAS_ON: - if (snd_soc_codec_get_bias_level(codec) == SND_SOC_BIAS_PREPARE) - wm0010_boot(codec); + if (snd_soc_component_get_bias_level(component) == SND_SOC_BIAS_PREPARE) + wm0010_boot(component); break; case SND_SOC_BIAS_PREPARE: break; case SND_SOC_BIAS_STANDBY: - if (snd_soc_codec_get_bias_level(codec) == SND_SOC_BIAS_PREPARE) { + if (snd_soc_component_get_bias_level(component) == SND_SOC_BIAS_PREPARE) { mutex_lock(&wm0010->lock); - wm0010_halt(codec); + wm0010_halt(component); mutex_unlock(&wm0010->lock); } break; @@ -761,10 +761,10 @@ static int wm0010_set_bias_level(struct snd_soc_codec *codec, return 0; } -static int wm0010_set_sysclk(struct snd_soc_codec *codec, int source, +static int wm0010_set_sysclk(struct snd_soc_component *component, int source, int clk_id, unsigned int freq, int dir) { - struct wm0010_priv *wm0010 = snd_soc_codec_get_drvdata(codec); + struct wm0010_priv *wm0010 = snd_soc_component_get_drvdata(component); unsigned int i; wm0010->sysclk = freq; @@ -783,20 +783,19 @@ static int wm0010_set_sysclk(struct snd_soc_codec *codec, int source, return 0; } -static int wm0010_probe(struct snd_soc_codec *codec); - -static const struct snd_soc_codec_driver soc_codec_dev_wm0010 = { - .probe = wm0010_probe, - .set_bias_level = wm0010_set_bias_level, - .set_sysclk = wm0010_set_sysclk, - .idle_bias_off = true, - - .component_driver = { - .dapm_widgets = wm0010_dapm_widgets, - .num_dapm_widgets = ARRAY_SIZE(wm0010_dapm_widgets), - .dapm_routes = wm0010_dapm_routes, - .num_dapm_routes = ARRAY_SIZE(wm0010_dapm_routes), - }, +static int wm0010_probe(struct snd_soc_component *component); + +static const struct snd_soc_component_driver soc_component_dev_wm0010 = { + .probe = wm0010_probe, + .set_bias_level = wm0010_set_bias_level, + .set_sysclk = wm0010_set_sysclk, + .dapm_widgets = wm0010_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(wm0010_dapm_widgets), + .dapm_routes = wm0010_dapm_routes, + .num_dapm_routes = ARRAY_SIZE(wm0010_dapm_routes), + .pmdown_time = 1, + .endianness = 1, + .non_legacy_dai_naming = 1, }; #define WM0010_RATES (SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000) @@ -860,11 +859,11 @@ static irqreturn_t wm0010_irq(int irq, void *data) return IRQ_NONE; } -static int wm0010_probe(struct snd_soc_codec *codec) +static int wm0010_probe(struct snd_soc_component *component) { - struct wm0010_priv *wm0010 = snd_soc_codec_get_drvdata(codec); + struct wm0010_priv *wm0010 = snd_soc_component_get_drvdata(component); - wm0010->codec = codec; + wm0010->component = component; return 0; } @@ -967,8 +966,8 @@ static int wm0010_spi_probe(struct spi_device *spi) else wm0010->board_max_spi_speed = 0; - ret = snd_soc_register_codec(&spi->dev, - &soc_codec_dev_wm0010, wm0010_dai, + ret = devm_snd_soc_register_component(&spi->dev, + &soc_component_dev_wm0010, wm0010_dai, ARRAY_SIZE(wm0010_dai)); if (ret < 0) return ret; @@ -980,8 +979,6 @@ static int wm0010_spi_remove(struct spi_device *spi) { struct wm0010_priv *wm0010 = spi_get_drvdata(spi); - snd_soc_unregister_codec(&spi->dev); - gpio_set_value_cansleep(wm0010->gpio_reset, wm0010->gpio_reset_value);