From patchwork Fri Jan 12 01:08:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 10159119 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 272F7601A1 for ; Fri, 12 Jan 2018 01:08:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 104282888B for ; Fri, 12 Jan 2018 01:08:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 039E6286B6; Fri, 12 Jan 2018 01:08:51 +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 8BDE5286B6 for ; Fri, 12 Jan 2018 01:08:49 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 6AA312679C8; Fri, 12 Jan 2018 02:08:48 +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 9F75B2679D1; Fri, 12 Jan 2018 02:08:47 +0100 (CET) Received: from relmlie3.idc.renesas.com (relmlor4.renesas.com [210.160.252.174]) by alsa0.perex.cz (Postfix) with ESMTP id 6B286266F50 for ; Fri, 12 Jan 2018 02:08:27 +0100 (CET) Received: from unknown (HELO relmlir2.idc.renesas.com) ([10.200.68.152]) by relmlie3.idc.renesas.com with ESMTP; 12 Jan 2018 10:08:26 +0900 Received: from relmlii2.idc.renesas.com (relmlii2.idc.renesas.com [10.200.68.66]) by relmlir2.idc.renesas.com (Postfix) with ESMTP id 627A56CF27; Fri, 12 Jan 2018 10:08:26 +0900 (JST) X-IronPort-AV: E=Sophos;i="5.46,346,1511794800"; d="scan'208";a="269306187" Received: from mail-sg2apc01lp0239.outbound.protection.outlook.com (HELO APC01-SG2-obe.outbound.protection.outlook.com) ([65.55.88.239]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-SHA256; 12 Jan 2018 10:08:25 +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=Te3Xj9DDHLO58d4MKiohhlBw37RP/h7GH1OR0lbjV7U=; b=bKLaCcADSJagGNS+Q71MDQkbgRBY6FpUS0p9IXdt1iTqPffuZ3M0Sk5AiyLl09/kTejeram/f+QAICKTkUdal/PiPUNQuGcQfB5fAM4D6iGKl/WOaUT0Vv32z5YXSY8L9lC2FF2Xn8hI24G9/Xbnit1veq5siWzF94C4i/T/At8= 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 SG2PR0601MB1885.apcprd06.prod.outlook.com (2603:1096:3:9::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.386.5; Fri, 12 Jan 2018 01:08:19 +0000 Message-ID: <877esnevgg.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto User-Agent: Wanderlust/2.15.9 Emacs/24.3 Mule/6.0 To: Mark Brown In-Reply-To: <87bmhzevk9.wl%kuninori.morimoto.gx@renesas.com> References: <87bmhzevk9.wl%kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Date: Fri, 12 Jan 2018 01:08:19 +0000 X-Originating-IP: [211.11.155.138] X-ClientProxiedBy: KAWPR01CA0077.jpnprd01.prod.outlook.com (2603:1096:402:c::13) To SG2PR0601MB1885.apcprd06.prod.outlook.com (2603:1096:3:9::18) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 525ca345-ea11-4316-f27a-08d55958f801 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020074)(4652020)(48565401081)(5600026)(4604075)(2017052603307)(7153060)(7193020); SRVR:SG2PR0601MB1885; X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1885; 3:W3OqC4bO3mIzI0HkM3kIQ6+Wt2R62EtpT6Cz5FXGRFdzRNDOZkqAo4DPuKWciQv1DT2EjRShEcN2e4QjVkvv4cuTqC3d6iMFRv7nB87dzBGgqlNRwOMjWCTdLCM2TSbg6rakmA00ECQdq5pRWgYim26eUJeABwM1DMrCSe8d0HrajL4+wsMmaySU2w4IVbANFROTPmywRHXe0rCBcpkTAdMxEhzFBUdn7q1EOL619sQt83jTcbZOKafrSmuCJGfB; 25:C8CBw0vla3pFvrd2sstx8momS+/FmmGZ5f/QXYVBaanJJP2iSEeLLDvtCEi+VsPy1KQYjLnWwY0g4qamMWepOe19M5XbqYHxVN+LsWmnhLgMKEVcCPffSin6f4IHwyOANowHn4FH1nruwA84NteCZQtGGQpB96Wr3FNvQMMbeVYpYDvWSXAIS1mJDvqB4OfqrG6w0R44CEdW3z4+KxkTRgaR7E6XC4Ao9drtBhA+Qj1KZPqsDNkmDN6HqFxG8eqknJXeHFCGZ3ibWWNSckazANBH0WZTXtne1r5wLxcdhSb6VF7wd6Ye8GYRYCBpqEsodML9Z3+bliYBpGyq16F/gA==; 31:QTUR6JSXj33rPktI+3pmkwx+F05y+43ep+5F3mz4BaiZyjjy948Om26Yo21y1GjgwcleNFgrsD/5ra2F0YwGu1Ho1Kc6lASa4y1fl+nFLdT/weHYqBAw8uiorlrz47POBdfFJAA7ohNA5I4siv4LQiAU7t84u/0Q//A2K+tVcPP9wKHLYR5BFORNFrSnpuGQLOMrE35lKYZAMTWCBHSMPxq5EExe9XJ8jBSK5+KrMfg= X-MS-TrafficTypeDiagnostic: SG2PR0601MB1885: X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1885; 20:lO/ElvQbWW25t32ZqUhCYmA1DSprBCGZVJKKfULLkoHx+rQNCwFMH7RAifgXH7/4DaIf0MOqeXlq6hj5zPoydcSuq2Te1PVSgAXeCC6pKwJcsaT2ex7Oyu0j0g8faZs2R9J1uAm72AI9/jt0tqtzvPsE7Hfywf495p1mano2/lqP83CMmGWpdkRNAW41SFa1V1EJ3olXhfk01qrfRomBOS8ctY5m3Zkrwm+5Wy49LJsxz+ivtAhOnHT0Y56c6FoOABdSmX2oA569hGsqvx5aZCfYXHYIiVYc5NBkGOFtNRTK/1junaGUPE8br7iiivTItrXhw317vjjd1QpKIA3rzivKJ7HAgqIcKEUZ0CGFTaz2XQTt5tjLiT/PWjBkMuwro6goSAurDpjY1cNpRn5CLpP1GcvomuUkAHDovlHW4+T8ZFVTFPInRwfwBrEgzPgC6n8WCLxDW6uHExYtxwcrYN2mTPTwjbKkWUwIgaqAeNH3e/kwgZb1BTgQ96+5iaHh; 4:KMacR0Fxvbp01Qs6MxZT/zSPAxLnzAZt9FAda9ZMi8Pm9CxVLHsa3KOxCryj3uBrdrlyzshbPyB5ropYKQhtYJGxC/Ep/K0XI/qIFcz9jUSMS7t7VAUb98KsJousxHlHcF0i+QBpu9HDizWLDxp1VFsVPwl6YQ7vvVyH+XmBBvhzwGaqPml6RWdDUc01oxTZTU8o1bniwaoVTGPVyhuly4Kye3CvZZKTNrHG9TnbTq9ycRIBkrbE+d7z064Zb/ZxPZcSJTrT2WYG3BlykKo/bGk33fqZy//b3kZeXCsCPMe8fO6Vb0ZmJPFwl0HHD5qMi2oTqlug9IblkujxKMqDhg== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(20558992708506)(788757137089); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040470)(2401047)(5005006)(8121501046)(3231023)(944501137)(93006095)(93001095)(10201501046)(3002001)(6055026)(6041268)(20161123562045)(20161123564045)(20161123560045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011); SRVR:SG2PR0601MB1885; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:SG2PR0601MB1885; X-Forefront-PRVS: 0550778858 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(39860400002)(366004)(346002)(39380400002)(396003)(376002)(189003)(199004)(59450400001)(23726003)(83506002)(54906003)(52116002)(7736002)(76176011)(7696005)(66066001)(81166006)(53416004)(25786009)(316002)(16526018)(8936002)(305945005)(6486002)(58126008)(53936002)(386003)(47776003)(2906002)(16586007)(36756003)(69596002)(4326008)(68736007)(97736004)(2950100002)(6916009)(105586002)(86362001)(575784001)(478600001)(81156014)(3846002)(50466002)(106356001)(6116002)(8676002)(5660300001)(21314002)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:SG2PR0601MB1885; H:morimoto-PC.renesas.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A: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; SG2PR0601MB1885; 23:DQEecCrcq2Ex2UzJivytuXUyE+6kL3yrzvbg3ra?= =?us-ascii?Q?jdfMqjNDRfHEhE0pp/9C4Ln+F8j2siZsY6TJ62gPAffF+0ga8I650PHeNjnO?= =?us-ascii?Q?O2w8IsWjcTW9iWRxEupghWZdV4uxbcmib2mDoSuWn4C+xDh5U3HuEQYTT7E7?= =?us-ascii?Q?192TdzgtUt/+WKri3vhtSMRo9WH9XGfAJexSKF3gWNWzKIiYlG7KrUnf4KZ8?= =?us-ascii?Q?L2SCiNpnkKxOI25ngd8neRHhKcwco+sGRJmUn9jOLvGemKNMltX7G04KdmRc?= =?us-ascii?Q?LDsQAWZ998t+VBfIqYVRhBYldl/pPLsU4/atKh57L/yQm9c9pfdvRq9HdBQM?= =?us-ascii?Q?sRHHEzP4kmbB6kQMhoqaBO7oqnCXepqGuaF3pMeBbsMoaDIGpLbg3BYrG8Co?= =?us-ascii?Q?UkEI/r2FR2uqKdVe4qQALoVwm7d6PMg+NMDjuv1rfF2t0IXeX0Pbo7Vsot7X?= =?us-ascii?Q?SoPJUruiRM9M4qbm5TWIuGI7Uf8cOnKteLgdc3Gl9GALwJ3oyluR2aoipJGj?= =?us-ascii?Q?g9ie80EXk7a6euQqXOoyadQD+4ca8r9AOc6Ex6THf2qc3yz7NpY01fR3KfKl?= =?us-ascii?Q?bZUt+xsUw3MPqUY32UyseJu7Rojb2WzlQeDYC520R/r5QH4k5WjVdr1DOsLQ?= =?us-ascii?Q?P6QIesfHLhlIMX0vQ4WavWE4zeQ6Rf/aTMVk0HevsQqBqgss7rfP9YJ7dxsR?= =?us-ascii?Q?lE/7/SBpxvC3tNMtseF1g7Qh0td1DS9799JVG5DLjV42WEnyAryr9L7EvQ9a?= =?us-ascii?Q?zie/IcSdr2PMzTfduJtkWW1KI6pF0Tqku1pzckGvBf7Hh2wRuLGJfRwbClNC?= =?us-ascii?Q?Dodn6GbHmOVBK1O7S0u6hLhdVqoIZyT3fDB5s3t42PA+631nsu9bFdcN6ZM+?= =?us-ascii?Q?8GK6tRYh4HgpOIXOcKmDKB9jMYBfN7hra8cKzvP7D7/5ZmNPRpaQ/w5ArSIq?= =?us-ascii?Q?uskUXuVT0ZopcY4sVkX2H/OTybYQpAdWPp6uCeFggB+KYKJvlQTlTRYbIp+M?= =?us-ascii?Q?Qf9KFzn+IO490A/hGnNPmzTr0eK5A7+mvnG+VQO7s0pBGGViVW0utnEWDoaB?= =?us-ascii?Q?UEIkMRU7bQKWqNovlFKnwj+wj9IvcD/FJ/xqd4A3hDHwwuxIjggLJKPhxbmD?= =?us-ascii?Q?MVIzZ8v80V3YgayOZlIk/uf6Dc1+1/1Kb7Ai/0yPz6CwFHOiqiZsS2WJFKrP?= =?us-ascii?Q?UOeQY6QorlUltNDqvVHnHXh9+hVo8SXs3Qb1E?= X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1885; 6:c3934QOni/dK2+4luukRRIdZZtmz78/+ujdkY5goQsFCZpjNtw3AIdwXUxiBpl0BvpmTChwX9Cm5MX+uwwFBtmpCm3CzFgvb35UcOKCV+jIzLY1oC2DMzMPmMZh+ZN4do4NtmkYJpFlfl4OV2l5SQzHQyKqyl40tK0EWT+eR8WrZHCvAgriAFKzsdIeQoWVw4HpdTJY3I2kafsyt/SdQg5YRhUJswl6eaGGIMmro7G/GlBAJPSc2Csw+YdpOBn471pc4bN1iSGRsDpY42boDo7ATqdvbqCVH7jisOh0nB66wLyXpnGB3g2MiVeWuVHNC8lHcB8a4CzEK+qZZjbe7h/YBgOAdY/0BPk7jdcoJ9Zs=; 5:xUlMhY6x+PwGcwOb0CqfxSkEAALeinWqZLgwDaOAKHmpRaqrsaL4/cboQPgig53qxgikO4oyEclYbW6UZkq1k63um+gqQtvr2DhyfzDKs2A0DX3L8Qs32R8HknIxWFd9eR1TCitieg0gZSlUSp7LKMyGIazQOwxOz8xtwRC5muA=; 24:fwBw8oA9amiZfKBFdsdNQ+MJGI1h2fEN8I1AVwfl0c7+42P2RtWZAwFOqrl+eRQBRq+CXY+2pjUhTMs/lH5EssLovID+TcJt/aNeVvd14zk=; 7:qhLPBl/BCXaIVbyQhS47MZtuxkUyP24WRgcgoIdoh47QN0K1fr+fdM1412BENJi1prjU29Natdj7jw2LzG3FY5z70nx0J3lRJvSGZiy7y0Q/DeFDsy59CJNnny5GLYjGk7F2UAoTyVONmRv+8+lQDq6g0+nliwBZf9m7qG5BMWyjn1e+0kD6+DkMmMuPWA4fI0MEcFoOyR0NtjZpjruZfUMqjVZ1RfVWWMh86mLOVV95qd2QZOUI2wU5EMcLLflx SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1885; 20:NvhWlnoTqD2y9A2vxfe2G4jk9ITEt0A3tf4aUeALWB9j8jiW9oQsVPe/hPiXEdgmftrsMfeA9x3s/GwBdKxZsPwmUCi43BWJM+tT72aA4M9LICB3f7LuHV0g5PLJ1aXc76kKA1uGjWCd5zh1JtsTkjjibbHfI+74Aw+HKC1zIUY= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jan 2018 01:08:19.0039 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 525ca345-ea11-4316-f27a-08d55958f801 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-Transport-CrossTenantHeadersStamped: SG2PR0601MB1885 Cc: Linux-ALSA , Simon Subject: [alsa-devel] [PATCH 003/187] 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 From: Kuninori Morimoto 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 Acked-by: Charles Keepax --- 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);