From patchwork Mon Apr 28 02:09:06 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Fan X-Patchwork-Id: 885593 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2079.outbound.protection.outlook.com [40.107.21.79]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 603AD1A3159; Mon, 28 Apr 2025 02:10:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.21.79 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745806253; cv=fail; b=dJdpWc7j5DKDlUY5xDbWVAY4KHNsLT6zswT4NDznzEz2nEmYMyX6UA+4O2J0HlKd4cQAFSPldFuqunNE6aw9qcXxcoH/R+LbTUqSScnH+wO/O+s3F4r+X4fok/I/HFELvqllNeX+uC2zINDfcwJU1tfUYnEqdhLRlNxkFWGCocM= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745806253; c=relaxed/simple; bh=ELs0prRj4buO7DOMESGbfYW3eNKKzXbPc6UawqTh6bQ=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=t2OnDkw8OsGlTkT4VqSR12FRJqo2Q8jmiZpr9nZ/FpxaNMzDbpKHXymqDeUVe5AxgzMkHO3PNsTNIYZKkIbIwzIiH8EkNlfpVE53WbA9Vk3clZ+rikTAepgFl6bAAWKeRLLl98ijZslmqhB670tWoaRL7AjIjI4SDxqXs5LVel8= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oss.nxp.com; spf=pass smtp.mailfrom=oss.nxp.com; dkim=pass (2048-bit key) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b=S0w+jOhL; arc=fail smtp.client-ip=40.107.21.79 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oss.nxp.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.nxp.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b="S0w+jOhL" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=w7ufjhPZd1ZWBFTjLXP6icxEF9EUy/q96vlYwZ/ZquvVLA0U/q4ZS0WUbnOdoY6fC/+05jKann/yQQy38XtLV9dyqVCWOPEZjDEsd4QVwFJVOa3dVjseQNmlU0Rr1Kh+//Oq0XTrzfu0PAIUCLDYlUq0KuYUbcpQ7iGMn34ItOfOOepAyTFNrbWhqmVJH7vvmH+hXNQQFV/MmvKXbkSgGw+gFByKMEHhxf7x/qaIKB/lIGVnnIaUBY/w8yDCFxvSe2xeqAjsyKXgkcwEUXqRN008X74zxNDcbFxdzaiNmh3IN8c4jOI8YQOPrP2bFNOttyYRJDVel+UsG5/BXI/Ixw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=L4BbDRr0H7lZYE/FYwfwbyAmQbK8yhyjyFqJ7j7fmjA=; b=dDbbEmrgoJQbn9AdNPyVRSED2+ihxjUE7DK3ib1+z5Jf6DncL2rT7jJiHv+6VdWdmZUGN9u6uwOGkzWHZSIgf24o+IssoySAhDLACbXTpQbMhvvff1apLVRsfXGNPD8C4pTcpWWxYsTKBjsR8n1Qw/gi3mTlu5IkeYHG8k4M1i29j9UneOh4ARMxKRcuhB4qrRHllWzTWj993w/wFblV4IN/jhlhVJJ7CIEcU4h1ur/KOqSy22ID7ff8mQU81RnSu0Z4BegnB0WQMxZJ6cGQ/7+8033bbsQL38+Z8E+WtnCI7DnWi7lzDTjBkwraLHZXlaDe58ongv9D+RKA++cQBQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector1-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=L4BbDRr0H7lZYE/FYwfwbyAmQbK8yhyjyFqJ7j7fmjA=; b=S0w+jOhLweePQKmjuyGHu2cRRskDGyY5rXIYbCgXfutUcHw+lV5zkbuI5lvnQF08s6Qnw9sqvMUZKUDhqoFdgIfZs1YtVc+KTFf7BA99MezfoZfe1RRnF+y1bDQAmJ64u5Hgog7pUSqpEpKwDIS5MzsJQ/J908qTyqDGi/sDAvJCLGpGilRelanzgNAxdyMcUbgp86vHwArzcVdLUql2J+I+DCeA9J+DzkHcXiYzsb/dIaHEOwrYPI7DRugsZ6gXqJ0JbR6IxkMeHJTT24g8Loc0n2molO9FM40ua+S9hcUO5aspQKtDI5RtUn6VxiXr+Sua2bGdK1kngkxb2y1Ozw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=oss.nxp.com; Received: from PAXPR04MB8459.eurprd04.prod.outlook.com (2603:10a6:102:1da::15) by GVXPR04MB9901.eurprd04.prod.outlook.com (2603:10a6:150:113::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8678.28; Mon, 28 Apr 2025 02:10:47 +0000 Received: from PAXPR04MB8459.eurprd04.prod.outlook.com ([fe80::165a:30a2:5835:9630]) by PAXPR04MB8459.eurprd04.prod.outlook.com ([fe80::165a:30a2:5835:9630%5]) with mapi id 15.20.8678.028; Mon, 28 Apr 2025 02:10:47 +0000 From: "Peng Fan (OSS)" Date: Mon, 28 Apr 2025 10:09:06 +0800 Subject: [PATCH v2 5/9] ASoC: codec: cs42l73: Drop cs42l73.h Message-Id: <20250428-csl42x-v2-5-e8056313968f@nxp.com> References: <20250428-csl42x-v2-0-e8056313968f@nxp.com> In-Reply-To: <20250428-csl42x-v2-0-e8056313968f@nxp.com> To: David Rhodes , Richard Fitzgerald , Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , Linus Walleij , Bartosz Golaszewski , Charles Keepax Cc: linux-sound@vger.kernel.org, patches@opensource.cirrus.com, linux-kernel@vger.kernel.org, linux-gpio@vger.kernel.org, Peng Fan X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1745806152; l=3246; i=peng.fan@nxp.com; s=20230812; h=from:subject:message-id; bh=rew4x52/zX89IH2Hq3pLjiqBbHThbPuEbhuzSoJGRZc=; b=7F5DYwTEWiJDTFcjWApZhtd7NO7LRSt6tPttwhiRs3u56u47P1N75/uCqDEK8KK1t+HmXzXE9 +aJwqay94zsBNgiLHgYJhuW1mjSM58ntp0TvM+f4GOy0hCaQZGuEWG9 X-Developer-Key: i=peng.fan@nxp.com; a=ed25519; pk=I4sJg7atIT1g63H7bb5lDRGR2gJW14RKDD0wFL8TT1g= X-ClientProxiedBy: SI2PR01CA0027.apcprd01.prod.exchangelabs.com (2603:1096:4:192::7) To PAXPR04MB8459.eurprd04.prod.outlook.com (2603:10a6:102:1da::15) Precedence: bulk X-Mailing-List: linux-gpio@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PAXPR04MB8459:EE_|GVXPR04MB9901:EE_ X-MS-Office365-Filtering-Correlation-Id: 24fc5994-c5a9-4cb2-8f96-08dd85f9e406 X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|366016|7416014|376014|52116014|38350700014; X-Microsoft-Antispam-Message-Info: =?utf-8?q?7P8Bom2LiESuaIjv9zZDrjm8hFMUdZ1?= =?utf-8?q?63XIJX1+smRC/nTZQzjVWVOgVIg9XVaMBh2JAhOpvz7US258BdO5/R3nawUI3zH9b?= =?utf-8?q?/LJFOmqt6SMA1D5g7KpxYUyo6roiZH21OKHkN6GMYGqcUcdTDpqsf6GrybK5jkVlW?= =?utf-8?q?fLSZmEIbl1AHYo3Ws4K4Frp78Mal3ktVxY8ZBQUVJlhunwfAIzGMD7BPBD9NVqLf1?= =?utf-8?q?UpHjtiXblhnbT+Nkvp0AWGl4Fa4DxuOaQiixFWKoWEA1LrbB+VGAVOyzARvgyQJ6S?= =?utf-8?q?qBk9wa9BrYPoMAikI4bHzuhggMnI8+ohDo6HpD89dSNwq0JF0xp9SXU3voNj8yzAz?= =?utf-8?q?/UsgQym/bzrZUe8lOIaPbDr/zv9OO/VSqPj+uiXhg+qsR5qEHSYNQBTEnFUMUuF8c?= =?utf-8?q?fv2JneslQe8BFXBRqfNwPhdPuziv/1Ha1SHxFxsC2SKRh8J9hLOX/eSOerifU1U0N?= =?utf-8?q?bZ+R5bscP4jKdWrRCkZbrP83jN87fGgIuRRz2BRwonGx+icvJDnzUt+I3hXCXLsCS?= =?utf-8?q?0EC/PZWIgt+6qPKmwRIhLS1JinTJDv5GXruPIoh2harBnXPK/laibv5GaVqKPtk1a?= =?utf-8?q?ojiyim+glQ+2toSTWrnHy0YnCvIJdxeWbDqjOQlRtDNOiL4EbiUsr3IGJGObC0POM?= =?utf-8?q?YBomaKkGgsP5Kh5BWrRsNXa8UziSMa14Aj7SlQfQ0rqv29ohDFeVYdvn+hKhzrFdS?= =?utf-8?q?By8WcSToQCX55+Ua0Z/e4tmkubv3mwcUW3qXpOhiiomctu0CizBDvjaut7y9fy0Ny?= =?utf-8?q?KwVfcwXHO6+k300SpmC/mT6Sjhagd8WJjAKb5JDXDALe6s0vtSVakz76RnAVJbvnl?= =?utf-8?q?LLr/jubAmVW0JEzP/ad4icOmtymsaZPvBlJ91jQdb9mtvT5mjEf3JzAvrMVdGoj2t?= =?utf-8?q?2VYCY1fxqoyEa+qssxrwogtPoFJd0vK0eNrXbt+BTViaX3QRSpSxNj8Lxg5jAfEEf?= =?utf-8?q?YsvTLRnQquDAV7IjbDcwBUrjvcFOfBfE/lLSkR4AhPf8VvY87uO/A5pkCSBOgvjNw?= =?utf-8?q?NHmgdtF564ORmmj3cP1DG3EHyE3YfvLYzGanqVLug6DTY5U7fvOvQHq6VClnAVO7m?= =?utf-8?q?RBogSxp4a3viWaH1h00NaeH1VDTpTFOKCVlH0coHiDt0AcTarmCEg/4d7tz5AqWPC?= =?utf-8?q?i8UhdQxZyP/CAJaGcYt9S5mcHV/kjUqexB1ogdgtrckTTeHap/ort8hYRghTsfoXv?= =?utf-8?q?jSvvexzfFGlpK0UdUVODiHqq69sY3wpEnWlWhFpgM0G5pI8mTCkc01H/tixssEvgR?= =?utf-8?q?PS/BEE4Y1nMqoaUYSP2NC8szyjDud/wQpT/GsHy6XYz0Wtc3hDsgpay5fixKtOiin?= =?utf-8?q?lJI6hl1q4NxXSnmFUefThYITHS1MeXPAaJxyrUI1jqe2QYR9Sb8LXFgbdfcYzYXfF?= =?utf-8?q?XUdlLaLDk4/b5u7FZrwHFcGpL2Hs9j0kg=3D=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PAXPR04MB8459.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(1800799024)(366016)(7416014)(376014)(52116014)(38350700014); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?TZVIziN6n/QUAEPfIG7Y/fvO0vS0?= =?utf-8?q?IbPZdHXWvG98FSPvEbOsX13GfTK+e3EeMLkZ7Xu5TE/LZmLozR07qVxpZ5O90DnyS?= =?utf-8?q?xJ5rw/yupXV+f8SaunJ2XqbZ1chySL+0AEzMUdTIe0sqoukFN2XntLYFS2O1acObw?= =?utf-8?q?pKn3qHFJlWAR4I8RGyuR/np1t86n0MVHK+XcEERCWwUd9VcpN6AKUoEmJWAKxGPYb?= =?utf-8?q?Ab/3lU5LmRkU1hgmHJQECxCY/LtomN2jjAewzegDSfFXe51g7Fbsbx4/79nlXWO+r?= =?utf-8?q?+CJPYPAyUEomSOckUtAk6vam1HxeIxnvDvzpyB9VZ2yo6WBR93hgN9M7J4SaahyeM?= =?utf-8?q?XmUhTJvTkMC7bmFI+Tzd8s+55pn7SD2YVFxG86mtoDFdaLD6pEahOWjPRozRpgklD?= =?utf-8?q?Abfn80Wu/BchbKBUU0K/fRwqU/7gL0ME/6SqzWyhN8KpKBP9ZFx+cuM2UOsprE9oj?= =?utf-8?q?XkgnRHrU4YtK9DHP3M1+zoVv0fTUPfeqJcLrJ+rs9Uv5Ntnzn2uU6Cg7tkVX8npTO?= =?utf-8?q?4lpc8gqarXRdtrdzsZgYfTgBoXUxzKAI0Xyx7nD8wEQBMLzzviR7SqcM6JjwNYUDx?= =?utf-8?q?kNqlsbRFt5NTlh/bwweJFQR8m4eYiamTkq43lEFyCjf7ypiMX8EVMrHDrHrdi7wUv?= =?utf-8?q?qF+rDSLME3nr+NX66N2tJjlBnPs06o3dpBgUXuL3Jw1HWoUf1Hf4Qr7gBpWNn131G?= =?utf-8?q?f6vrFaNmu81Fuu3LGJFvgwPDUUEd7y/ZnhNazx772GaiNcpGyZQswG7Cu3pv0NQcY?= =?utf-8?q?V+NNuWmMRIUPrh/Kv9q+CYUbAg30dFSgsPGpOaQuQzcD7DlhAwjNxijbH7hvjJl52?= =?utf-8?q?8azXjbkHjAosDjnRpOYwGFojK4aLoHWN9p3OD/waX5Ia2LePHpRUB3615vnZEtjq0?= =?utf-8?q?NyXTDBo/E/Ffehqy8wj++MqUTxQfaMW45F2DKVFTm7BzcS3TAh5quNmlI+NMpC7AR?= =?utf-8?q?uLBF/RT5rj5cS/GknCRSgHuW5muwQ8ZhgH+KJ6NY8cOOkXU7tz/RV9t3h2WmxZThs?= =?utf-8?q?U3B5HbGxGVtIEutoGgtXV8QevJfxewA1imXR1Jy5hPYyPqbgYIeCPE3a+3zvp7uc9?= =?utf-8?q?Jz0aadPEmHmhadKQEBlNAdzAqUR2KANR8s/Yt1tpcNhpYmovUJoMVlGxJF9+LsKgq?= =?utf-8?q?ze58+Oz7XxZWVBk8UkcOBybl6poil+YhBR3TqY4GvqGRCOh23z6eFUDnQp4yhNyrz?= =?utf-8?q?AX5osEEJdWFBmLrZ5s/WFqpFynmIzGCh4iPdu12Q8NQIQClRDydiNgOdoMUh3QcCT?= =?utf-8?q?DWt9KPT/ib3sgpw6+u8Fz5dGRgKUi6Gr404/Ier6YvRDxa00KCgfG/Q/G2mvCIMWG?= =?utf-8?q?jgwZ8acNekGHcp1yCZmNXXHXXRodpS8tci+NWOj261YAxhHonmXFCq3GdWwvUgGzI?= =?utf-8?q?jynQtildsx+jta6hIoptvjxZVRIDl2TCPTptnZLMnwPfJFdSSfEv+JQkIfY+yZKuG?= =?utf-8?q?2s6Z1kLL3fT9FIqDLiBpUbCpnZvSJU1XXHqNduIpbH9uxdN7UQg9IB1OFnAl1rPQi?= =?utf-8?q?qSWgeDbjJ/f7?= X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 24fc5994-c5a9-4cb2-8f96-08dd85f9e406 X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB8459.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Apr 2025 02:10:47.7850 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: XGXLdCFaoutiDj30TbYZocwc9LBSI/QGb923437xwq9E4ckDmjndkmcglD8t41x8bGwV6CYoAhB10Nh9EY44rw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: GVXPR04MB9901 From: Peng Fan There is no in-tree user of "include/sound/cs42l56.h", so move 'struct cs42l73_platform_data ' to cs42l73.c and remove the header file. And platform data is mostly for legacy platforms that create devices non using device tree. So drop cs42l73.h to prepare using GPIOD API. Signed-off-by: Peng Fan --- include/sound/cs42l73.h | 19 ------------------- sound/soc/codecs/cs42l73.c | 36 ++++++++++++++++++------------------ 2 files changed, 18 insertions(+), 37 deletions(-) diff --git a/include/sound/cs42l73.h b/include/sound/cs42l73.h deleted file mode 100644 index 5a93393b6124f746bfb7bf5076e4bd1f458019d2..0000000000000000000000000000000000000000 --- a/include/sound/cs42l73.h +++ /dev/null @@ -1,19 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ -/* - * linux/sound/cs42l73.h -- Platform data for CS42L73 - * - * Copyright (c) 2012 Cirrus Logic Inc. - */ - -#ifndef __CS42L73_H -#define __CS42L73_H - -struct cs42l73_platform_data { - /* RST GPIO */ - unsigned int reset_gpio; - unsigned int chgfreq; - int jack_detection; - unsigned int mclk_freq; -}; - -#endif /* __CS42L73_H */ diff --git a/sound/soc/codecs/cs42l73.c b/sound/soc/codecs/cs42l73.c index 556270befa941a69e17b47a15677e1c4f912b14f..c09c23487d2e73340b8947ed0e1ffadb24414e7c 100644 --- a/sound/soc/codecs/cs42l73.c +++ b/sound/soc/codecs/cs42l73.c @@ -19,7 +19,6 @@ #include #include #include -#include #include #include #include @@ -29,6 +28,14 @@ #include "cirrus_legacy.h" #include "cs42l73.h" +struct cs42l73_platform_data { + /* RST GPIO */ + unsigned int reset_gpio; + unsigned int chgfreq; + int jack_detection; + unsigned int mclk_freq; +}; + struct sp_config { u8 spc, mmcc, spfs; u32 srate; @@ -1276,7 +1283,7 @@ static const struct regmap_config cs42l73_regmap = { static int cs42l73_i2c_probe(struct i2c_client *i2c_client) { struct cs42l73_private *cs42l73; - struct cs42l73_platform_data *pdata = dev_get_platdata(&i2c_client->dev); + struct cs42l73_platform_data *pdata; int ret, devid; unsigned int reg; u32 val32; @@ -1292,23 +1299,16 @@ static int cs42l73_i2c_probe(struct i2c_client *i2c_client) return ret; } - if (pdata) { - cs42l73->pdata = *pdata; - } else { - pdata = devm_kzalloc(&i2c_client->dev, sizeof(*pdata), - GFP_KERNEL); - if (!pdata) - return -ENOMEM; - - if (i2c_client->dev.of_node) { - if (of_property_read_u32(i2c_client->dev.of_node, - "chgfreq", &val32) >= 0) - pdata->chgfreq = val32; - } - pdata->reset_gpio = of_get_named_gpio(i2c_client->dev.of_node, - "reset-gpio", 0); - cs42l73->pdata = *pdata; + pdata = devm_kzalloc(&i2c_client->dev, sizeof(*pdata), GFP_KERNEL); + if (!pdata) + return -ENOMEM; + + if (i2c_client->dev.of_node) { + if (of_property_read_u32(i2c_client->dev.of_node, "chgfreq", &val32) >= 0) + pdata->chgfreq = val32; } + pdata->reset_gpio = of_get_named_gpio(i2c_client->dev.of_node, "reset-gpio", 0); + cs42l73->pdata = *pdata; i2c_set_clientdata(i2c_client, cs42l73);