1. Patchew
  2. linux
  3. [PATCH v1 0/5] Add support for CS35L63 Smart Amplifier
  4. View patch

[PATCH v1 1/5] ASoC: cs35l56: Add Index based on ACPI HID or SDW ID to select regmap config

Stefan Binding posted 5 patches 10 months ago
There is a newer version of this series
[PATCH v1 1/5] ASoC: cs35l56: Add Index based on ACPI HID or SDW ID to select regmap config
Posted by Stefan Binding 10 months ago 
This is to prepare for further products using slightly different
regmap configs.

Signed-off-by: Stefan Binding <sbinding@opensource.cirrus.com>
---
 sound/soc/codecs/cs35l56-i2c.c | 16 +++++++++++++---
 sound/soc/codecs/cs35l56-sdw.c | 16 +++++++++++++---
 2 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/sound/soc/codecs/cs35l56-i2c.c b/sound/soc/codecs/cs35l56-i2c.c
index 8a518df1e16e..5962914e2180 100644
--- a/sound/soc/codecs/cs35l56-i2c.c
+++ b/sound/soc/codecs/cs35l56-i2c.c
@@ -17,9 +17,10 @@
 
 static int cs35l56_i2c_probe(struct i2c_client *client)
 {
+	unsigned int id = (u32)(uintptr_t)i2c_get_match_data(client);
 	struct cs35l56_private *cs35l56;
 	struct device *dev = &client->dev;
-	const struct regmap_config *regmap_config = &cs35l56_regmap_i2c;
+	const struct regmap_config *regmap_config;
 	int ret;
 
 	cs35l56 = devm_kzalloc(dev, sizeof(struct cs35l56_private), GFP_KERNEL);
@@ -30,6 +31,15 @@ static int cs35l56_i2c_probe(struct i2c_client *client)
 	cs35l56->base.can_hibernate = true;
 
 	i2c_set_clientdata(client, cs35l56);
+
+	switch (id) {
+	case 0x3556:
+		regmap_config = &cs35l56_regmap_i2c;
+		break;
+	default:
+		return -ENODEV;
+	}
+
 	cs35l56->base.regmap = devm_regmap_init_i2c(client, regmap_config);
 	if (IS_ERR(cs35l56->base.regmap)) {
 		ret = PTR_ERR(cs35l56->base.regmap);
@@ -57,14 +67,14 @@ static void cs35l56_i2c_remove(struct i2c_client *client)
 }
 
 static const struct i2c_device_id cs35l56_id_i2c[] = {
-	{ "cs35l56" },
+	{ "cs35l56", 0x3556 },
 	{}
 };
 MODULE_DEVICE_TABLE(i2c, cs35l56_id_i2c);
 
 #ifdef CONFIG_ACPI
 static const struct acpi_device_id cs35l56_asoc_acpi_match[] = {
-	{ "CSC355C", 0 },
+	{ "CSC355C", 0x3556 },
 	{},
 };
 MODULE_DEVICE_TABLE(acpi, cs35l56_asoc_acpi_match);
diff --git a/sound/soc/codecs/cs35l56-sdw.c b/sound/soc/codecs/cs35l56-sdw.c
index 3f91cb3f9ae7..d178357e1196 100644
--- a/sound/soc/codecs/cs35l56-sdw.c
+++ b/sound/soc/codecs/cs35l56-sdw.c
@@ -509,6 +509,7 @@ static int cs35l56_sdw_probe(struct sdw_slave *peripheral, const struct sdw_devi
 {
 	struct device *dev = &peripheral->dev;
 	struct cs35l56_private *cs35l56;
+	const struct regmap_config *regmap_config;
 	int ret;
 
 	cs35l56 = devm_kzalloc(dev, sizeof(*cs35l56), GFP_KERNEL);
@@ -521,8 +522,17 @@ static int cs35l56_sdw_probe(struct sdw_slave *peripheral, const struct sdw_devi
 
 	dev_set_drvdata(dev, cs35l56);
 
+	switch ((unsigned int)id->driver_data) {
+	case 0x3556:
+	case 0x3557:
+		regmap_config = &cs35l56_regmap_sdw;
+		break;
+	default:
+		return -ENODEV;
+	}
+
 	cs35l56->base.regmap = devm_regmap_init(dev, &cs35l56_regmap_bus_sdw,
-					   peripheral, &cs35l56_regmap_sdw);
+					   peripheral, regmap_config);
 	if (IS_ERR(cs35l56->base.regmap)) {
 		ret = PTR_ERR(cs35l56->base.regmap);
 		return dev_err_probe(dev, ret, "Failed to allocate register map\n");
@@ -562,8 +572,8 @@ static const struct dev_pm_ops cs35l56_sdw_pm = {
 };
 
 static const struct sdw_device_id cs35l56_sdw_id[] = {
-	SDW_SLAVE_ENTRY(0x01FA, 0x3556, 0),
-	SDW_SLAVE_ENTRY(0x01FA, 0x3557, 0),
+	SDW_SLAVE_ENTRY(0x01FA, 0x3556, 0x3556),
+	SDW_SLAVE_ENTRY(0x01FA, 0x3557, 0x3557),
 	{},
 };
 MODULE_DEVICE_TABLE(sdw, cs35l56_sdw_id);
-- 
2.43.0
Re: [PATCH v1 1/5] ASoC: cs35l56: Add Index based on ACPI HID or SDW ID to select regmap config
Posted by Richard Fitzgerald 9 months, 2 weeks ago 
On 7/4/25 16:16, Stefan Binding wrote:
> This is to prepare for further products using slightly different
> regmap configs.
> 
> Signed-off-by: Stefan Binding <sbinding@opensource.cirrus.com>
> ---
>   sound/soc/codecs/cs35l56-i2c.c | 16 +++++++++++++---
>   sound/soc/codecs/cs35l56-sdw.c | 16 +++++++++++++---
>   2 files changed, 26 insertions(+), 6 deletions(-)
> 
> diff --git a/sound/soc/codecs/cs35l56-i2c.c b/sound/soc/codecs/cs35l56-i2c.c
> index 8a518df1e16e..5962914e2180 100644
> --- a/sound/soc/codecs/cs35l56-i2c.c
> +++ b/sound/soc/codecs/cs35l56-i2c.c
> @@ -17,9 +17,10 @@
>   
>   static int cs35l56_i2c_probe(struct i2c_client *client)
>   {
> +	unsigned int id = (u32)(uintptr_t)i2c_get_match_data(client);
>   	struct cs35l56_private *cs35l56;
>   	struct device *dev = &client->dev;
> -	const struct regmap_config *regmap_config = &cs35l56_regmap_i2c;
> +	const struct regmap_config *regmap_config;
>   	int ret;
>   
>   	cs35l56 = devm_kzalloc(dev, sizeof(struct cs35l56_private), GFP_KERNEL);
> @@ -30,6 +31,15 @@ static int cs35l56_i2c_probe(struct i2c_client *client)
>   	cs35l56->base.can_hibernate = true;
>   
>   	i2c_set_clientdata(client, cs35l56);
> +
> +	switch (id) {
> +	case 0x3556:
> +		regmap_config = &cs35l56_regmap_i2c;
> +		break;
> +	default:
> +		return -ENODEV;
> +	}
> +
>   	cs35l56->base.regmap = devm_regmap_init_i2c(client, regmap_config);
>   	if (IS_ERR(cs35l56->base.regmap)) {
>   		ret = PTR_ERR(cs35l56->base.regmap);
> @@ -57,14 +67,14 @@ static void cs35l56_i2c_remove(struct i2c_client *client)
>   }
>   
>   static const struct i2c_device_id cs35l56_id_i2c[] = {
> -	{ "cs35l56" },
> +	{ "cs35l56", 0x3556 },
>   	{}
>   };
>   MODULE_DEVICE_TABLE(i2c, cs35l56_id_i2c);
>   
>   #ifdef CONFIG_ACPI
>   static const struct acpi_device_id cs35l56_asoc_acpi_match[] = {
> -	{ "CSC355C", 0 },
> +	{ "CSC355C", 0x3556 },
>   	{},
>   };
>   MODULE_DEVICE_TABLE(acpi, cs35l56_asoc_acpi_match);
> diff --git a/sound/soc/codecs/cs35l56-sdw.c b/sound/soc/codecs/cs35l56-sdw.c
> index 3f91cb3f9ae7..d178357e1196 100644
> --- a/sound/soc/codecs/cs35l56-sdw.c
> +++ b/sound/soc/codecs/cs35l56-sdw.c
> @@ -509,6 +509,7 @@ static int cs35l56_sdw_probe(struct sdw_slave *peripheral, const struct sdw_devi
>   {
>   	struct device *dev = &peripheral->dev;
>   	struct cs35l56_private *cs35l56;
> +	const struct regmap_config *regmap_config;
>   	int ret;
>   
>   	cs35l56 = devm_kzalloc(dev, sizeof(*cs35l56), GFP_KERNEL);
> @@ -521,8 +522,17 @@ static int cs35l56_sdw_probe(struct sdw_slave *peripheral, const struct sdw_devi
>   
>   	dev_set_drvdata(dev, cs35l56);
>   
> +	switch ((unsigned int)id->driver_data) {
> +	case 0x3556:
> +	case 0x3557:
> +		regmap_config = &cs35l56_regmap_sdw;
> +		break;
> +	default:
> +		return -ENODEV;
> +	}
> +
>   	cs35l56->base.regmap = devm_regmap_init(dev, &cs35l56_regmap_bus_sdw,
> -					   peripheral, &cs35l56_regmap_sdw);
> +					   peripheral, regmap_config);
>   	if (IS_ERR(cs35l56->base.regmap)) {
>   		ret = PTR_ERR(cs35l56->base.regmap);
>   		return dev_err_probe(dev, ret, "Failed to allocate register map\n");
> @@ -562,8 +572,8 @@ static const struct dev_pm_ops cs35l56_sdw_pm = {
>   };
>   
>   static const struct sdw_device_id cs35l56_sdw_id[] = {
> -	SDW_SLAVE_ENTRY(0x01FA, 0x3556, 0),
> -	SDW_SLAVE_ENTRY(0x01FA, 0x3557, 0),
> +	SDW_SLAVE_ENTRY(0x01FA, 0x3556, 0x3556),
> +	SDW_SLAVE_ENTRY(0x01FA, 0x3557, 0x3557),
>   	{},
>   };
>   MODULE_DEVICE_TABLE(sdw, cs35l56_sdw_id);

Reviewed-by: Richard Fitzgerald <rf@opensource.cirrus.com>

Patchew 2.1-devel-b67e4c2

© 2016 - 2026 Red Hat, Inc.