From patchwork Mon Jan 29 03:59:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 10189035 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 27A6E60375 for ; Mon, 29 Jan 2018 04:31:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1275C28783 for ; Mon, 29 Jan 2018 04:31:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 06DEB28786; Mon, 29 Jan 2018 04:31: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 EC51A28784 for ; Mon, 29 Jan 2018 04:31:05 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 92EAC2677C9; Mon, 29 Jan 2018 05:24:56 +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 8F2C02677C7; Mon, 29 Jan 2018 05:24:53 +0100 (CET) Received: from relmlie3.idc.renesas.com (relmlor4.renesas.com [210.160.252.174]) by alsa0.perex.cz (Postfix) with ESMTP id 9E6772677D8 for ; Mon, 29 Jan 2018 04:59:05 +0100 (CET) Received: from unknown (HELO relmlir2.idc.renesas.com) ([10.200.68.152]) by relmlie3.idc.renesas.com with ESMTP; 29 Jan 2018 12:59:04 +0900 Received: from relmlii2.idc.renesas.com (relmlii2.idc.renesas.com [10.200.68.66]) by relmlir2.idc.renesas.com (Postfix) with ESMTP id 19F0177403; Mon, 29 Jan 2018 12:59:04 +0900 (JST) X-IronPort-AV: E=Sophos;i="5.46,429,1511794800"; d="scan'208";a="270913128" Received: from mail-pu1apc01lp0015.outbound.protection.outlook.com (HELO APC01-PU1-obe.outbound.protection.outlook.com) ([65.55.88.15]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-SHA256; 29 Jan 2018 12:59:03 +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=SslCscGkjp6kHw8pWs5r7d7JOuf2lsvXqcRNRI8m600=; b=ek1Ex4jxB0ns3mnBF972S5Fnduxk+ZFOwBDT1NCUKaX9c6WX49SKbEJifVTrl8d5QmkLWkBuwbWTdWw+lU9b8CmaQxeA4MPZn6RRwk/cVp6LS2FYNr/KMlXtQ2YuXHCob7vfMqfAIhIIWwEpBIAdJDA3OQ2yUmdjkfrMM343w7Q= 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 HK2PR0601MB1876.apcprd06.prod.outlook.com (2603:1096:202:a::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.444.14; Mon, 29 Jan 2018 03:59:02 +0000 Message-ID: <877es11fm8.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: <87inbl5q6q.wl%kuninori.morimoto.gx@renesas.com> References: <87607l8k9i.wl%kuninori.morimoto.gx@renesas.com> <87inbl5q6q.wl%kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Date: Mon, 29 Jan 2018 03:59:02 +0000 X-Originating-IP: [211.11.155.138] X-ClientProxiedBy: KAWPR01CA0075.jpnprd01.prod.outlook.com (2603:1096:402:c::11) To HK2PR0601MB1876.apcprd06.prod.outlook.com (2603:1096:202:a::20) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: e3653d1e-aba5-402a-f46b-08d566cca233 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(2017052603307)(7153060)(7193020); SRVR:HK2PR0601MB1876; X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1876; 3:q9c/mKT0AI4PrqtjEtZ0nqwHrSYtYHtnR7FBtmPRj6tEuoEOIRknzNNLMJsC2uXLidAlj4wqNWGpm8of/OGq54Up/s1CtJAAtdA1+wE0jk5ZKHvDJBE+Bc5bZmhC1vvFB7Pds7LlUJVdtDRy199pl6f35n7voPMkf+P5pzTbP+MHV4TZqNFmKQfM+45cKy/8qASxcQuiQGPMCY+kcebLaEwmO12Usj1bMJnCVAutF1KFF8DfccM8Ho5aW861Ce28; 25:5GDwZ/9hTtntO7BZeuxypPm+dhqc8RHbTZ2zBbuyqW8NEN1iOtVAvlxt8iZVoyXvqOkpUy00DAZ7sbdqUgCRqprdaQxWMPjuG7DXdR2LLayCD2suulAYtJHj3L0S6xTBdDYUN/MJp/9psUNnm0lFnGWCy6Y6PLF8eKteqVg3kqvKqJUnSu/tnLdYXrr+eshfjBBqzdGmxxb7RiA0wQPICrC18w6Q14B6bZ7ncx+dCYPVC9pyZzYOjz13ANqVUK1kmsbL+6u1godp2YgEXiq+H4jNbvL/5J/A6F+/GO5dwIZBH/B4xIBHgLMYbXNwl5VJ6OhTMcF8EGEKlH/zF+EaBQ==; 31:FBBuEJz6q82DrOcE38YReLSW5dMUu+0pIlN+mxJzMhBJU317or7mP548GV8WQ1YxDULseSwWVmvPvEeW4mi9cqAqWnL2968oMoFNRVFCrt+y4gH/hqle2EPI4JgI4sO8hO2ITKbpOOJUAXevRpPooEglTwsKfom9kcvo6rLNucLxG6stX/HZFvqclbl9xRqvKlN2AaTPjQNEdItyl7N9SuOvnqO3ReNA9N0mEaBbMF0= X-MS-TrafficTypeDiagnostic: HK2PR0601MB1876: X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1876; 20:S7infMcvEQ4ojlZ6TLs7hWqTr1H+0LycCzwDq4+BcppVPaHGfnSyMkbqJ5jWR0akPjYMZ2CE/JX8rqIv8GtrMoZKcqfngVHmCjHJymD31kBR3h5CFafeFYcIXypkg5RpaQLxt5ePfV3Lz9paLoadACJrufPXuniSxATdnkqOknRK5WJQpspR4xizIm3qiWMMNzSbLJq0W6ARSup7FeECl3ustypjud2x0dz/cTz4H6EBd9Q2YDLCHEsxUgiGsyGhqG9bol/SMUFV0c7mer9I3c+dSlxi8z+EuabJMVi0hGO0lDKI2BmiNyV8Mstxro7BVMvZ6VFAgpzDgGmIRD01k15nmDG70ZsbXxTOn7EubfrAsJN6dE08EzhhVauUGWIZuFJF5X54leqpllXwN83WvPf1N6grcjgWwwgGBSxES7A2QsQbuO8zd2inTZFvcCZSLiYom31svXXDwStGvouunrGGtFrdgCtQmBv72PQRAZlVrgqdCcqn6POsT5Sp6VEV; 4:tymz/f9eF/E1G+MfqfAiCUHWBWPj4+lZaNxpK7dxPVexkyaugm9p24YOsPxwy8SGiPDEScexlLQTiXZnjmqiyZUjj2ilzzGkuoLi75tCuPqYZhbyfg2t++zNBBpjnVzvuthp5MHwVlY9XlEZa6oEoefyR/0ePhFI8YW05cRmeIyGzWzSLzNTdGiMDAp7KAERWCdiyJ1c4d8bp7tlt+/DJyudPfxkSkBjHqmO9uoLBGeftPIBjQa964dNOlkp8HfsHp9JlA3MR9BpC1UKozRIfMubJ5pZ3y+oBqhrugJ7bKxC3sevpZzSHLY/LrOeXhYC X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(788757137089); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040501)(2401047)(5005006)(8121501046)(3231101)(944501161)(3002001)(93006095)(93001095)(10201501046)(6055026)(6041288)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123562045)(20161123558120)(6072148)(201708071742011); SRVR:HK2PR0601MB1876; BCL:0; PCL:0; RULEID:; SRVR:HK2PR0601MB1876; X-Forefront-PRVS: 0567A15835 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(39860400002)(366004)(39380400002)(376002)(346002)(396003)(189003)(199004)(5660300001)(66066001)(58126008)(97736004)(47776003)(23726003)(8936002)(105586002)(53416004)(25786009)(16526019)(81166006)(81156014)(86362001)(8676002)(2906002)(7736002)(52116002)(7696005)(69596002)(316002)(83506002)(305945005)(76176011)(186003)(16586007)(4326008)(6116002)(36756003)(3846002)(386003)(59450400001)(68736007)(6916009)(2950100002)(6486002)(26005)(50466002)(478600001)(106356001)(53936002)(21314002)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:HK2PR0601MB1876; 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; HK2PR0601MB1876; 23:aT72JsMsY9PkfWGoDNLrsoL/sAsXW557tbEzj3f?= =?us-ascii?Q?Hg4vRhTZR/pz0ngVMXDMLzV2zZYg+x2tWaMYQl380an0XHOyGiOQUxBl4nTY?= =?us-ascii?Q?Siu6+2hCb1m2zisCZarJWs1ePjEs9Y53UPLjAknZxSak8k2nHaurkPJX2AD6?= =?us-ascii?Q?92faj9BaQOOeaqs1ISp8SPdXDgZ8h5C2lhFAeiigini12WMBHR4NWLp7otHI?= =?us-ascii?Q?w+Kf8iCaneDxm4ZD7omaTezYsx93jog+9mwhxUkSLP7OdA24JnQfs0TFSV9D?= =?us-ascii?Q?jKN8cjrN0rL3c2ucx/mCEfy7ENIyOHKaqlIULY/ByhJ7a0c5M2wRrOwVh9qr?= =?us-ascii?Q?aDBqlh9TbVOlEMwLz8otKjVuqhwVI9DMU7RW+KdhOHV2+y3JUa5DqdxASBXt?= =?us-ascii?Q?QfsptZMk29F2JxB+MBgc6tT2AAKTMPxzadCP98ZFq1/1usdWG97RJUEGznCk?= =?us-ascii?Q?51ZiZR2nIcOtTdpr66lbYS88I8m13qTAmu+FRfQ/AsOYmkbDfewAFShP9dk+?= =?us-ascii?Q?Mh8Bh6mSl8TxkS1Nn0aMq2bsZ3U2K5G+vEEUfFAykYz2GaBAou3R2/qPSjoF?= =?us-ascii?Q?de3UcPbsCzycyFcXH2o/O+eAVugYu/L6+s6fgHxO0hh5DHpTofDEafgV5kS/?= =?us-ascii?Q?3bHQKKEzUtvMTBeHOmJHMjDCXkKR/UQ4ZZs8RSmLylh/XJ7KOOe+NFkj3Nlu?= =?us-ascii?Q?W9Qf0BAEhdAe0uJOnyebhAR0nzJA0mluQ1cjWTED2wn4gt7jVlnVE8lQI9cg?= =?us-ascii?Q?lRDQTAwznUCfOJk3bgz53sSKJGCLMn+6QcN0SanhHGlOCh97EXEGWN1i+efP?= =?us-ascii?Q?zQIfGMhPHpvwbTeEd2X4xb4Zofmjmti9Rf7mSDvM1+YjSfDHUhJisNMHS1iK?= =?us-ascii?Q?gUUjQI8XKBmeOfp33t9i82sws//lxih5J+tzg6a26uRvQ1M/P9SggP+0UtMs?= =?us-ascii?Q?rpZKzs7dk4rXP70wg2tVEaFh86Jz9PFQFvXSczmMRGqfyg6oKYkLKSHH1BEp?= =?us-ascii?Q?66YDURR/j7eT5eiNQlIuO5hH0+zvagWmdYk4J9416VXIWkwfNxAkowfgbt7z?= =?us-ascii?Q?5y8BGQ1sgq6YKyyspq1PADhaN6elaVnn+oDaJEHTbgVS5SwikLQX/LD6yHeF?= =?us-ascii?Q?mlY44HjW8yvDul959VowuBLhUWl9uNWQ9kMf1F3kHKWx8rIqUqRmEjYvfqrq?= =?us-ascii?Q?Gh2rPC7IYpDivN9I=3D?= X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1876; 6:KDNfnihkBZEADhlXC09YM7NipXMx1hnHUKGaiw8Nmcx6IIt0er16f3Bs1QwmAE/+Sb3MuEMPX5c56LJPVAbTHwyVGwdYn08lzu9qtiKvwrD1UnzYRhWulelJPrzzfWfc5DG7anD25Y/c3QQ3aSuhcwpoS/22FaIaeASresKPYHH8BQJuyNUAE9nagqy/HfSzs785xZ1ZqTYXGzar42mFqL3RKF3JbTDheK4DxdqBN5ThZ7Unpg8rZo8NeV01AyhPenzCSKDtJGkN3CF20j1ZImOv7M9a+vNOA4Dy8Wc/7tho6ReTkO+us4jvDAlL5aj9fSwFohFiqNrkRV5OVoiKReVsNqvL4I/R3LGeuf3V/YQ=; 5:p/oThghPd1TeQE7ben4I8X2B8jcHxKz3ny/SS6mLwG2sfNdkq9Sk+Mj0Jk4Gqd5MICloBSjftfyGJxI7h53WJCFUUwFv8bEaKkL8joVUyitCojge8kQVQmaV4Z4sr8wlBQq3YML/afNufAolhVeklfmmZQ4K5haH5EaZz+ThXkc=; 24:qBNXM0JYmxhMpXBugGDQ4E7xE12UUIpqTbSs4cWGpbHzyjKsJqHq9OWD28oAdOOzyHivYa1XHt+d+JWoWk5GsUIuaFgm0hkhaOBPFMpwrzM=; 7:JUSSCRO247Rm5/IOVdZ6h83aCVTB1/S1rf8iOTpYQ62dpwBI8/DqEV91Lp5BteV/2dN0fuX1rqDwhMzJmcG2sys7tvGxlaCO/1aOCPRya3G3Q+JxPD/MBxLDN3w6RcxrbRRWQziZd2RBy02JLDi5inAN47yY7E94utKssb5Mp/ZN+RtQXw5u7gaJwFyZ8CE+MuHaxLxZ+G+dxUtD3I7JkfP9oWo1Bph+Tc0lz8wg2sDe+rQpsx/YLL9XXWzWDkm1 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1876; 20:oSaQCP7GUMhWWzv6awU14dRKDLe7KbEUJwbhmvAHOKngfga+WID+fTM73lslb86i4vtdnUZLou0IfZhig7TBRIMGho+7qIIqjIBS7MqX8vWvLYQsf2mRLof+7zMeHUKtxk8ITcg9kUzVodLDr4A2n503FuKyyKQHk9ZIJiQAuJc= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Jan 2018 03:59:02.0812 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e3653d1e-aba5-402a-f46b-08d566cca233 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-Transport-CrossTenantHeadersStamped: HK2PR0601MB1876 Cc: Linux-ALSA Subject: [alsa-devel] [PATCH v2 082/186] ASoC: cs42l51: 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 = 0 -> .idle_bias_on = 1 .ignore_pmdown_time = 0 -> .use_pmdown_time = 1 - -> .endianness = 1 - -> .non_legacy_dai_naming = 1 Signed-off-by: Kuninori Morimoto --- sound/soc/codecs/cs42l51-i2c.c | 8 ----- sound/soc/codecs/cs42l51.c | 81 +++++++++++++++++++++--------------------- 2 files changed, 41 insertions(+), 48 deletions(-) diff --git a/sound/soc/codecs/cs42l51-i2c.c b/sound/soc/codecs/cs42l51-i2c.c index 9bad478..4b5731a 100644 --- a/sound/soc/codecs/cs42l51-i2c.c +++ b/sound/soc/codecs/cs42l51-i2c.c @@ -35,20 +35,12 @@ static int cs42l51_i2c_probe(struct i2c_client *i2c, return cs42l51_probe(&i2c->dev, devm_regmap_init_i2c(i2c, &config)); } -static int cs42l51_i2c_remove(struct i2c_client *i2c) -{ - snd_soc_unregister_codec(&i2c->dev); - - return 0; -} - static struct i2c_driver cs42l51_i2c_driver = { .driver = { .name = "cs42l51", .of_match_table = cs42l51_of_match, }, .probe = cs42l51_i2c_probe, - .remove = cs42l51_i2c_remove, .id_table = cs42l51_i2c_id, }; diff --git a/sound/soc/codecs/cs42l51.c b/sound/soc/codecs/cs42l51.c index f8072f1..5080d7a3 100644 --- a/sound/soc/codecs/cs42l51.c +++ b/sound/soc/codecs/cs42l51.c @@ -54,8 +54,8 @@ struct cs42l51_private { static int cs42l51_get_chan_mix(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { - struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol); - unsigned long value = snd_soc_read(codec, CS42L51_PCM_MIXER)&3; + struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol); + unsigned long value = snd_soc_component_read32(component, CS42L51_PCM_MIXER)&3; switch (value) { default: @@ -82,7 +82,7 @@ static int cs42l51_get_chan_mix(struct snd_kcontrol *kcontrol, static int cs42l51_set_chan_mix(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { - struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol); + struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol); unsigned char val; switch (ucontrol->value.enumerated.item[0]) { @@ -98,7 +98,7 @@ static int cs42l51_set_chan_mix(struct snd_kcontrol *kcontrol, break; } - snd_soc_write(codec, CS42L51_PCM_MIXER, val); + snd_soc_component_write(component, CS42L51_PCM_MIXER, val); return 1; } @@ -153,17 +153,17 @@ static int cs42l51_set_chan_mix(struct snd_kcontrol *kcontrol, static int cs42l51_pdn_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_PMD: - snd_soc_update_bits(codec, CS42L51_POWER_CTL1, + snd_soc_component_update_bits(component, CS42L51_POWER_CTL1, CS42L51_POWER_CTL1_PDN, CS42L51_POWER_CTL1_PDN); break; default: case SND_SOC_DAPM_POST_PMD: - snd_soc_update_bits(codec, CS42L51_POWER_CTL1, + snd_soc_component_update_bits(component, CS42L51_POWER_CTL1, CS42L51_POWER_CTL1_PDN, 0); break; } @@ -263,8 +263,8 @@ static SOC_ENUM_SINGLE_DECL(cs42l51_adcr_mux_enum, static int cs42l51_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int format) { - struct snd_soc_codec *codec = codec_dai->codec; - struct cs42l51_private *cs42l51 = snd_soc_codec_get_drvdata(codec); + struct snd_soc_component *component = codec_dai->component; + struct cs42l51_private *cs42l51 = snd_soc_component_get_drvdata(component); switch (format & SND_SOC_DAIFMT_FORMAT_MASK) { case SND_SOC_DAIFMT_I2S: @@ -273,7 +273,7 @@ static int cs42l51_set_dai_fmt(struct snd_soc_dai *codec_dai, cs42l51->audio_mode = format & SND_SOC_DAIFMT_FORMAT_MASK; break; default: - dev_err(codec->dev, "invalid DAI format\n"); + dev_err(component->dev, "invalid DAI format\n"); return -EINVAL; } @@ -285,7 +285,7 @@ static int cs42l51_set_dai_fmt(struct snd_soc_dai *codec_dai, cs42l51->func = MODE_SLAVE_AUTO; break; default: - dev_err(codec->dev, "Unknown master/slave configuration\n"); + dev_err(component->dev, "Unknown master/slave configuration\n"); return -EINVAL; } @@ -326,8 +326,8 @@ struct cs42l51_ratios { static int cs42l51_set_dai_sysclk(struct snd_soc_dai *codec_dai, int clk_id, unsigned int freq, int dir) { - struct snd_soc_codec *codec = codec_dai->codec; - struct cs42l51_private *cs42l51 = snd_soc_codec_get_drvdata(codec); + struct snd_soc_component *component = codec_dai->component; + struct cs42l51_private *cs42l51 = snd_soc_component_get_drvdata(component); cs42l51->mclk = freq; return 0; @@ -337,8 +337,8 @@ static int cs42l51_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params, struct snd_soc_dai *dai) { - struct snd_soc_codec *codec = dai->codec; - struct cs42l51_private *cs42l51 = snd_soc_codec_get_drvdata(codec); + struct snd_soc_component *component = dai->component; + struct cs42l51_private *cs42l51 = snd_soc_component_get_drvdata(component); int ret; unsigned int i; unsigned int rate; @@ -370,12 +370,12 @@ static int cs42l51_hw_params(struct snd_pcm_substream *substream, if (i == nr_ratios) { /* We did not find a matching ratio */ - dev_err(codec->dev, "could not find matching ratio\n"); + dev_err(component->dev, "could not find matching ratio\n"); return -EINVAL; } - intf_ctl = snd_soc_read(codec, CS42L51_INTF_CTL); - power_ctl = snd_soc_read(codec, CS42L51_MIC_POWER_CTL); + intf_ctl = snd_soc_component_read32(component, CS42L51_INTF_CTL); + power_ctl = snd_soc_component_read32(component, CS42L51_MIC_POWER_CTL); intf_ctl &= ~(CS42L51_INTF_CTL_MASTER | CS42L51_INTF_CTL_ADC_I2S | CS42L51_INTF_CTL_DAC_FORMAT(7)); @@ -418,24 +418,24 @@ static int cs42l51_hw_params(struct snd_pcm_substream *substream, fmt = CS42L51_DAC_DIF_RJ24; break; default: - dev_err(codec->dev, "unknown format\n"); + dev_err(component->dev, "unknown format\n"); return -EINVAL; } intf_ctl |= CS42L51_INTF_CTL_DAC_FORMAT(fmt); break; default: - dev_err(codec->dev, "unknown format\n"); + dev_err(component->dev, "unknown format\n"); return -EINVAL; } if (ratios[i].mclk) power_ctl |= CS42L51_MIC_POWER_CTL_MCLK_DIV2; - ret = snd_soc_write(codec, CS42L51_INTF_CTL, intf_ctl); + ret = snd_soc_component_write(component, CS42L51_INTF_CTL, intf_ctl); if (ret < 0) return ret; - ret = snd_soc_write(codec, CS42L51_MIC_POWER_CTL, power_ctl); + ret = snd_soc_component_write(component, CS42L51_MIC_POWER_CTL, power_ctl); if (ret < 0) return ret; @@ -444,18 +444,18 @@ static int cs42l51_hw_params(struct snd_pcm_substream *substream, static int cs42l51_dai_mute(struct snd_soc_dai *dai, int mute) { - struct snd_soc_codec *codec = dai->codec; + struct snd_soc_component *component = dai->component; int reg; int mask = CS42L51_DAC_OUT_CTL_DACA_MUTE|CS42L51_DAC_OUT_CTL_DACB_MUTE; - reg = snd_soc_read(codec, CS42L51_DAC_OUT_CTL); + reg = snd_soc_component_read32(component, CS42L51_DAC_OUT_CTL); if (mute) reg |= mask; else reg &= ~mask; - return snd_soc_write(codec, CS42L51_DAC_OUT_CTL, reg); + return snd_soc_component_write(component, CS42L51_DAC_OUT_CTL, reg); } static const struct snd_soc_dai_ops cs42l51_dai_ops = { @@ -484,7 +484,7 @@ static int cs42l51_dai_mute(struct snd_soc_dai *dai, int mute) .ops = &cs42l51_dai_ops, }; -static int cs42l51_codec_probe(struct snd_soc_codec *codec) +static int cs42l51_component_probe(struct snd_soc_component *component) { int ret, reg; @@ -497,24 +497,25 @@ static int cs42l51_codec_probe(struct snd_soc_codec *codec) */ reg = CS42L51_DAC_CTL_DATA_SEL(1) | CS42L51_DAC_CTL_AMUTE | CS42L51_DAC_CTL_DACSZ(0); - ret = snd_soc_write(codec, CS42L51_DAC_CTL, reg); + ret = snd_soc_component_write(component, CS42L51_DAC_CTL, reg); if (ret < 0) return ret; return 0; } -static const struct snd_soc_codec_driver soc_codec_device_cs42l51 = { - .probe = cs42l51_codec_probe, - - .component_driver = { - .controls = cs42l51_snd_controls, - .num_controls = ARRAY_SIZE(cs42l51_snd_controls), - .dapm_widgets = cs42l51_dapm_widgets, - .num_dapm_widgets = ARRAY_SIZE(cs42l51_dapm_widgets), - .dapm_routes = cs42l51_routes, - .num_dapm_routes = ARRAY_SIZE(cs42l51_routes), - }, +static const struct snd_soc_component_driver soc_component_device_cs42l51 = { + .probe = cs42l51_component_probe, + .controls = cs42l51_snd_controls, + .num_controls = ARRAY_SIZE(cs42l51_snd_controls), + .dapm_widgets = cs42l51_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(cs42l51_dapm_widgets), + .dapm_routes = cs42l51_routes, + .num_dapm_routes = ARRAY_SIZE(cs42l51_routes), + .idle_bias_on = 1, + .use_pmdown_time = 1, + .endianness = 1, + .non_legacy_dai_naming = 1, }; const struct regmap_config cs42l51_regmap = { @@ -555,8 +556,8 @@ int cs42l51_probe(struct device *dev, struct regmap *regmap) dev_info(dev, "Cirrus Logic CS42L51, Revision: %02X\n", val & CS42L51_CHIP_REV_MASK); - ret = snd_soc_register_codec(dev, - &soc_codec_device_cs42l51, &cs42l51_dai, 1); + ret = devm_snd_soc_register_component(dev, + &soc_component_device_cs42l51, &cs42l51_dai, 1); error: return ret; }