moonjuice/kernel_arpi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ASoC: max98390: Add support change dsm param name

Browse Source 
In case of using different type of speaker, support
 using different dsm parameter bin file for each amp connected.

Signed-off-by: Steve Lee <steves.lee@maximintegrated.com>
Link: https://lore.kernel.org/r/20210809142140.9293-1-steves.lee@maximintegrated.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Steve Lee
2021-08-09 23:21:40 +09:00
committed by Mark Brown
parent 455ecc808e
commit a10facb752
2 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
sound/soc/codecs/max98390.c
View File

@@ -765,17 +765,26 @@ static int max98390_dsm_init(struct snd_soc_component *component)
vendor = dmi_get_system_info(DMI_SYS_VENDOR); vendor = dmi_get_system_info(DMI_SYS_VENDOR);
product = dmi_get_system_info(DMI_PRODUCT_NAME); product = dmi_get_system_info(DMI_PRODUCT_NAME);
if (vendor && product) { if (!strcmp(max98390->dsm_param_name, "default")) {
snprintf(filename, sizeof(filename), "dsm_param_%s_%s.bin", if (vendor && product) {
vendor, product); snprintf(filename, sizeof(filename),
"dsm_param_%s_%s.bin", vendor, product);
} else {
sprintf(filename, "dsm_param.bin");
}
} else { } else {
sprintf(filename, "dsm_param.bin"); snprintf(filename, sizeof(filename), "%s",
max98390->dsm_param_name);
} }
ret = request_firmware(&fw, filename, component->dev); ret = request_firmware(&fw, filename, component->dev);
if (ret) { if (ret) {
ret = request_firmware(&fw, "dsm_param.bin", component->dev); ret = request_firmware(&fw, "dsm_param.bin", component->dev);
if (ret) if (ret) {
goto err; ret = request_firmware(&fw, "dsmparam.bin",
component->dev);
if (ret)
goto err;
}
} }
dev_dbg(component->dev, dev_dbg(component->dev,
@@ -1047,6 +1056,11 @@ static int max98390_i2c_probe(struct i2c_client *i2c,
__func__, max98390->ref_rdc_value, __func__, max98390->ref_rdc_value,
max98390->ambient_temp_value); max98390->ambient_temp_value);
ret = device_property_read_string(&i2c->dev, "maxim,dsm_param_name",
&max98390->dsm_param_name);
if (ret)
max98390->dsm_param_name = "default";
/* voltage/current slot configuration */ /* voltage/current slot configuration */
max98390_slot_config(i2c, max98390); max98390_slot_config(i2c, max98390);

1
sound/soc/codecs/max98390.h
View File

@@ -662,5 +662,6 @@ struct max98390_priv {
unsigned int i_l_slot; unsigned int i_l_slot;
unsigned int ref_rdc_value; unsigned int ref_rdc_value;
unsigned int ambient_temp_value; unsigned int ambient_temp_value;
const char *dsm_param_name;
}; };
#endif #endif