From patchwork Fri Jan 12 01:12:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 10159147 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 F2C3F601A1 for ; Fri, 12 Jan 2018 01:14:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DF4AD28047 for ; Fri, 12 Jan 2018 01:14:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D41402870F; Fri, 12 Jan 2018 01:14:29 +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 7BE4228047 for ; Fri, 12 Jan 2018 01:14:28 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 2AB86267B5D; Fri, 12 Jan 2018 02:14:09 +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 BFF5B267B62; Fri, 12 Jan 2018 02:14:07 +0100 (CET) Received: from relmlie1.idc.renesas.com (relmlor2.renesas.com [210.160.252.172]) by alsa0.perex.cz (Postfix) with ESMTP id 8A420267A56 for ; Fri, 12 Jan 2018 02:12:43 +0100 (CET) Received: from unknown (HELO relmlir3.idc.renesas.com) ([10.200.68.153]) by relmlie1.idc.renesas.com with ESMTP; 12 Jan 2018 10:12:41 +0900 Received: from relmlii2.idc.renesas.com (relmlii2.idc.renesas.com [10.200.68.66]) by relmlir3.idc.renesas.com (Postfix) with ESMTP id BA6CC4C55C; Fri, 12 Jan 2018 10:12:41 +0900 (JST) X-IronPort-AV: E=Sophos;i="5.46,346,1511794800"; d="scan'208";a="269306771" Received: from mail-hk2apc01lp0214.outbound.protection.outlook.com (HELO APC01-HK2-obe.outbound.protection.outlook.com) ([65.55.88.214]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-SHA256; 12 Jan 2018 10:12:40 +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=7QDL/tcTBkcZxzN1vVt4t18PrL9dw0dZwM58UCWmhY4=; b=JCUm5yPcjom2rDGNizLRKHv3erCeCv31N/h7sCjwjbgY52q8IkEVaYoKkZoki6cdPL59SCiu7fn8rYUgW1mOnLDtcw204JT/GSxtHzJNra1KCKHb1QkQdikCXiM8MxgQRmfPjsm3jdM70payloimkKXHbpdCCkK/ntUEIoF+efE= 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 SG2PR0601MB1888.apcprd06.prod.outlook.com (2603:1096:3:9::21) 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:12:37 +0000 Message-ID: <87mv1jdgot.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:12:37 +0000 X-Originating-IP: [211.11.155.138] X-ClientProxiedBy: TY1PR01CA0133.jpnprd01.prod.outlook.com (2603:1096:401:d::51) To SG2PR0601MB1888.apcprd06.prod.outlook.com (2603:1096:3:9::21) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c46cf36e-66a6-45ce-e815-08d55959924f X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020074)(4652020)(5600026)(4604075)(48565401081)(2017052603307)(7153060)(7193020); SRVR:SG2PR0601MB1888; X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1888; 3:hst2X9si2joX8LLsaSY0sp+c4WELqgZxPX8uY4jEyrcEsE6IN67kzWqkq+tTFlV/cewkeSNnQvsZ2T0q9lRJeVqPfEXRCVlGc8OUsN848SUlMCItvznDNcmVMrBpnDLkeU2lsi9r72IK3aEh2aJUOWUizlxIOzfcGllgVNHZGu75/0IbjuwFq0O/mpM47wp18CiKyspLmBdtNBCKbxhl9gk8wAAkutDsvJ+Jfl9OA6VUOZ+D0v0PF1i2ELbaNpZs; 25:c4RCZv1DPtiv04QGnwXOgvSRO045d+XpJYTFbfDbl8S2cFAcwzdDTb1Kgl/qrwJkMENo8kkm823ewc6ItA4NY1wTO8o6i3F3oV/0MIA74fUDVe4RnOth7itxfyMrRxnxWIKrHY+EV7gSFf9uiUv5viubfRACJ3OjCaPiB7Dr3243O6uwZ/s1aTmoiMyc9ueopjYrxf2pozWVzcq0n+eSdpDqGNLRH3uN1PKyarE2ZN4XLTi58tQS5gdZG8xN0fI1FSB17+hQhVA9Q0mO0+irTRukqPdgnovHe7kqIEoJeqdYuVLrSEV/smO+TolpChg2ZYdLpaio/wcDMJEA6hdRUw==; 31:rcBYuomjirR68V81nNwNdsxXLo3AUvnlc2J3K/snxaUShIiNOw1xKeaeHXDBsKwhy9n9x202vwOQQSa9dHa2v+yY6cJ8y1IkPEaBo06IPS76fZYiedOWb4jbEqhgsI1+xzVTvRNV4I/GYvP3waR5+rvifsZJPqiqstJWs4KdLhXHE9Tmvgb9nME1vpYaL2cE7nTdtKRUFc8JLnQKAMBeJb3rv89+cwuJqLLSIY8IzKE= X-MS-TrafficTypeDiagnostic: SG2PR0601MB1888: X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1888; 20:qMRh3f2AHQjrF8L1s6rCqQbgqU/cmb0ZuPGeXYkepLWh2DQzdAE6VW91quM3cLhTHWTx4nhwGUGktU5pj1e/2cO0JIgtOlJELsF+w3VZ5iRmMNn0ujunO7rx1temWGHPXSflgPRuH0Gn4o+3CNOhdfQ5Ch9soJ6jALNaFPgIajhA3IFR4aTRmnI+OSXXxdZCod3pBonlruaBgqNFUXOC3B+dZgMhGo8WWLoVc41dfDDP+OzcfgwYzb1bu/C/W3GXeQlsBTpU8n5g5dV6c0H/dpB9fUNDLoPWSMacl7nIPJgxj0kagDDpn3wVzwR+SwVW4SjpoI10rbXupOeGBCH4v/j9Dj4lwNS7HkPIcZ//bRtqi1oPu8UF9FhZB7FbFK/bS8gZ12cENd15deD1QPscXreU/5ACplkMrOWFX2AHYAPRv6z2HwOaWGHb7Gj7aErhtuxgr0U3rwK2pOi5bYDBOApo3L7Cd845DSiPjDXHnDy1q4UZ1QEVEYh8/FXZRmvg; 4:C0D1tv3LljiOpsvoWV5Fa2Zb010Uy3aysSFoxhlSQhwJJshjh3/7EbKiY0942bJFRJBl9hDILf+Sdi1QGpNizwRIpQxGIiBStdzxMcpG4hWFQR/51CYsbGztCL8jbnbiq74+sGB0ldqAxyLEuSQ6w3fGqxqK79X0XhAhLS/qn8Tk6bK4ez0clgfIUxnnE3/w1dECZhovcP15+pbuZBbPvDtaVSaQwCPfo3h6utScVZoWSVQv/zxv03SIzn2mnzKTDsp8mDz+/eVcXDX8DI5BLz8Y18xyUJA6O/r/mBZRTV600CIf0DUQbhpT9rs8wfbk X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(788757137089); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040470)(2401047)(5005006)(8121501046)(3231023)(944501137)(10201501046)(3002001)(93006095)(93001095)(6055026)(6041268)(20161123560045)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123564045)(6072148)(201708071742011); SRVR:SG2PR0601MB1888; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:SG2PR0601MB1888; X-Forefront-PRVS: 0550778858 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(376002)(346002)(396003)(39380400002)(366004)(39860400002)(189003)(199004)(5660300001)(2906002)(2950100002)(25786009)(69596002)(6916009)(54906003)(6116002)(53936002)(3846002)(6486002)(16526018)(58126008)(16586007)(36756003)(23726003)(7736002)(47776003)(305945005)(478600001)(53416004)(4326008)(316002)(83506002)(8936002)(66066001)(7696005)(76176011)(59450400001)(386003)(97736004)(52116002)(106356001)(8676002)(81166006)(68736007)(86362001)(81156014)(105586002)(50466002)(21314002)(16060500001)(309714004); DIR:OUT; SFP:1102; SCL:1; SRVR:SG2PR0601MB1888; 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; SG2PR0601MB1888; 23:K3OGUbA0rR9uQYdUcxG2I71pNXa43vkGYxzKYjq?= =?us-ascii?Q?9bqRv30EUR1cTNdmPhrf2X6IK5cGvYQjNV3/kL2yM+TJPs6ktktIIKwBTFHv?= =?us-ascii?Q?dXy0ueVNAOzVdCN+s9WIK3dX7LAqSoRJkhBJpHz0XYDAdCwN1oyBEZoqahT7?= =?us-ascii?Q?Osc1eeW0KC3rQwxyCKeHTfKjayDx1pA8shYyY7PL4bIgZiRr0gsUU0aT3nND?= =?us-ascii?Q?9iTgM2mQICJwBOLvMI86bOjGPKHAeMKjJc/fLywkVhepsBNMmVXbcQyIGgan?= =?us-ascii?Q?B+jLYCNUv1NRes9RijTsxtyQhaX/yKtkuvdhSWt0NJGk3ngqCa8FMkjW8bxi?= =?us-ascii?Q?iH4X6PZ/YQQhKWioSOPruVriM78ZfWemW7zbEvwQeKg2+8OQOhBifArAzIAz?= =?us-ascii?Q?qYlW+Exqi9eF6co5N/8WCrp6rk55Cay7n3zP6n4uVlIfB38qiJHCmkqsT/bh?= =?us-ascii?Q?Yf2AHGMrWbXcDtz07xHYEA9nhLfhju13YBs7T3ObkgH5ufBqYbHk6jl3FUL7?= =?us-ascii?Q?WAPVY9N6h9wS0LbHmz+pnDa5gjZ/GKriakDS99wkMg5dcufPRO7gl9mcjUzj?= =?us-ascii?Q?f2aZv5i2qCKYlc+ctJCfF4lgTCnkZQT1ocLH1zKfaH1PZqRhtEzCRTPeQ82w?= =?us-ascii?Q?L82qVNVM+GhHb/+Xrc88Pxmt7HWVLEBSHIU0SdhBqqiX21YA020KTfg/RY0q?= =?us-ascii?Q?WojsW+Pt9hCZLEOORd9zCAxL6lbymd0CCX0jIsrQoEzHPoFiqCrG0rf2pnXS?= =?us-ascii?Q?FVOhmR7HmdAf7G9k0Nnn38dNgEmcWDRiJT2tgAmUc51yaBAO4zgfI5G9ohoT?= =?us-ascii?Q?g+jtRAZNAk6vwE8NMFMybrWiCtRzNwPGwMH5FX6VJLaYtDdsZfpKZOPrjQmf?= =?us-ascii?Q?+fJw9+bGma+hudfbTmOzl69qDICzzAkr4wxPQUsh2I2Brn71GSpKxMrasgYL?= =?us-ascii?Q?PyRvS9pUZx7fv1Aoxt0VQsAmZaGT+FELHW20rzdKEY3Bmr2jy3ulgWz31rfb?= =?us-ascii?Q?MhwnfODIq0+WtuwQMadqa306ZcV3CkzEBz34I3Qiwzj5rSLUtskjzZsnlPmT?= =?us-ascii?Q?aze3VOhowcJQVNJKV41UEljO2QA8Zi6Wxx0wixqHgtgpQ40nLq8UWR63ISJ1?= =?us-ascii?Q?3qssFP643kLVgJfmLLpvKcZonuj8N6Xuv3bVZyLAKTBnoPVn6K5uD/V0pMeZ?= =?us-ascii?Q?T9HwuN025drY7wf98XDFLIU2oaEPDhuSPMwiB?= X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1888; 6:oPLo/3i+q9XN1nu3S2Wg+Hu7PDdCfQrX1HhZknd3baRswGvsNdUsf2hCWNZtEIP0ADeqif43UlgqyeUfik5qdvotvbGlnIk/4imCh6HGJkLwvR1fXQzp2LVZeUDRiubPRjePq0YxHijaZ4k5OjsNMaONWbH/j6IuT+BRpztRNIFxstFkF4YJrnC8xIegADwVptCzsyibF8tldA34wAoX9pNLgqvP7bW8Dq/5lnbglkrsTJUD/H83a2Q7290FZjeMOcQx9zM8+Bmc3l1wtaPzk6qpVxCJDRpB7rhzhGP2AK/SmMVTc5KDOAt217Q3HLMnIVmgB3/l9JKaKPLRzugRJMo3eTGFWiSqvx06zOHgp2w=; 5:2QDTmEb5N1WnY2OtfE7wm+ebLcfG/+dTtsWNPscirz9ievG6YE0k8y7lSMOjkMteL879N5RJwn/CNEKPowxKBCBnyb+3ge56J0w+46tjz+p5xbAaIzN5+VjECQN51y6j9si/EhsYu8cYuXbp/y2K3orR0qbzXvp15lx+azDTHrk=; 24:5ENkUOFb3lYCSqU0UNr11MhoQAXXqVhwwBRTWTYNdMvNCSy+ZruuvYhDP/DXX6Rk7r/WqM5H2ItE0al/R6iRHA7OXaCvCahfIANRs0HmhTk=; 7:0L3/lky8oVoMMUpB4BRp5hdno5hBh/vVyg2+iVm9qIDrBJRSkxKRiF22JETUIkaOQGGUTGaNkooX5R+ZE/dHR/ZDHH2ZK+fkeK+CI86AT7sqLi4nlptJcnbsj0M9LQ93P1324NH+9IRYoH1vE+vN2fPN0USwx90vgVvf48mBiXA75Kn7is3GSI3jcXEuy8yZ0OvEX3pVHHt9d1tnlhks+rDincR6BN1kxfxFV8Ua6XutbR8Ec3Uag0ERj8oEO7nv SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1888; 20:vR0pBjP9lWu1A5bIOhiQ6F7KL7Qtw0SGpcpioZ/9iXimuNIrTx1tJukaxYoE6V/vivyepiFFVetfkv9XUJP0q5CvY7/dZ9aklaelywjnRFthyZ1Q2KmKPCy64M3TVrhq7lLCFTm3JUQg4mzajoAkMdzl44CCTVDjBX2M8GY8qu8= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jan 2018 01:12:37.9464 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c46cf36e-66a6-45ce-e815-08d55959924f X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-Transport-CrossTenantHeadersStamped: SG2PR0601MB1888 Cc: Linux-ALSA , Simon Subject: [alsa-devel] [PATCH 017/187] ASoC: wm8770: 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 --- sound/soc/codecs/wm8770.c | 131 ++++++++++++++++++++++------------------------ 1 file changed, 64 insertions(+), 67 deletions(-) diff --git a/sound/soc/codecs/wm8770.c b/sound/soc/codecs/wm8770.c index d6edcbb..9bd2098 100644 --- a/sound/soc/codecs/wm8770.c +++ b/sound/soc/codecs/wm8770.c @@ -84,7 +84,7 @@ struct wm8770_priv { struct regmap *regmap; struct regulator_bulk_data supplies[WM8770_NUM_SUPPLIES]; struct notifier_block disable_nb[WM8770_NUM_SUPPLIES]; - struct snd_soc_codec *codec; + struct snd_soc_component *component; int sysclk; }; @@ -308,14 +308,14 @@ static SOC_ENUM_DOUBLE_DECL(ain_enum, static int vout12supply_event(struct snd_soc_dapm_widget *w, struct snd_kcontrol *kcontrol, int event) { - struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm); + struct snd_soc_component *component = snd_soc_dapm_to_component(w->dapm); switch (event) { case SND_SOC_DAPM_PRE_PMU: - snd_soc_update_bits(codec, WM8770_OUTMUX1, 0x180, 0); + snd_soc_component_update_bits(component, WM8770_OUTMUX1, 0x180, 0); break; case SND_SOC_DAPM_POST_PMD: - snd_soc_update_bits(codec, WM8770_OUTMUX1, 0x180, 0x180); + snd_soc_component_update_bits(component, WM8770_OUTMUX1, 0x180, 0x180); break; } @@ -325,31 +325,31 @@ static int vout12supply_event(struct snd_soc_dapm_widget *w, static int vout34supply_event(struct snd_soc_dapm_widget *w, struct snd_kcontrol *kcontrol, int event) { - struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm); + struct snd_soc_component *component = snd_soc_dapm_to_component(w->dapm); switch (event) { case SND_SOC_DAPM_PRE_PMU: - snd_soc_update_bits(codec, WM8770_OUTMUX2, 0x180, 0); + snd_soc_component_update_bits(component, WM8770_OUTMUX2, 0x180, 0); break; case SND_SOC_DAPM_POST_PMD: - snd_soc_update_bits(codec, WM8770_OUTMUX2, 0x180, 0x180); + snd_soc_component_update_bits(component, WM8770_OUTMUX2, 0x180, 0x180); break; } return 0; } -static int wm8770_reset(struct snd_soc_codec *codec) +static int wm8770_reset(struct snd_soc_component *component) { - return snd_soc_write(codec, WM8770_RESET, 0); + return snd_soc_component_write(component, WM8770_RESET, 0); } static int wm8770_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) { - struct snd_soc_codec *codec; + struct snd_soc_component *component; int iface, master; - codec = dai->codec; + component = dai->component; switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { case SND_SOC_DAIFMT_CBM_CFM: @@ -392,8 +392,8 @@ static int wm8770_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) return -EINVAL; } - snd_soc_update_bits(codec, WM8770_IFACECTRL, 0xf, iface); - snd_soc_update_bits(codec, WM8770_MSTRCTRL, 0x100, master); + snd_soc_component_update_bits(component, WM8770_IFACECTRL, 0xf, iface); + snd_soc_component_update_bits(component, WM8770_MSTRCTRL, 0x100, master); return 0; } @@ -411,15 +411,15 @@ static int wm8770_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params, struct snd_soc_dai *dai) { - struct snd_soc_codec *codec; + struct snd_soc_component *component; struct wm8770_priv *wm8770; int i; int iface; int shift; int ratio; - codec = dai->codec; - wm8770 = snd_soc_codec_get_drvdata(codec); + component = dai->component; + wm8770 = snd_soc_component_get_drvdata(component); iface = 0; switch (params_width(params)) { @@ -450,7 +450,7 @@ static int wm8770_hw_params(struct snd_pcm_substream *substream, } /* Only need to set MCLK/LRCLK ratio if we're master */ - if (snd_soc_read(codec, WM8770_MSTRCTRL) & 0x100) { + if (snd_soc_component_read32(component, WM8770_MSTRCTRL) & 0x100) { for (; i < ARRAY_SIZE(mclk_ratios); ++i) { ratio = wm8770->sysclk / params_rate(params); if (ratio == mclk_ratios[i]) @@ -458,51 +458,51 @@ static int wm8770_hw_params(struct snd_pcm_substream *substream, } if (i == ARRAY_SIZE(mclk_ratios)) { - dev_err(codec->dev, + dev_err(component->dev, "Unable to configure MCLK ratio %d/%d\n", wm8770->sysclk, params_rate(params)); return -EINVAL; } - dev_dbg(codec->dev, "MCLK is %dfs\n", mclk_ratios[i]); + dev_dbg(component->dev, "MCLK is %dfs\n", mclk_ratios[i]); - snd_soc_update_bits(codec, WM8770_MSTRCTRL, 0x7 << shift, + snd_soc_component_update_bits(component, WM8770_MSTRCTRL, 0x7 << shift, i << shift); } - snd_soc_update_bits(codec, WM8770_IFACECTRL, 0x30, iface); + snd_soc_component_update_bits(component, WM8770_IFACECTRL, 0x30, iface); return 0; } static int wm8770_mute(struct snd_soc_dai *dai, int mute) { - struct snd_soc_codec *codec; + struct snd_soc_component *component; - codec = dai->codec; - return snd_soc_update_bits(codec, WM8770_DACMUTE, 0x10, + component = dai->component; + return snd_soc_component_update_bits(component, WM8770_DACMUTE, 0x10, !!mute << 4); } static int wm8770_set_sysclk(struct snd_soc_dai *dai, int clk_id, unsigned int freq, int dir) { - struct snd_soc_codec *codec; + struct snd_soc_component *component; struct wm8770_priv *wm8770; - codec = dai->codec; - wm8770 = snd_soc_codec_get_drvdata(codec); + component = dai->component; + wm8770 = snd_soc_component_get_drvdata(component); wm8770->sysclk = freq; return 0; } -static int wm8770_set_bias_level(struct snd_soc_codec *codec, +static int wm8770_set_bias_level(struct snd_soc_component *component, enum snd_soc_bias_level level) { int ret; struct wm8770_priv *wm8770; - wm8770 = snd_soc_codec_get_drvdata(codec); + wm8770 = snd_soc_component_get_drvdata(component); switch (level) { case SND_SOC_BIAS_ON: @@ -510,11 +510,11 @@ static int wm8770_set_bias_level(struct snd_soc_codec *codec, case SND_SOC_BIAS_PREPARE: break; case SND_SOC_BIAS_STANDBY: - if (snd_soc_codec_get_bias_level(codec) == SND_SOC_BIAS_OFF) { + if (snd_soc_component_get_bias_level(component) == SND_SOC_BIAS_OFF) { ret = regulator_bulk_enable(ARRAY_SIZE(wm8770->supplies), wm8770->supplies); if (ret) { - dev_err(codec->dev, + dev_err(component->dev, "Failed to enable supplies: %d\n", ret); return ret; @@ -523,12 +523,12 @@ static int wm8770_set_bias_level(struct snd_soc_codec *codec, regcache_sync(wm8770->regmap); /* global powerup */ - snd_soc_write(codec, WM8770_PWDNCTRL, 0); + snd_soc_component_write(component, WM8770_PWDNCTRL, 0); } break; case SND_SOC_BIAS_OFF: /* global powerdown */ - snd_soc_write(codec, WM8770_PWDNCTRL, 1); + snd_soc_component_write(component, WM8770_PWDNCTRL, 1); regulator_bulk_disable(ARRAY_SIZE(wm8770->supplies), wm8770->supplies); break; @@ -567,60 +567,59 @@ static int wm8770_set_bias_level(struct snd_soc_codec *codec, .symmetric_rates = 1 }; -static int wm8770_probe(struct snd_soc_codec *codec) +static int wm8770_probe(struct snd_soc_component *component) { struct wm8770_priv *wm8770; int ret; - wm8770 = snd_soc_codec_get_drvdata(codec); - wm8770->codec = codec; + wm8770 = snd_soc_component_get_drvdata(component); + wm8770->component = component; ret = regulator_bulk_enable(ARRAY_SIZE(wm8770->supplies), wm8770->supplies); if (ret) { - dev_err(codec->dev, "Failed to enable supplies: %d\n", ret); + dev_err(component->dev, "Failed to enable supplies: %d\n", ret); return ret; } - ret = wm8770_reset(codec); + ret = wm8770_reset(component); if (ret < 0) { - dev_err(codec->dev, "Failed to issue reset: %d\n", ret); + dev_err(component->dev, "Failed to issue reset: %d\n", ret); goto err_reg_enable; } /* latch the volume update bits */ - snd_soc_update_bits(codec, WM8770_MSDIGVOL, 0x100, 0x100); - snd_soc_update_bits(codec, WM8770_MSALGVOL, 0x100, 0x100); - snd_soc_update_bits(codec, WM8770_VOUT1RVOL, 0x100, 0x100); - snd_soc_update_bits(codec, WM8770_VOUT2RVOL, 0x100, 0x100); - snd_soc_update_bits(codec, WM8770_VOUT3RVOL, 0x100, 0x100); - snd_soc_update_bits(codec, WM8770_VOUT4RVOL, 0x100, 0x100); - snd_soc_update_bits(codec, WM8770_DAC1RVOL, 0x100, 0x100); - snd_soc_update_bits(codec, WM8770_DAC2RVOL, 0x100, 0x100); - snd_soc_update_bits(codec, WM8770_DAC3RVOL, 0x100, 0x100); - snd_soc_update_bits(codec, WM8770_DAC4RVOL, 0x100, 0x100); + snd_soc_component_update_bits(component, WM8770_MSDIGVOL, 0x100, 0x100); + snd_soc_component_update_bits(component, WM8770_MSALGVOL, 0x100, 0x100); + snd_soc_component_update_bits(component, WM8770_VOUT1RVOL, 0x100, 0x100); + snd_soc_component_update_bits(component, WM8770_VOUT2RVOL, 0x100, 0x100); + snd_soc_component_update_bits(component, WM8770_VOUT3RVOL, 0x100, 0x100); + snd_soc_component_update_bits(component, WM8770_VOUT4RVOL, 0x100, 0x100); + snd_soc_component_update_bits(component, WM8770_DAC1RVOL, 0x100, 0x100); + snd_soc_component_update_bits(component, WM8770_DAC2RVOL, 0x100, 0x100); + snd_soc_component_update_bits(component, WM8770_DAC3RVOL, 0x100, 0x100); + snd_soc_component_update_bits(component, WM8770_DAC4RVOL, 0x100, 0x100); /* mute all DACs */ - snd_soc_update_bits(codec, WM8770_DACMUTE, 0x10, 0x10); + snd_soc_component_update_bits(component, WM8770_DACMUTE, 0x10, 0x10); err_reg_enable: regulator_bulk_disable(ARRAY_SIZE(wm8770->supplies), wm8770->supplies); return ret; } -static const struct snd_soc_codec_driver soc_codec_dev_wm8770 = { - .probe = wm8770_probe, - .set_bias_level = wm8770_set_bias_level, - .idle_bias_off = true, - - .component_driver = { - .controls = wm8770_snd_controls, - .num_controls = ARRAY_SIZE(wm8770_snd_controls), - .dapm_widgets = wm8770_dapm_widgets, - .num_dapm_widgets = ARRAY_SIZE(wm8770_dapm_widgets), - .dapm_routes = wm8770_intercon, - .num_dapm_routes = ARRAY_SIZE(wm8770_intercon), - }, +static const struct snd_soc_component_driver soc_component_dev_wm8770 = { + .probe = wm8770_probe, + .set_bias_level = wm8770_set_bias_level, + .controls = wm8770_snd_controls, + .num_controls = ARRAY_SIZE(wm8770_snd_controls), + .dapm_widgets = wm8770_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(wm8770_dapm_widgets), + .dapm_routes = wm8770_intercon, + .num_dapm_routes = ARRAY_SIZE(wm8770_intercon), + .pmdown_time = 1, + .endianness = 1, + .non_legacy_dai_naming = 1, }; static const struct of_device_id wm8770_of_match[] = { @@ -682,8 +681,8 @@ static int wm8770_spi_probe(struct spi_device *spi) spi_set_drvdata(spi, wm8770); - ret = snd_soc_register_codec(&spi->dev, - &soc_codec_dev_wm8770, &wm8770_dai, 1); + ret = devm_snd_soc_register_component(&spi->dev, + &soc_component_dev_wm8770, &wm8770_dai, 1); return ret; } @@ -697,8 +696,6 @@ static int wm8770_spi_remove(struct spi_device *spi) regulator_unregister_notifier(wm8770->supplies[i].consumer, &wm8770->disable_nb[i]); - snd_soc_unregister_codec(&spi->dev); - return 0; }