Skip to content

Commit

Permalink
ASoC: amd: Passing card structure based on codec
Browse files Browse the repository at this point in the history
Passing specific snd_soc_card structure depending on the ACPI ID.
In future we can add other IDs in the ACPI table and pass the structure.

Signed-off-by: Ravulapati Vishnu vardhan rao <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Mark Brown <[email protected]>
  • Loading branch information
Ravulapati Vishnu vardhan rao authored and broonie committed Jul 30, 2020
1 parent 9c04b5a commit 0fe4b56
Showing 1 changed file with 20 additions and 5 deletions.
25 changes: 20 additions & 5 deletions sound/soc/amd/acp3x-rt5682-max9836.c
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ static struct snd_soc_jack pco_jack;
static struct clk *rt5682_dai_wclk;
static struct clk *rt5682_dai_bclk;
static struct gpio_desc *dmic_sel;
void *soc_is_rltk_max(struct device *dev);

static int acp3x_5682_init(struct snd_soc_pcm_runtime *rtd)
{
Expand Down Expand Up @@ -326,18 +327,32 @@ static struct snd_soc_card acp3x_5682 = {
.num_controls = ARRAY_SIZE(acp3x_5682_mc_controls),
};

void *soc_is_rltk_max(struct device *dev)
{
const struct acpi_device_id *match;

match = acpi_match_device(dev->driver->acpi_match_table, dev);
if (!match)
return NULL;
return (void *)match->driver_data;
}

static int acp3x_probe(struct platform_device *pdev)
{
int ret;
struct snd_soc_card *card;
struct acp3x_platform_info *machine;
struct device *dev = &pdev->dev;

card = (struct snd_soc_card *)soc_is_rltk_max(dev);
if (!card)
return -ENODEV;

machine = devm_kzalloc(&pdev->dev, sizeof(*machine), GFP_KERNEL);
if (!machine)
return -ENOMEM;

card = &acp3x_5682;
acp3x_5682.dev = &pdev->dev;
card->dev = &pdev->dev;
platform_set_drvdata(pdev, card);
snd_soc_card_set_drvdata(card, machine);

Expand All @@ -348,18 +363,18 @@ static int acp3x_probe(struct platform_device *pdev)
return PTR_ERR(dmic_sel);
}

ret = devm_snd_soc_register_card(&pdev->dev, &acp3x_5682);
ret = devm_snd_soc_register_card(&pdev->dev, card);
if (ret) {
dev_err(&pdev->dev,
"devm_snd_soc_register_card(%s) failed: %d\n",
acp3x_5682.name, ret);
card->name, ret);
return ret;
}
return 0;
}

static const struct acpi_device_id acp3x_audio_acpi_match[] = {
{ "AMDI5682", 0 },
{ "AMDI5682", (unsigned long)&acp3x_5682},
{},
};
MODULE_DEVICE_TABLE(acpi, acp3x_audio_acpi_match);
Expand Down

0 comments on commit 0fe4b56

Please sign in to comment.