Skip to content

Commit

Permalink
ASoC: rt5645: Set card long_name for GPD win / pocket
Browse files Browse the repository at this point in the history
The GPD win and pocket devices both use the same codec setup and both
have too generic dmi strings making snd_soc_set_dmi_name() not work.

As these devices have only a single speaker we want a separate ucm
file for them, which requires a unique long_name, use the existing
GPD quirk handling to also provide a unique long_name.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
  • Loading branch information
Hans de Goede authored and Mark Brown committed Dec 12, 2017
1 parent 56986b0 commit aa9c387
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 0 deletions.
3 changes: 3 additions & 0 deletions include/sound/rt5645.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@ struct rt5645_platform_data {
bool level_trigger_irq;
/* Invert JD1_1 status polarity */
bool inv_jd1_1;

/* Value to asign to snd_soc_card.long_name */
const char *long_name;
};

#endif
4 changes: 4 additions & 0 deletions sound/soc/codecs/rt5645.c
Original file line number Diff line number Diff line change
Expand Up @@ -3394,6 +3394,9 @@ static int rt5645_probe(struct snd_soc_codec *codec)
snd_soc_dapm_sync(dapm);
}

if (rt5645->pdata.long_name)
codec->component.card->long_name = rt5645->pdata.long_name;

rt5645->eq_param = devm_kzalloc(codec->dev,
RT5645_HWEQ_NUM * sizeof(struct rt5645_eq_param_s), GFP_KERNEL);

Expand Down Expand Up @@ -3624,6 +3627,7 @@ static const struct dmi_system_id dmi_platform_intel_broadwell[] = {
static const struct rt5645_platform_data gpd_win_platform_data = {
.jd_mode = 3,
.inv_jd1_1 = true,
.long_name = "gpd-win-pocket-rt5645",
};

static const struct dmi_system_id dmi_platform_gpd_win[] = {
Expand Down

0 comments on commit aa9c387

Please sign in to comment.