Unverified Commit 9ea280f3 authored by Stefan Binding's avatar Stefan Binding Committed by Mark Brown
Browse files

ASoC: cs35l56: Add Index based on ACPI HID or SDW ID to select regmap config 



This is to prepare for further products using slightly different
regmap configs.

Signed-off-by: default avatarStefan Binding <sbinding@opensource.cirrus.com>
Reviewed-by: default avatarRichard Fitzgerald <rf@opensource.cirrus.com>
Link: https://patch.msgid.link/20250407151842.143393-2-sbinding@opensource.cirrus.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 02ca7898

sound/soc/codecs/cs35l56-i2c.c

+13 −3
Original line number Diff line number Diff line
@@ -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);

sound/soc/codecs/cs35l56-sdw.c

+13 −3
Original line number Diff line number Diff line
@@ -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);