Loading sound/soc/amd/acp/acp-legacy-mach.c +12 −0 Original line number Diff line number Diff line Loading @@ -84,6 +84,11 @@ static struct acp_card_drvdata rt5682s_rt1019_rmb_data = { .tdm_mode = false, }; static struct acp_card_drvdata acp_dmic_data = { .dmic_cpu_id = DMIC, .dmic_codec_id = DMIC, }; static bool acp_asoc_init_ops(struct acp_card_drvdata *priv) { bool has_ops = false; Loading Loading @@ -165,6 +170,8 @@ static int acp_asoc_probe(struct platform_device *pdev) card->name, ret); goto out; } if (!strcmp(pdev->name, "acp-pdm-mach")) acp_card_drvdata->platform = *((int *)dev->platform_data); dmi_id = dmi_first_match(acp_quirk_table); if (dmi_id && dmi_id->driver_data) Loading Loading @@ -214,6 +221,10 @@ static const struct platform_device_id board_ids[] = { .name = "rmb-rt5682s-rt1019", .driver_data = (kernel_ulong_t)&rt5682s_rt1019_rmb_data, }, { .name = "acp-pdm-mach", .driver_data = (kernel_ulong_t)&acp_dmic_data, }, { } }; static struct platform_driver acp_asoc_audio = { Loading @@ -235,4 +246,5 @@ MODULE_ALIAS("platform:acp3xalc5682s1019"); MODULE_ALIAS("platform:acp3x-es83xx"); MODULE_ALIAS("platform:rmb-nau8825-max"); MODULE_ALIAS("platform:rmb-rt5682s-rt1019"); MODULE_ALIAS("platform:acp-pdm-mach"); MODULE_LICENSE("GPL v2"); sound/soc/amd/acp/acp-platform.c +18 −11 Original line number Diff line number Diff line Loading @@ -21,6 +21,8 @@ #include <linux/dma-mapping.h> #include "amd.h" #include "../mach-config.h" #include "acp-mach.h" #define DRV_NAME "acp_i2s_dma" Loading Loading @@ -69,20 +71,25 @@ static const struct snd_pcm_hardware acp_pcm_hardware_capture = { int acp_machine_select(struct acp_dev_data *adata) { struct snd_soc_acpi_mach *mach; int size; int size, platform; if (adata->flag == FLAG_AMD_LEGACY_ONLY_DMIC) { platform = adata->platform; adata->mach_dev = platform_device_register_data(adata->dev, "acp-pdm-mach", PLATFORM_DEVID_NONE, &platform, sizeof(platform)); } else { size = sizeof(*adata->machines); mach = snd_soc_acpi_find_machine(adata->machines); if (!mach) { dev_err(adata->dev, "warning: No matching ASoC machine driver found\n"); return -EINVAL; } adata->mach_dev = platform_device_register_data(adata->dev, mach->drv_name, PLATFORM_DEVID_NONE, mach, size); } if (IS_ERR(adata->mach_dev)) dev_warn(adata->dev, "Unable to register Machine device\n"); return 0; } EXPORT_SYMBOL_NS_GPL(acp_machine_select, SND_SOC_ACP_COMMON); Loading Loading
sound/soc/amd/acp/acp-legacy-mach.c +12 −0 Original line number Diff line number Diff line Loading @@ -84,6 +84,11 @@ static struct acp_card_drvdata rt5682s_rt1019_rmb_data = { .tdm_mode = false, }; static struct acp_card_drvdata acp_dmic_data = { .dmic_cpu_id = DMIC, .dmic_codec_id = DMIC, }; static bool acp_asoc_init_ops(struct acp_card_drvdata *priv) { bool has_ops = false; Loading Loading @@ -165,6 +170,8 @@ static int acp_asoc_probe(struct platform_device *pdev) card->name, ret); goto out; } if (!strcmp(pdev->name, "acp-pdm-mach")) acp_card_drvdata->platform = *((int *)dev->platform_data); dmi_id = dmi_first_match(acp_quirk_table); if (dmi_id && dmi_id->driver_data) Loading Loading @@ -214,6 +221,10 @@ static const struct platform_device_id board_ids[] = { .name = "rmb-rt5682s-rt1019", .driver_data = (kernel_ulong_t)&rt5682s_rt1019_rmb_data, }, { .name = "acp-pdm-mach", .driver_data = (kernel_ulong_t)&acp_dmic_data, }, { } }; static struct platform_driver acp_asoc_audio = { Loading @@ -235,4 +246,5 @@ MODULE_ALIAS("platform:acp3xalc5682s1019"); MODULE_ALIAS("platform:acp3x-es83xx"); MODULE_ALIAS("platform:rmb-nau8825-max"); MODULE_ALIAS("platform:rmb-rt5682s-rt1019"); MODULE_ALIAS("platform:acp-pdm-mach"); MODULE_LICENSE("GPL v2");
sound/soc/amd/acp/acp-platform.c +18 −11 Original line number Diff line number Diff line Loading @@ -21,6 +21,8 @@ #include <linux/dma-mapping.h> #include "amd.h" #include "../mach-config.h" #include "acp-mach.h" #define DRV_NAME "acp_i2s_dma" Loading Loading @@ -69,20 +71,25 @@ static const struct snd_pcm_hardware acp_pcm_hardware_capture = { int acp_machine_select(struct acp_dev_data *adata) { struct snd_soc_acpi_mach *mach; int size; int size, platform; if (adata->flag == FLAG_AMD_LEGACY_ONLY_DMIC) { platform = adata->platform; adata->mach_dev = platform_device_register_data(adata->dev, "acp-pdm-mach", PLATFORM_DEVID_NONE, &platform, sizeof(platform)); } else { size = sizeof(*adata->machines); mach = snd_soc_acpi_find_machine(adata->machines); if (!mach) { dev_err(adata->dev, "warning: No matching ASoC machine driver found\n"); return -EINVAL; } adata->mach_dev = platform_device_register_data(adata->dev, mach->drv_name, PLATFORM_DEVID_NONE, mach, size); } if (IS_ERR(adata->mach_dev)) dev_warn(adata->dev, "Unable to register Machine device\n"); return 0; } EXPORT_SYMBOL_NS_GPL(acp_machine_select, SND_SOC_ACP_COMMON); Loading