From patchwork Mon Jan 29 03:56:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 10189025 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 4124760388 for ; Mon, 29 Jan 2018 04:29:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2C18528783 for ; Mon, 29 Jan 2018 04:29:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 202B228786; Mon, 29 Jan 2018 04:29:27 +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 9BF6F28783 for ; Mon, 29 Jan 2018 04:29:25 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 2D3F9267790; Mon, 29 Jan 2018 05:24:33 +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 76A3126799C; Mon, 29 Jan 2018 05:24:29 +0100 (CET) Received: from relmlie3.idc.renesas.com (relmlor4.renesas.com [210.160.252.174]) by alsa0.perex.cz (Postfix) with ESMTP id 27FC0267779 for ; Mon, 29 Jan 2018 04:56:31 +0100 (CET) Received: from unknown (HELO relmlir3.idc.renesas.com) ([10.200.68.153]) by relmlie3.idc.renesas.com with ESMTP; 29 Jan 2018 12:56:27 +0900 Received: from relmlii1.idc.renesas.com (relmlii1.idc.renesas.com [10.200.68.65]) by relmlir3.idc.renesas.com (Postfix) with ESMTP id 44717521E1; Mon, 29 Jan 2018 12:56:27 +0900 (JST) X-IronPort-AV: E=Sophos;i="5.46,429,1511794800"; d="scan'208";a="269592756" Received: from mail-hk2apc01lp0216.outbound.protection.outlook.com (HELO APC01-HK2-obe.outbound.protection.outlook.com) ([65.55.88.216]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-SHA256; 29 Jan 2018 12:56:26 +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=mULiJ7atGfiSiaYj/bUp+o4Irr+GiUJCPkc+a5eUQSg=; b=m0XoPwTnvbfsliEOS61os02lhkVBi5FXsIJyqvkskz+ZdqbSiQkmbZ4XxsxHqFlgxu2oW9EY72JmYffreaVc0Jl24npCsjkpa9h0KF053xlHCtosYws8JOwIyWVHOuX+YNJc3h/lxj8gVLl3ySUk5lOoquw5Ec4KjH20i/10XgY= 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 HK2PR0601MB1874.apcprd06.prod.outlook.com (2603:1096:202:a::18) 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:56:25 +0000 Message-ID: <87efm91fql.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:56:25 +0000 X-Originating-IP: [211.11.155.138] X-ClientProxiedBy: TY1PR01CA0153.jpnprd01.prod.outlook.com (2603:1096:402:1::29) To HK2PR0601MB1874.apcprd06.prod.outlook.com (2603:1096:202:a::18) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 8a2cee8f-8cf0-4c0e-3cf8-08d566cc449b X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(2017052603307)(7153060)(7193020); SRVR:HK2PR0601MB1874; X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1874; 3:hi61g557a55iOw7BpTw2KmhuqdqxD5MInGfJawnYPt3BQYVopDZuHpb07enJbuV5JO2Wr3o6K836XVzScPRc+dL3f0odv/L2Bagqugym3nrGxeIWVUMsKUOdrb9xk9rVaKLruxZYOavDd3mUoLmjhPrwPWdMDiY7S5L/JIjUKKubscxOyHG6r/fp7dInrGyhD61G02GpAqIX6IAevC5qc6pwvUB6uj00+OIIRmx6X9qgQ3UoTrMO43j/j7ADb7aH; 25:RbcHm7OccvwAalyJALabkkkcKxyzqXN7QumW/WuEZqXmrTXKs8ftMjEDzI87INOS4w5SXtWxnXP8YqzwaR3O/v5CXi8fB2MLt+WHlhPNxZshoDBsiYuZoZ/FO6g9VlaZ4W0KnOLpmSmE9f2QOTxtxI+GZ79pgly4X1vRmNcxnAy+ykCS++H9b7tyfH4UfRiph8zTzdjsatGkHcE+qBNGRqdPChyZANSmKn0lr4iXJhsLH4D1D8kw2rT0XrpK2OCNk5VIAIm7GWTyqHnlMqpTLGmj6s9v/68omUzdtEwbZ+A8d8puLoFajOR2X9Nt+CodozhqPyHbeSqa7nu0ba4V+w==; 31:CeKBlej2aNXa9cru+0t1KrsnSpBCZJudhrrtZ7NbOpspDl2cMSGeiEXk3pTLD1YEJCUfCpKox52wTGm/qUlWdFjHYGeXYcv4lIYih6OhnQKJexc8n5b4DoBVs29gO1SGHq/pvDhSGCdr4X+Camxi1C/55qenkHpbQVjzTwedOrf9GpnJZ9vz8404vnncUBaiQNM6wqATW6gP23JvfoX+feDwcTaRzSXXvk77OrAr00Y= X-MS-TrafficTypeDiagnostic: HK2PR0601MB1874: X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1874; 20:o9mh5VF2PPpDfsq0g0SBOn3A2gJ55hnkk0BWHv3PgR8k4SqUZrYcV1Nn5QPNKwL8yMLPVtwYfs5/wxLKGgCQ/hW7I88ekqn668SPGTSiDGQ/v10JEmZLXXgZznpi3nda/mEIX1RUCLNmC32sQUfuqDx7lnwF5OcBJ+16NTNvojmmjWqQy500Ct3qTzDIx5B1ts4GrMIaCHMwlRGvyiw3vyad3Ic9H6GEBUTNMj/iweSpDuZDDxJwLsX2P175zJDQuwRRKpb48Ujm2GqFV6uw2PEWtLKxkocxt5PmbkkeR8giL2QXTEStzPZMPri3ZRdipvLp10ToMRKYw6YW2qa8aC7cpaRVx+bcOmvdStt/JPuokaRnIyiaNrfORPYRPcgqpLcTkn1fY9JQgpw+tOqVdC1bpHMYz8H2ppmy4a0P7qvJd6WA8SIDeFuXMJZ3i9HhdOz61twi/YiPoliRNRzh5xmH/21pRMN+p5zYMxhk7aAFIc+DKIT1deP2ihmfrZcy; 4:1xeDsmK/C0t5isELVfa98PYd0CEPhMGMVOcYhCCiZAkHqC1WywPz5XJ38yLELQiISRTXb6gjhoEe6+UfnxOc9/H8zg5IupTU+Ucp2RtUyOpF4nkUor7jxhTA/AhWFfFxtsVKf1V4yLTqb2ODszmaVykHRXbV3wdfT2VKErZw+ajAw4yitcKEvbV+BC1Q/GNT3Sg+BZOb/OixF+uwA9Vr25ocmDPIFY4uuvgLotJYQEwxvcAFMGLP/DllWSL+LHAcgeb+exxsv2pBfSB/SMSUrB71WxUsOriHAzul9EhYtG+xkVmy/f6lynci4V97cijR X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(788757137089); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040501)(2401047)(8121501046)(5005006)(93006095)(93001095)(3231101)(944501161)(3002001)(10201501046)(6055026)(6041288)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123558120)(20161123562045)(6072148)(201708071742011); SRVR:HK2PR0601MB1874; BCL:0; PCL:0; RULEID:; SRVR:HK2PR0601MB1874; X-Forefront-PRVS: 0567A15835 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(366004)(396003)(376002)(346002)(39860400002)(39380400002)(199004)(189003)(26005)(83506002)(186003)(16526019)(68736007)(81156014)(58126008)(36756003)(8676002)(81166006)(105586002)(8936002)(86362001)(6116002)(3846002)(2906002)(66066001)(6916009)(2950100002)(16586007)(316002)(23726003)(69596002)(5660300001)(478600001)(47776003)(305945005)(106356001)(7736002)(53416004)(53936002)(6486002)(97736004)(59450400001)(50466002)(386003)(52116002)(76176011)(7696005)(25786009)(4326008)(21314002)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:HK2PR0601MB1874; 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; HK2PR0601MB1874; 23:WpyulUuvmBsey3tYgNusO/Ul46ZXVgqUmaf0rzu?= =?us-ascii?Q?+KWaulyJEzKF/U+zUJXGJPleo714iNGWlkfcP5soDbdnyV+pTrmOoBkpbTJD?= =?us-ascii?Q?VhXxPX5BZTwIZl2j1siecej49aCUcGlcfA03kbJ/TdBjtA6WTjS8gTlH22Fd?= =?us-ascii?Q?HeSl9CbSc+6J7XJQJU007UmIS2nh2JXHau4ZQ1aG8F8iyyVl/n+Z0PcWskkb?= =?us-ascii?Q?hHSBxQaqxqvKxlH87Ar6xc+FSquhbDgWgdkGciV2t717BbRDKoHmCz+F+5Lc?= =?us-ascii?Q?xKR54B9GmdkZMBMJm9tRIsOPFC1zmleydW3fS4XInbnL4kbOJObiX04lk314?= =?us-ascii?Q?Q5RdTo2d0NY61MhVk5xcrABFcbKmnSDDvGpsI7iey0u5knQCKdR2YSYjotga?= =?us-ascii?Q?UoIIc6EIVB5EmrNlQgIIzlxqL2ddGEVzeTvlE20o+/Krz2v1l01cF9JIIxXi?= =?us-ascii?Q?QS2oskGW0i9yYw4gG7bRON+veEoruXt0sVSYEBIRktntAvvFVFqNfUB7zNNq?= =?us-ascii?Q?K45AKWpRp8EJkX/maltbnfxSA91+R+6dnUtg0dfFmlI1A5kCr7K8/pGPXfOh?= =?us-ascii?Q?2k4Wu8SUrAMKVaJ2Ul4JrGDcP/TSs0EX3vZandb26DqkViuAinzJysMy/DAU?= =?us-ascii?Q?NLgnFXj/krwlxVy2Hh7dR2qHu7grCgUXghbppmsrMW73uc3DXYJp8UZG7ubK?= =?us-ascii?Q?1zKjA/80Nf4VY3grp4mVkZTD2bYXAm88SGiQKdl600WDxCz2b0YyeRsm2PTD?= =?us-ascii?Q?HVSmp6ykcpAcFbNIel2GS0ojOr6vLOi/ay5k7tbkOBPMuwZeKPP8Sdv7yL/e?= =?us-ascii?Q?Obsl3tVvBD7qu/cxxxIYnQKkjieSuhnijo7V38fObFxkV40AmeR3VNouKc4/?= =?us-ascii?Q?d9pXbiDc8/1WAV9ilLGuhWTw7d4MktxbqXnqApTyUMiCbuEIH6Vh/ShqtJVU?= =?us-ascii?Q?p1esVAD0G8/hXhsdDb+YOPL2FJiVoNtzp8UimcUlKgO/t77EHnZuAauSuKkt?= =?us-ascii?Q?C2rU/TumfuTHrNhqxOe5/Z/3fYv6xf0AU7PNGn72pq2bj3niqVA4+MwW/3Vh?= =?us-ascii?Q?fke5FCRi46UeMe+p3jTs+gpo99AxDREUxU45mXWVMfp6JdYOTIXZb+Pew7V3?= =?us-ascii?Q?XlGhXae25vWgY+/2uJgRWtq2spDioMx0fUjXJ0TgsUkTi/WR9zYiAVv3RfVx?= =?us-ascii?Q?QdGFni6Cz5/HwEAU=3D?= X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1874; 6:Rj1upPowXC9jG3mfHNAxuEXjE2Oxp/ezDD7z4YXFtEWp5V+KpGXKpQHnJ+eqkmdcqQ4juyGI2ko4h+iIlV2oDUqjuOtH/hgD17IvvtqZ4w+kdJKmopOH5YgmDgxBojHKRY94F3Pb6B+RYdEvCsoiO3prGyN9Kmb7H04PfKad04oCTSLOVZQGsrWs68ilkA/9wSASu3OF2a0NcJKEm9tfFxQsD1FboJu/iA/q4oNzfZ5KAZjarsgN7or7lgQFP9RV0KNWgOcIMoUVS+TkHlyb5NFTV44qzPzW//0BvyB7iAfHTnq1s5i/jSqXisXATwrOAI3eYPCas3f3BpQdowuM3pNpYCXQRsaUb2FehgmVI9g=; 5:lgmBZ9so/cDE3TDUG1A0vuKzhY8JYzuDyWb9WfE/z4oooVujq+syWiUPn8/q9nUmH5AB3d2iOSaeD7bO6w8F/8GNzCrUHfQQGdH5X6COG2XHTdxeDfxO15UiXxHPMNlbRYgTOcAm9X5DtlBFXaJ6dIHqX2RPOrYXia/u0HK9jtg=; 24:UwZTAewRTeJb/4V0ifx0epMVjv+NPTXx0gwXn4auD313J70Aw762ZpMMhEx047djiV6iH7WOO8bSACs0fMNWH619RFG3l9fyxGPggFC7B+U=; 7:lzgMHy1rXwW7iYkCTFOoTuCM/6x7y0PA6XjlJ7SPBsAqU7Xg7oH9lygq8pifmElvTSTNAmqT3nWFCMVWpw3sHkrXSHcKgWAsZDrZs7KJ2Ztf8lP/oqpDwQ6T+Q3fmLGD9h/8yPTbjg59eiREDLCZodoKetgcF0nKz1LMa0q0EQeOT3ZgHdFCPxH97yx5l9EQ7Buv1HkK2FR/3NsQUYoAcHbxGAn1XtfeOgYGXmjHQFkr16BIxKhM28cYRp9FS5+c SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1874; 20:tE2D1AFCaPhmc7mNnzg/TuT/v7oJtcNCog81RXlx4F/2Mbm5JSwmr1BOCxSFqTgXRxNWPqZFZ4jSt/VIPwlCF/EnI6fcJ2hVDJqpVnYW88/LXfZnzIkeTCrjYK7Zt4k1dlK5pLaYXVTjUkQRWgJe2GUJHalMjrchR3Br1+r+mlk= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Jan 2018 03:56:25.0522 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8a2cee8f-8cf0-4c0e-3cf8-08d566cc449b X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-Transport-CrossTenantHeadersStamped: HK2PR0601MB1874 Cc: Linux-ALSA Subject: [alsa-devel] [PATCH v2 077/186] ASoC: cs35l34: 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/cs35l34.c | 127 ++++++++++++++++++++++----------------------- 1 file changed, 63 insertions(+), 64 deletions(-) diff --git a/sound/soc/codecs/cs35l34.c b/sound/soc/codecs/cs35l34.c index 0600d52..5063c05 100644 --- a/sound/soc/codecs/cs35l34.c +++ b/sound/soc/codecs/cs35l34.c @@ -43,7 +43,7 @@ #define CS35L34_START_DELAY 50 struct cs35l34_private { - struct snd_soc_codec *codec; + struct snd_soc_component *component; struct cs35l34_platform_data pdata; struct regmap *regmap; struct regulator_bulk_data core_supplies[2]; @@ -237,8 +237,8 @@ static bool cs35l34_precious_register(struct device *dev, unsigned int reg) static int cs35l34_sdin_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 cs35l34_private *priv = snd_soc_codec_get_drvdata(codec); + struct snd_soc_component *component = snd_soc_dapm_to_component(w->dapm); + struct cs35l34_private *priv = snd_soc_component_get_drvdata(component); int ret; switch (event) { @@ -250,7 +250,7 @@ static int cs35l34_sdin_event(struct snd_soc_dapm_widget *w, ret = regmap_update_bits(priv->regmap, CS35L34_PWRCTL1, CS35L34_PDN_ALL, 0); if (ret < 0) { - dev_err(codec->dev, "Cannot set Power bits %d\n", ret); + dev_err(component->dev, "Cannot set Power bits %d\n", ret); return ret; } usleep_range(5000, 5100); @@ -272,8 +272,8 @@ static int cs35l34_sdin_event(struct snd_soc_dapm_widget *w, static int cs35l34_set_tdm_slot(struct snd_soc_dai *dai, unsigned int tx_mask, unsigned int rx_mask, int slots, int slot_width) { - struct snd_soc_codec *codec = dai->codec; - struct cs35l34_private *priv = snd_soc_codec_get_drvdata(codec); + struct snd_soc_component *component = dai->component; + struct cs35l34_private *priv = snd_soc_component_get_drvdata(component); unsigned int reg, bit_pos; int slot, slot_num; @@ -284,7 +284,7 @@ static int cs35l34_set_tdm_slot(struct snd_soc_dai *dai, unsigned int tx_mask, /* scan rx_mask for aud slot */ slot = ffs(rx_mask) - 1; if (slot >= 0) - snd_soc_update_bits(codec, CS35L34_TDM_RX_CTL_1_AUDIN, + snd_soc_component_update_bits(component, CS35L34_TDM_RX_CTL_1_AUDIN, CS35L34_X_LOC, slot); /* scan tx_mask: vmon(2 slots); imon (2 slots); vpmon (1 slot) @@ -294,10 +294,10 @@ static int cs35l34_set_tdm_slot(struct snd_soc_dai *dai, unsigned int tx_mask, slot_num = 0; /* disable vpmon/vbstmon: enable later if set in tx_mask */ - snd_soc_update_bits(codec, CS35L34_TDM_TX_CTL_3_VPMON, + snd_soc_component_update_bits(component, CS35L34_TDM_TX_CTL_3_VPMON, CS35L34_X_STATE | CS35L34_X_LOC, CS35L34_X_STATE | CS35L34_X_LOC); - snd_soc_update_bits(codec, CS35L34_TDM_TX_CTL_4_VBSTMON, + snd_soc_component_update_bits(component, CS35L34_TDM_TX_CTL_4_VBSTMON, CS35L34_X_STATE | CS35L34_X_LOC, CS35L34_X_STATE | CS35L34_X_LOC); @@ -305,22 +305,22 @@ static int cs35l34_set_tdm_slot(struct snd_soc_dai *dai, unsigned int tx_mask, while (slot >= 0) { /* configure VMON_TX_LOC */ if (slot_num == 0) - snd_soc_update_bits(codec, CS35L34_TDM_TX_CTL_1_VMON, + snd_soc_component_update_bits(component, CS35L34_TDM_TX_CTL_1_VMON, CS35L34_X_STATE | CS35L34_X_LOC, slot); /* configure IMON_TX_LOC */ if (slot_num == 4) { - snd_soc_update_bits(codec, CS35L34_TDM_TX_CTL_2_IMON, + snd_soc_component_update_bits(component, CS35L34_TDM_TX_CTL_2_IMON, CS35L34_X_STATE | CS35L34_X_LOC, slot); } /* configure VPMON_TX_LOC */ if (slot_num == 3) { - snd_soc_update_bits(codec, CS35L34_TDM_TX_CTL_3_VPMON, + snd_soc_component_update_bits(component, CS35L34_TDM_TX_CTL_3_VPMON, CS35L34_X_STATE | CS35L34_X_LOC, slot); } /* configure VBSTMON_TX_LOC */ if (slot_num == 7) { - snd_soc_update_bits(codec, + snd_soc_component_update_bits(component, CS35L34_TDM_TX_CTL_4_VBSTMON, CS35L34_X_STATE | CS35L34_X_LOC, slot); } @@ -328,7 +328,7 @@ static int cs35l34_set_tdm_slot(struct snd_soc_dai *dai, unsigned int tx_mask, /* Enable the relevant tx slot */ reg = CS35L34_TDM_TX_SLOT_EN_4 - (slot/8); bit_pos = slot - ((slot / 8) * (8)); - snd_soc_update_bits(codec, reg, + snd_soc_component_update_bits(component, reg, 1 << bit_pos, 1 << bit_pos); tx_mask &= ~(1 << slot); @@ -342,8 +342,8 @@ static int cs35l34_set_tdm_slot(struct snd_soc_dai *dai, unsigned int tx_mask, static int cs35l34_main_amp_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 cs35l34_private *priv = snd_soc_codec_get_drvdata(codec); + struct snd_soc_component *component = snd_soc_dapm_to_component(w->dapm); + struct cs35l34_private *priv = snd_soc_component_get_drvdata(component); switch (event) { case SND_SOC_DAPM_POST_PMU: @@ -382,8 +382,8 @@ static int cs35l34_main_amp_event(struct snd_soc_dapm_widget *w, static int cs35l34_mclk_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 cs35l34_private *priv = snd_soc_codec_get_drvdata(codec); + struct snd_soc_component *component = snd_soc_dapm_to_component(w->dapm); + struct cs35l34_private *priv = snd_soc_component_get_drvdata(component); int ret, i; unsigned int reg; @@ -524,8 +524,8 @@ static int cs35l34_get_mclk_coeff(int mclk, int srate) static int cs35l34_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt) { - struct snd_soc_codec *codec = codec_dai->codec; - struct cs35l34_private *priv = snd_soc_codec_get_drvdata(codec); + struct snd_soc_component *component = codec_dai->component; + struct cs35l34_private *priv = snd_soc_component_get_drvdata(component); switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { case SND_SOC_DAIFMT_CBM_CFM: @@ -546,15 +546,15 @@ static int cs35l34_pcm_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 cs35l34_private *priv = snd_soc_codec_get_drvdata(codec); + struct snd_soc_component *component = dai->component; + struct cs35l34_private *priv = snd_soc_component_get_drvdata(component); int srate = params_rate(params); int ret; int coeff = cs35l34_get_mclk_coeff(priv->mclk_int, srate); if (coeff < 0) { - dev_err(codec->dev, "ERROR: Invalid mclk %d and/or srate %d\n", + dev_err(component->dev, "ERROR: Invalid mclk %d and/or srate %d\n", priv->mclk_int, srate); return coeff; } @@ -562,7 +562,7 @@ static int cs35l34_pcm_hw_params(struct snd_pcm_substream *substream, ret = regmap_update_bits(priv->regmap, CS35L34_ADSP_CLK_CTL, CS35L34_ADSP_RATE, cs35l34_mclk_coeffs[coeff].adsp_rate); if (ret != 0) - dev_err(codec->dev, "Failed to set clock state %d\n", ret); + dev_err(component->dev, "Failed to set clock state %d\n", ret); return ret; } @@ -590,13 +590,13 @@ static int cs35l34_pcm_startup(struct snd_pcm_substream *substream, static int cs35l34_set_tristate(struct snd_soc_dai *dai, int tristate) { - struct snd_soc_codec *codec = dai->codec; + struct snd_soc_component *component = dai->component; if (tristate) - snd_soc_update_bits(codec, CS35L34_PWRCTL3, + snd_soc_component_update_bits(component, CS35L34_PWRCTL3, CS35L34_PDN_SDOUT, CS35L34_PDN_SDOUT); else - snd_soc_update_bits(codec, CS35L34_PWRCTL3, + snd_soc_component_update_bits(component, CS35L34_PWRCTL3, CS35L34_PDN_SDOUT, 0); return 0; } @@ -604,8 +604,8 @@ static int cs35l34_set_tristate(struct snd_soc_dai *dai, int tristate) static int cs35l34_dai_set_sysclk(struct snd_soc_dai *dai, int clk_id, unsigned int freq, int dir) { - struct snd_soc_codec *codec = dai->codec; - struct cs35l34_private *cs35l34 = snd_soc_codec_get_drvdata(codec); + struct snd_soc_component *component = dai->component; + struct cs35l34_private *cs35l34 = snd_soc_component_get_drvdata(component); unsigned int value; switch (freq) { @@ -634,7 +634,7 @@ static int cs35l34_dai_set_sysclk(struct snd_soc_dai *dai, cs35l34->mclk_int = freq / 2; break; default: - dev_err(codec->dev, "ERROR: Invalid Frequency %d\n", freq); + dev_err(component->dev, "ERROR: Invalid Frequency %d\n", freq); cs35l34->mclk_int = 0; return -EINVAL; } @@ -676,7 +676,7 @@ static int cs35l34_dai_set_sysclk(struct snd_soc_dai *dai, static int cs35l34_boost_inductor(struct cs35l34_private *cs35l34, unsigned int inductor) { - struct snd_soc_codec *codec = cs35l34->codec; + struct snd_soc_component *component = cs35l34->component; switch (inductor) { case 1000: /* 1 uH */ @@ -708,19 +708,19 @@ static int cs35l34_boost_inductor(struct cs35l34_private *cs35l34, regmap_write(cs35l34->regmap, CS35L34_BST_CONV_SW_FREQ, 3); break; default: - dev_err(codec->dev, "%s Invalid Inductor Value %d uH\n", + dev_err(component->dev, "%s Invalid Inductor Value %d uH\n", __func__, inductor); return -EINVAL; } return 0; } -static int cs35l34_probe(struct snd_soc_codec *codec) +static int cs35l34_probe(struct snd_soc_component *component) { int ret = 0; - struct cs35l34_private *cs35l34 = snd_soc_codec_get_drvdata(codec); + struct cs35l34_private *cs35l34 = snd_soc_component_get_drvdata(component); - pm_runtime_get_sync(codec->dev); + pm_runtime_get_sync(component->dev); /* Set over temperature warning attenuation to 6 dB */ regmap_update_bits(cs35l34->regmap, CS35L34_PROTECT_CTL, @@ -773,23 +773,24 @@ static int cs35l34_probe(struct snd_soc_codec *codec) regmap_update_bits(cs35l34->regmap, CS35L34_ADSP_TDM_CTL, 1, 1); - pm_runtime_put_sync(codec->dev); + pm_runtime_put_sync(component->dev); return ret; } -static const struct snd_soc_codec_driver soc_codec_dev_cs35l34 = { - .probe = cs35l34_probe, - - .component_driver = { - .dapm_widgets = cs35l34_dapm_widgets, - .num_dapm_widgets = ARRAY_SIZE(cs35l34_dapm_widgets), - .dapm_routes = cs35l34_audio_map, - .num_dapm_routes = ARRAY_SIZE(cs35l34_audio_map), - .controls = cs35l34_snd_controls, - .num_controls = ARRAY_SIZE(cs35l34_snd_controls), - }, +static const struct snd_soc_component_driver soc_component_dev_cs35l34 = { + .probe = cs35l34_probe, + .dapm_widgets = cs35l34_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(cs35l34_dapm_widgets), + .dapm_routes = cs35l34_audio_map, + .num_dapm_routes = ARRAY_SIZE(cs35l34_audio_map), + .controls = cs35l34_snd_controls, + .num_controls = ARRAY_SIZE(cs35l34_snd_controls), + .idle_bias_on = 1, + .use_pmdown_time = 1, + .endianness = 1, + .non_legacy_dai_naming = 1, }; static struct regmap_config cs35l34_regmap = { @@ -864,7 +865,7 @@ static int cs35l34_handle_of_data(struct i2c_client *i2c_client, static irqreturn_t cs35l34_irq_thread(int irq, void *data) { struct cs35l34_private *cs35l34 = data; - struct snd_soc_codec *codec = cs35l34->codec; + struct snd_soc_component *component = cs35l34->component; unsigned int sticky1, sticky2, sticky3, sticky4; unsigned int mask1, mask2, mask3, mask4, current1; @@ -887,11 +888,11 @@ static irqreturn_t cs35l34_irq_thread(int irq, void *data) regmap_read(cs35l34->regmap, CS35L34_INT_STATUS_1, ¤t1); if (sticky1 & CS35L34_CAL_ERR) { - dev_err(codec->dev, "Cal error\n"); + dev_err(component->dev, "Cal error\n"); /* error is no longer asserted; safe to reset */ if (!(current1 & CS35L34_CAL_ERR)) { - dev_dbg(codec->dev, "Cal error release\n"); + dev_dbg(component->dev, "Cal error release\n"); regmap_update_bits(cs35l34->regmap, CS35L34_PROT_RELEASE_CTL, CS35L34_CAL_ERR_RLS, 0); @@ -907,14 +908,14 @@ static irqreturn_t cs35l34_irq_thread(int irq, void *data) } if (sticky1 & CS35L34_ALIVE_ERR) - dev_err(codec->dev, "Alive error\n"); + dev_err(component->dev, "Alive error\n"); if (sticky1 & CS35L34_AMP_SHORT) { - dev_crit(codec->dev, "Amp short error\n"); + dev_crit(component->dev, "Amp short error\n"); /* error is no longer asserted; safe to reset */ if (!(current1 & CS35L34_AMP_SHORT)) { - dev_dbg(codec->dev, + dev_dbg(component->dev, "Amp short error release\n"); regmap_update_bits(cs35l34->regmap, CS35L34_PROT_RELEASE_CTL, @@ -930,11 +931,11 @@ static irqreturn_t cs35l34_irq_thread(int irq, void *data) } if (sticky1 & CS35L34_OTW) { - dev_crit(codec->dev, "Over temperature warning\n"); + dev_crit(component->dev, "Over temperature warning\n"); /* error is no longer asserted; safe to reset */ if (!(current1 & CS35L34_OTW)) { - dev_dbg(codec->dev, + dev_dbg(component->dev, "Over temperature warning release\n"); regmap_update_bits(cs35l34->regmap, CS35L34_PROT_RELEASE_CTL, @@ -950,11 +951,11 @@ static irqreturn_t cs35l34_irq_thread(int irq, void *data) } if (sticky1 & CS35L34_OTE) { - dev_crit(codec->dev, "Over temperature error\n"); + dev_crit(component->dev, "Over temperature error\n"); /* error is no longer asserted; safe to reset */ if (!(current1 & CS35L34_OTE)) { - dev_dbg(codec->dev, + dev_dbg(component->dev, "Over temperature error release\n"); regmap_update_bits(cs35l34->regmap, CS35L34_PROT_RELEASE_CTL, @@ -970,7 +971,7 @@ static irqreturn_t cs35l34_irq_thread(int irq, void *data) } if (sticky3 & CS35L34_BST_HIGH) { - dev_crit(codec->dev, "VBST too high error; powering off!\n"); + dev_crit(component->dev, "VBST too high error; powering off!\n"); regmap_update_bits(cs35l34->regmap, CS35L34_PWRCTL2, CS35L34_PDN_AMP, CS35L34_PDN_AMP); regmap_update_bits(cs35l34->regmap, CS35L34_PWRCTL1, @@ -978,7 +979,7 @@ static irqreturn_t cs35l34_irq_thread(int irq, void *data) } if (sticky3 & CS35L34_LBST_SHORT) { - dev_crit(codec->dev, "LBST short error; powering off!\n"); + dev_crit(component->dev, "LBST short error; powering off!\n"); regmap_update_bits(cs35l34->regmap, CS35L34_PWRCTL2, CS35L34_PDN_AMP, CS35L34_PDN_AMP); regmap_update_bits(cs35l34->regmap, CS35L34_PWRCTL1, @@ -1108,11 +1109,11 @@ static int cs35l34_i2c_probe(struct i2c_client *i2c_client, pm_runtime_set_active(&i2c_client->dev); pm_runtime_enable(&i2c_client->dev); - ret = snd_soc_register_codec(&i2c_client->dev, - &soc_codec_dev_cs35l34, &cs35l34_dai, 1); + ret = devm_snd_soc_register_component(&i2c_client->dev, + &soc_component_dev_cs35l34, &cs35l34_dai, 1); if (ret < 0) { dev_err(&i2c_client->dev, - "%s: Register codec failed\n", __func__); + "%s: Register component failed\n", __func__); goto err_regulator; } @@ -1129,8 +1130,6 @@ static int cs35l34_i2c_remove(struct i2c_client *client) { struct cs35l34_private *cs35l34 = i2c_get_clientdata(client); - snd_soc_unregister_codec(&client->dev); - gpiod_set_value_cansleep(cs35l34->reset_gpio, 0); pm_runtime_disable(&client->dev);