| Message ID | 20200505205327.642282-14-alexander.deucher@amd.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Add Renoir ACP driver | expand |
> +static int acp_probe(struct platform_device *pdev) > +{ > + int ret; > + struct acp_pdm *machine = NULL; > + struct snd_soc_card *card; > + > + card = &acp_card; > + acp_card.dev = &pdev->dev; > + > + platform_set_drvdata(pdev, card); > + snd_soc_card_set_drvdata(card, machine); > + ret = devm_snd_soc_register_card(&pdev->dev, card); > + if (ret) { > + dev_err(&pdev->dev, > + "snd_soc_register_card(%s) failed: %d\n", > + acp_card.name, ret); > + return ret; > + } > + if (ret) { > + dev_err(&pdev->dev, > + "snd_soc_register_card(%s) failed: %d\n", > + acp_card.name, ret); > + return ret; > + } copy-paste mistake here, the same block appears twice? > + return 0; > +} > + > +static struct platform_driver acp_mach_driver = { > + .driver = { > + .name = "acp_pdm_mach", > + .pm = &snd_soc_pm_ops, > + }, > + .probe = acp_probe, > +}; > + > +static int __init acp_audio_init(void) > +{ > + platform_driver_register(&acp_mach_driver); > + return 0; > +} > + > +static void __exit acp_audio_exit(void) > +{ > + platform_driver_unregister(&acp_mach_driver); > +} > + > +module_init(acp_audio_init); > +module_exit(acp_audio_exit); module_platform_driver(acp_mach_driver) does all this __init and __exit for you. > + > +MODULE_AUTHOR("Vijendar.Mukunda@amd.com"); > +MODULE_LICENSE("GPL v2"); > +MODULE_ALIAS("platform:" DRV_NAME); >
> -----Original Message----- > From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> > Sent: Wednesday, May 6, 2020 3:08 AM > To: Alex Deucher <alexdeucher@gmail.com>; alsa-devel@alsa-project.org; > broonie@kernel.org; Mukunda, Vijendar <Vijendar.Mukunda@amd.com>; > tiwai@suse.de > Cc: Deucher, Alexander <Alexander.Deucher@amd.com> > Subject: Re: [PATCH 13/14] ASoC: amd: RN machine driver using dmic > > > > > +static int acp_probe(struct platform_device *pdev) > > +{ > > + int ret; > > + struct acp_pdm *machine = NULL; > > + struct snd_soc_card *card; > > + > > + card = &acp_card; > > + acp_card.dev = &pdev->dev; > > + > > + platform_set_drvdata(pdev, card); > > + snd_soc_card_set_drvdata(card, machine); > > + ret = devm_snd_soc_register_card(&pdev->dev, card); > > + if (ret) { > > + dev_err(&pdev->dev, > > + "snd_soc_register_card(%s) failed: %d\n", > > + acp_card.name, ret); > > + return ret; > > + } > > + if (ret) { > > + dev_err(&pdev->dev, > > + "snd_soc_register_card(%s) failed: %d\n", > > + acp_card.name, ret); > > + return ret; > > + } > > copy-paste mistake here, the same block appears twice? Will fix it and share updated patch. -Vijendar > > > + return 0; > > +} > > + > > +static struct platform_driver acp_mach_driver = { > > + .driver = { > > + .name = "acp_pdm_mach", > > + .pm = &snd_soc_pm_ops, > > + }, > > + .probe = acp_probe, > > +}; > > + > > +static int __init acp_audio_init(void) > > +{ > > + platform_driver_register(&acp_mach_driver); > > + return 0; > > +} > > + > > +static void __exit acp_audio_exit(void) > > +{ > > + platform_driver_unregister(&acp_mach_driver); > > +} > > + > > +module_init(acp_audio_init); > > +module_exit(acp_audio_exit); > > module_platform_driver(acp_mach_driver) does all this __init and __exit > for you. > > > + > > +MODULE_AUTHOR("Vijendar.Mukunda@amd.com"); > > +MODULE_LICENSE("GPL v2"); > > +MODULE_ALIAS("platform:" DRV_NAME); > >
diff --git a/sound/soc/amd/renoir/acp3x-rn.c b/sound/soc/amd/renoir/acp3x-rn.c new file mode 100644 index 000000000000..8556446637dc --- /dev/null +++ b/sound/soc/amd/renoir/acp3x-rn.c @@ -0,0 +1,112 @@ +// SPDX-License-Identifier: GPL-2.0+ +// +// Machine driver for AMD Renoir platform using DMIC +// +//Copyright 2020 Advanced Micro Devices, Inc. + +#include <sound/soc.h> +#include <sound/soc-dapm.h> +#include <linux/module.h> +#include <sound/pcm.h> +#include <sound/pcm_params.h> +#include <linux/io.h> + +#include "rn_acp3x.h" + +#define DRV_NAME "acp_pdm_mach" + +static int acp_pdm_hw_params(struct snd_pcm_substream *substream, + struct snd_pcm_hw_params *hw_params) +{ + return 0; +} + +static struct snd_soc_ops acp_pdm_ops = { + .hw_params = acp_pdm_hw_params, +}; + +static int acp_init(struct snd_soc_pcm_runtime *rtd) +{ + return 0; +} + +SND_SOC_DAILINK_DEF(acp_pdm, + DAILINK_COMP_ARRAY(COMP_CPU("acp_rn_pdm_dma.0"))); + +SND_SOC_DAILINK_DEF(dmic_codec, + DAILINK_COMP_ARRAY(COMP_CODEC("dmic-codec.0", + "dmic-hifi"))); + +SND_SOC_DAILINK_DEF(platform, + DAILINK_COMP_ARRAY(COMP_PLATFORM("acp_rn_pdm_dma.0"))); + +static struct snd_soc_dai_link acp_dai_pdm[] = { + { + .name = "acp3x-dmic-capture", + .stream_name = "DMIC capture", + .ops = &acp_pdm_ops, + .init = acp_init, + .capture_only = 1, + SND_SOC_DAILINK_REG(acp_pdm, dmic_codec, platform), + }, +}; + +static struct snd_soc_card acp_card = { + .name = "acp", + .owner = THIS_MODULE, + .dai_link = acp_dai_pdm, + .num_links = 1, +}; + +static int acp_probe(struct platform_device *pdev) +{ + int ret; + struct acp_pdm *machine = NULL; + struct snd_soc_card *card; + + card = &acp_card; + acp_card.dev = &pdev->dev; + + platform_set_drvdata(pdev, card); + snd_soc_card_set_drvdata(card, machine); + ret = devm_snd_soc_register_card(&pdev->dev, card); + if (ret) { + dev_err(&pdev->dev, + "snd_soc_register_card(%s) failed: %d\n", + acp_card.name, ret); + return ret; + } + if (ret) { + dev_err(&pdev->dev, + "snd_soc_register_card(%s) failed: %d\n", + acp_card.name, ret); + return ret; + } + return 0; +} + +static struct platform_driver acp_mach_driver = { + .driver = { + .name = "acp_pdm_mach", + .pm = &snd_soc_pm_ops, + }, + .probe = acp_probe, +}; + +static int __init acp_audio_init(void) +{ + platform_driver_register(&acp_mach_driver); + return 0; +} + +static void __exit acp_audio_exit(void) +{ + platform_driver_unregister(&acp_mach_driver); +} + +module_init(acp_audio_init); +module_exit(acp_audio_exit); + +MODULE_AUTHOR("Vijendar.Mukunda@amd.com"); +MODULE_LICENSE("GPL v2"); +MODULE_ALIAS("platform:" DRV_NAME);