From: "Peng Fan (OSS)" <peng.fan@oss.nxp.com>
To: David Rhodes <david.rhodes@cirrus.com>,
Richard Fitzgerald <rf@opensource.cirrus.com>,
Liam Girdwood <lgirdwood@gmail.com>,
Mark Brown <broonie@kernel.org>,
Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.com>,
Linus Walleij <linus.walleij@linaro.org>,
Bartosz Golaszewski <brgl@bgdev.pl>,
Charles Keepax <ckeepax@opensource.cirrus.com>
Cc: linux-sound@vger.kernel.org, patches@opensource.cirrus.com,
linux-kernel@vger.kernel.org, linux-gpio@vger.kernel.org,
Peng Fan <peng.fan@nxp.com>
Subject: [PATCH v3 5/9] ASoC: codec: cs42l73: Drop cs42l73.h
Date: Tue, 06 May 2025 15:29:35 +0800 [thread overview]
Message-ID: <20250506-csl42x-v3-5-e9496db544c4@nxp.com> (raw)
In-Reply-To: <20250506-csl42x-v3-0-e9496db544c4@nxp.com>
From: Peng Fan <peng.fan@nxp.com>
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 <peng.fan@nxp.com>
---
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 <linux/regmap.h>
#include <linux/slab.h>
#include <sound/core.h>
-#include <sound/cs42l73.h>
#include <sound/initval.h>
#include <sound/pcm.h>
#include <sound/pcm_params.h>
@@ -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);
--
2.37.1
next prev parent reply other threads:[~2025-05-06 7:31 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-05-06 7:29 [PATCH v3 0/9] ASoC: codec: cs42l[56,73,52]: Convert to GPIO descriptors Peng Fan (OSS)
2025-05-06 7:29 ` [PATCH v3 1/9] ASoC: codec: cs42l56: Sort headers alphabetically Peng Fan (OSS)
2025-05-06 7:29 ` [PATCH v3 2/9] ASoC: codec: cs42l56: Drop cs42l56.h Peng Fan (OSS)
2025-05-06 7:29 ` [PATCH v3 3/9] ASoC: codec: cs42l56: Convert to GPIO descriptors Peng Fan (OSS)
2025-05-13 12:54 ` Linus Walleij
2025-05-13 12:54 ` Linus Walleij
2025-05-06 7:29 ` [PATCH v3 4/9] ASoC: codec: cs42l73: Sort headers alphabetically Peng Fan (OSS)
2025-05-06 7:29 ` Peng Fan (OSS) [this message]
2025-05-06 7:29 ` [PATCH v3 6/9] ASoC: codec: cs42l73: Convert to GPIO descriptors Peng Fan (OSS)
2025-05-13 12:55 ` Linus Walleij
2025-05-06 7:29 ` [PATCH v3 7/9] ASoC: codec: cs42l52: Sort headers alphabetically Peng Fan (OSS)
2025-05-06 7:29 ` [PATCH v3 8/9] ASoC: codec: cs42l52: Drop cs42l52.h Peng Fan (OSS)
2025-05-06 7:29 ` [PATCH v3 9/9] ASoC: codec: cs42l52: Convert to GPIO descriptors Peng Fan (OSS)
2025-05-13 12:55 ` Linus Walleij
2025-05-07 11:13 ` [PATCH v3 0/9] ASoC: codec: cs42l[56,73,52]: " Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250506-csl42x-v3-5-e9496db544c4@nxp.com \
--to=peng.fan@oss.nxp.com \
--cc=brgl@bgdev.pl \
--cc=broonie@kernel.org \
--cc=ckeepax@opensource.cirrus.com \
--cc=david.rhodes@cirrus.com \
--cc=lgirdwood@gmail.com \
--cc=linus.walleij@linaro.org \
--cc=linux-gpio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sound@vger.kernel.org \
--cc=patches@opensource.cirrus.com \
--cc=peng.fan@nxp.com \
--cc=perex@perex.cz \
--cc=rf@opensource.cirrus.com \
--cc=tiwai@suse.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®