Skip to content

Commit 39d9ee4

Browse files
saba-kareembroonie
authored andcommitted
ASoC: amd: acp: add machine driver support for pdm use case
add pdm use case machine driver support Signed-off-by: Syed Saba Kareem <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Mark Brown <[email protected]>
1 parent 16fb2a2 commit 39d9ee4

File tree

2 files changed

+30
-11
lines changed

2 files changed

+30
-11
lines changed

sound/soc/amd/acp/acp-legacy-mach.c

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,11 @@ static struct acp_card_drvdata rt5682s_rt1019_rmb_data = {
8484
.tdm_mode = false,
8585
};
8686

87+
static struct acp_card_drvdata acp_dmic_data = {
88+
.dmic_cpu_id = DMIC,
89+
.dmic_codec_id = DMIC,
90+
};
91+
8792
static bool acp_asoc_init_ops(struct acp_card_drvdata *priv)
8893
{
8994
bool has_ops = false;
@@ -165,6 +170,8 @@ static int acp_asoc_probe(struct platform_device *pdev)
165170
card->name, ret);
166171
goto out;
167172
}
173+
if (!strcmp(pdev->name, "acp-pdm-mach"))
174+
acp_card_drvdata->platform = *((int *)dev->platform_data);
168175

169176
dmi_id = dmi_first_match(acp_quirk_table);
170177
if (dmi_id && dmi_id->driver_data)
@@ -214,6 +221,10 @@ static const struct platform_device_id board_ids[] = {
214221
.name = "rmb-rt5682s-rt1019",
215222
.driver_data = (kernel_ulong_t)&rt5682s_rt1019_rmb_data,
216223
},
224+
{
225+
.name = "acp-pdm-mach",
226+
.driver_data = (kernel_ulong_t)&acp_dmic_data,
227+
},
217228
{ }
218229
};
219230
static struct platform_driver acp_asoc_audio = {
@@ -235,4 +246,5 @@ MODULE_ALIAS("platform:acp3xalc5682s1019");
235246
MODULE_ALIAS("platform:acp3x-es83xx");
236247
MODULE_ALIAS("platform:rmb-nau8825-max");
237248
MODULE_ALIAS("platform:rmb-rt5682s-rt1019");
249+
MODULE_ALIAS("platform:acp-pdm-mach");
238250
MODULE_LICENSE("GPL v2");

sound/soc/amd/acp/acp-platform.c

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121
#include <linux/dma-mapping.h>
2222

2323
#include "amd.h"
24+
#include "../mach-config.h"
25+
#include "acp-mach.h"
2426

2527
#define DRV_NAME "acp_i2s_dma"
2628

@@ -69,20 +71,25 @@ static const struct snd_pcm_hardware acp_pcm_hardware_capture = {
6971
int acp_machine_select(struct acp_dev_data *adata)
7072
{
7173
struct snd_soc_acpi_mach *mach;
72-
int size;
73-
74-
size = sizeof(*adata->machines);
75-
mach = snd_soc_acpi_find_machine(adata->machines);
76-
if (!mach) {
77-
dev_err(adata->dev, "warning: No matching ASoC machine driver found\n");
78-
return -EINVAL;
74+
int size, platform;
75+
76+
if (adata->flag == FLAG_AMD_LEGACY_ONLY_DMIC) {
77+
platform = adata->platform;
78+
adata->mach_dev = platform_device_register_data(adata->dev, "acp-pdm-mach",
79+
PLATFORM_DEVID_NONE, &platform,
80+
sizeof(platform));
81+
} else {
82+
size = sizeof(*adata->machines);
83+
mach = snd_soc_acpi_find_machine(adata->machines);
84+
if (!mach) {
85+
dev_err(adata->dev, "warning: No matching ASoC machine driver found\n");
86+
return -EINVAL;
87+
}
88+
adata->mach_dev = platform_device_register_data(adata->dev, mach->drv_name,
89+
PLATFORM_DEVID_NONE, mach, size);
7990
}
80-
81-
adata->mach_dev = platform_device_register_data(adata->dev, mach->drv_name,
82-
PLATFORM_DEVID_NONE, mach, size);
8391
if (IS_ERR(adata->mach_dev))
8492
dev_warn(adata->dev, "Unable to register Machine device\n");
85-
8693
return 0;
8794
}
8895
EXPORT_SYMBOL_NS_GPL(acp_machine_select, SND_SOC_ACP_COMMON);

0 commit comments

Comments
 (0)