From: Bharadwaj Raju <[email protected]> When multiple aw88261 amps are present in a system, they cannot be enabled together since the names of the DAIs, kcontrols, DAPM widgets, and DAPM routes conflict unless they are dynamically renamed to include the channel number as a suffix.
Signed-off-by: Bharadwaj Raju <[email protected]> --- When multiple aw88261 amps for different channels are present, their controls, widgets, and component names are the same and hence conflict. Rename these to include the channel as a differentiating suffix. This patch is an RFC for now because while this is the approach taken in the downstream driver, I'm unsure if this is the best approach. Especially because other codec drivers don't seem to do this, generally. --- sound/soc/codecs/aw88261.c | 157 ++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 148 insertions(+), 9 deletions(-) diff --git a/sound/soc/codecs/aw88261.c b/sound/soc/codecs/aw88261.c index 36ee4f7c3d0a..9a2d167cf809 100644 --- a/sound/soc/codecs/aw88261.c +++ b/sound/soc/codecs/aw88261.c @@ -1130,9 +1130,24 @@ static int aw88261_request_firmware_file(struct aw88261 *aw88261) return ret; } +static int aw88261_append_channel_suffix(const char *format, const char **name, + struct aw88261 *aw88261) +{ + char buf[64]; + + snprintf(buf, sizeof(buf), format, *name, aw88261->aw_pa->channel); + (*name) = devm_kstrdup(aw88261->aw_pa->dev, buf, GFP_KERNEL); + if (!(*name)) + return -ENOMEM; + return 0; +} + static int aw88261_codec_probe(struct snd_soc_component *component) { struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component); + struct snd_soc_dapm_widget *dapm_widgets = NULL; + struct snd_soc_dapm_route *audio_map = NULL; + struct snd_kcontrol_new *controls = NULL; struct aw88261 *aw88261 = snd_soc_component_get_drvdata(component); int ret; @@ -1143,20 +1158,110 @@ static int aw88261_codec_probe(struct snd_soc_component *component) return dev_err_probe(aw88261->aw_pa->dev, ret, "aw88261_request_firmware_file failed\n"); + /* rename dapm widgets to avoid clash between left and right amps */ + dapm_widgets = devm_kzalloc(aw88261->aw_pa->dev, + sizeof(struct snd_soc_dapm_widget) * + ARRAY_SIZE(aw88261_dapm_widgets), + GFP_KERNEL); + if (!dapm_widgets) + return dev_err_probe( + aw88261->aw_pa->dev, -ENOMEM, + "could not allocate memory for dapm widgets\n"); + + memcpy(dapm_widgets, aw88261_dapm_widgets, + sizeof(struct snd_soc_dapm_widget) * + ARRAY_SIZE(aw88261_dapm_widgets)); + + for (int i = 0; i < ARRAY_SIZE(aw88261_dapm_widgets); i++) { + if (dapm_widgets[i].name) { + ret = aw88261_append_channel_suffix( + "%s_%d", &dapm_widgets[i].name, aw88261); + if (ret) + return dev_err_probe( + aw88261->aw_pa->dev, ret, + "could not change widget name\n"); + } + if (dapm_widgets[i].sname) { + ret = aw88261_append_channel_suffix( + "%s_%d", &dapm_widgets[i].sname, aw88261); + if (ret) + return dev_err_probe( + aw88261->aw_pa->dev, ret, + "could not change widget sname\n"); + } + } + /* add widgets */ - ret = snd_soc_dapm_new_controls(dapm, aw88261_dapm_widgets, - ARRAY_SIZE(aw88261_dapm_widgets)); + ret = snd_soc_dapm_new_controls(dapm, dapm_widgets, + ARRAY_SIZE(aw88261_dapm_widgets)); if (ret) return ret; + /* rename dapm routes to avoid clash between left and right amps */ + audio_map = devm_kzalloc(aw88261->aw_pa->dev, + sizeof(struct snd_soc_dapm_route) * + ARRAY_SIZE(aw88261_audio_map), + GFP_KERNEL); + if (!audio_map) + return dev_err_probe( + aw88261->aw_pa->dev, -ENOMEM, + "could not allocate memory for dapm routes\n"); + + memcpy(audio_map, aw88261_audio_map, + sizeof(struct snd_soc_dapm_route) * + ARRAY_SIZE(aw88261_audio_map)); + + for (int i = 0; i < ARRAY_SIZE(aw88261_audio_map); i++) { + if (audio_map[i].sink) { + ret = aw88261_append_channel_suffix( + "%s_%d", &audio_map[i].sink, aw88261); + if (ret) + return dev_err_probe( + aw88261->aw_pa->dev, ret, + "could not change route sink\n"); + } + if (audio_map[i].source) { + ret = aw88261_append_channel_suffix( + "%s_%d", &audio_map[i].source, aw88261); + if (ret) + return dev_err_probe( + aw88261->aw_pa->dev, ret, + "could not change route source\n"); + } + } + /* add route */ - ret = snd_soc_dapm_add_routes(dapm, aw88261_audio_map, - ARRAY_SIZE(aw88261_audio_map)); + ret = snd_soc_dapm_add_routes(dapm, audio_map, + ARRAY_SIZE(aw88261_audio_map)); if (ret) return ret; - ret = snd_soc_add_component_controls(component, aw88261_controls, - ARRAY_SIZE(aw88261_controls)); + /* rename kcontrols to avoid clash between left and right amps */ + controls = devm_kzalloc(aw88261->aw_pa->dev, + sizeof(struct snd_kcontrol_new) * + ARRAY_SIZE(aw88261_controls), + GFP_KERNEL); + if (!controls) + return dev_err_probe( + aw88261->aw_pa->dev, -ENOMEM, + "could not allocate memory for kcontrols\n"); + + memcpy(controls, aw88261_controls, + sizeof(struct snd_kcontrol_new) * ARRAY_SIZE(aw88261_controls)); + + for (int i = 0; i < ARRAY_SIZE(aw88261_controls); i++) { + if (controls[i].name) { + ret = aw88261_append_channel_suffix( + "%s %d", &controls[i].name, aw88261); + if (ret) + return dev_err_probe( + aw88261->aw_pa->dev, ret, + "could not change kcontrol name\n"); + } + } + + ret = snd_soc_add_component_controls(component, controls, + ARRAY_SIZE(aw88261_controls)); return ret; } @@ -1234,6 +1339,7 @@ static int aw88261_init(struct aw88261 **aw88261, struct i2c_client *i2c, struct static int aw88261_i2c_probe(struct i2c_client *i2c) { struct aw88261 *aw88261; + struct snd_soc_dai_driver *dai = NULL; int ret; ret = i2c_check_functionality(i2c->adapter, I2C_FUNC_I2C); @@ -1259,9 +1365,42 @@ static int aw88261_i2c_probe(struct i2c_client *i2c) if (ret) return ret; - ret = devm_snd_soc_register_component(&i2c->dev, - &soc_codec_dev_aw88261, - aw88261_dai, ARRAY_SIZE(aw88261_dai)); + /* rename dai drivers to avoid clashes between left and right amps */ + dai = devm_kzalloc(aw88261->aw_pa->dev, + sizeof(struct snd_soc_dai_driver) * + ARRAY_SIZE(aw88261_dai), + GFP_KERNEL); + if (!dai) + return dev_err_probe(&i2c->dev, -ENOMEM, + "could not allocate memory for dai\n"); + + memcpy(dai, aw88261_dai, + sizeof(struct snd_soc_dai_driver) * ARRAY_SIZE(aw88261_dai)); + + for (int i = 0; i < ARRAY_SIZE(aw88261_dai); i++) { + ret = aw88261_append_channel_suffix("%s-%d", &dai[i].name, + aw88261); + if (ret) + return dev_err_probe(&i2c->dev, ret, + "could not change dai name\n"); + + ret = aw88261_append_channel_suffix( + "%s_%d", &dai[i].playback.stream_name, aw88261); + if (ret) + return dev_err_probe( + &i2c->dev, ret, + "could not change dai playback name\n"); + + ret = aw88261_append_channel_suffix( + "%s-%d", &dai[i].capture.stream_name, aw88261); + if (ret) + return dev_err_probe( + &i2c->dev, ret, + "could not change dai capture name\n"); + } + + ret = devm_snd_soc_register_component(&i2c->dev, &soc_codec_dev_aw88261, + dai, ARRAY_SIZE(aw88261_dai)); if (ret) dev_err(&i2c->dev, "failed to register aw88261: %d", ret); --- base-commit: 65af168f341f34ac12f878d7b7f8326df7921190 change-id: 20260116-aw88261-rename-1d25aedcbf93 Best regards, -- Bharadwaj Raju <[email protected]>
