ASoC: amd: create platform devices for Renoir

Create platform devices for generic dmic codec driver
and machine driver.
These platform devices required for creation of sound card.

Signed-off-by: Vijendar Mukunda <Vijendar.Mukunda@amd.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20200518171704.24999-13-Vijendar.Mukunda@amd.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/amd/renoir/rn-pci-acp3x.c b/sound/soc/amd/renoir/rn-pci-acp3x.c
index 71bfae6..502c3f7 100644 (file)
--- a/sound/soc/amd/renoir/rn-pci-acp3x.c
+++ b/sound/soc/amd/renoir/rn-pci-acp3x.c
@@ -21,7 +21,7 @@ MODULE_PARM_DESC(acp_power_gating, "Enable acp power gating");
 struct acp_dev_data {
        void __iomem *acp_base;
        struct resource *res;
-       struct platform_device *pdev;
+       struct platform_device *pdev[ACP_DEVS];
 };
 
 static int rn_acp_power_on(void __iomem *acp_base)
@@ -156,9 +156,9 @@ static int snd_rn_acp_probe(struct pci_dev *pci,
                            const struct pci_device_id *pci_id)
 {
        struct acp_dev_data *adata;
-       struct platform_device_info pdevinfo;
+       struct platform_device_info pdevinfo[ACP_DEVS];
        unsigned int irqflags;
-       int ret;
+       int ret, index;
        u32 addr;
 
        if (pci_enable_device(pci)) {
@@ -219,20 +219,29 @@ static int snd_rn_acp_probe(struct pci_dev *pci,
        adata->res[1].end = pci->irq;
 
        memset(&pdevinfo, 0, sizeof(pdevinfo));
-       pdevinfo.name = "acp_rn_pdm_dma";
-       pdevinfo.id = 0;
-       pdevinfo.parent = &pci->dev;
-       pdevinfo.num_res = 2;
-       pdevinfo.res = adata->res;
-       pdevinfo.data = &irqflags;
-       pdevinfo.size_data = sizeof(irqflags);
-
-       adata->pdev = platform_device_register_full(&pdevinfo);
-       if (IS_ERR(adata->pdev)) {
-               dev_err(&pci->dev, "cannot register %s device\n",
-                       pdevinfo.name);
-               ret = PTR_ERR(adata->pdev);
-               goto unregister_devs;
+       pdevinfo[0].name = "acp_rn_pdm_dma";
+       pdevinfo[0].id = 0;
+       pdevinfo[0].parent = &pci->dev;
+       pdevinfo[0].num_res = 2;
+       pdevinfo[0].res = adata->res;
+       pdevinfo[0].data = &irqflags;
+       pdevinfo[0].size_data = sizeof(irqflags);
+
+       pdevinfo[1].name = "dmic-codec";
+       pdevinfo[1].id = 0;
+       pdevinfo[1].parent = &pci->dev;
+       pdevinfo[2].name = "acp_pdm_mach";
+       pdevinfo[2].id = 0;
+       pdevinfo[2].parent = &pci->dev;
+       for (index = 0; index < ACP_DEVS; index++) {
+               adata->pdev[index] =
+                               platform_device_register_full(&pdevinfo[index]);
+               if (IS_ERR(adata->pdev[index])) {
+                       dev_err(&pci->dev, "cannot register %s device\n",
+                               pdevinfo[index].name);
+                       ret = PTR_ERR(adata->pdev[index]);
+                       goto unregister_devs;
+               }
        }
        pm_runtime_set_autosuspend_delay(&pci->dev, ACP_SUSPEND_DELAY_MS);
        pm_runtime_use_autosuspend(&pci->dev);
@@ -241,7 +250,8 @@ static int snd_rn_acp_probe(struct pci_dev *pci,
        return 0;
 
 unregister_devs:
-       platform_device_unregister(adata->pdev);
+       for (index = 0; index < ACP_DEVS; index++)
+               platform_device_unregister(adata->pdev[index]);
 de_init:
        if (rn_acp_deinit(adata->acp_base))
                dev_err(&pci->dev, "ACP de-init failed\n");
@@ -294,10 +304,11 @@ static const struct dev_pm_ops rn_acp_pm = {
 static void snd_rn_acp_remove(struct pci_dev *pci)
 {
        struct acp_dev_data *adata;
-       int ret;
+       int ret, index;
 
        adata = pci_get_drvdata(pci);
-       platform_device_unregister(adata->pdev);
+       for (index = 0; index < ACP_DEVS; index++)
+               platform_device_unregister(adata->pdev[index]);
        ret = rn_acp_deinit(adata->acp_base);
        if (ret)
                dev_err(&pci->dev, "ACP de-init failed\n");

diff --git a/sound/soc/amd/renoir/rn_acp3x.h b/sound/soc/amd/renoir/rn_acp3x.h
index 6e18881..75228e3 100644 (file)
--- a/sound/soc/amd/renoir/rn_acp3x.h
+++ b/sound/soc/amd/renoir/rn_acp3x.h
@@ -7,6 +7,7 @@
 
 #include "rn_chip_offset_byte.h"
 
+#define ACP_DEVS               3
 #define ACP_PHY_BASE_ADDRESS 0x1240000
 #define        ACP_REG_START   0x1240000
 #define        ACP_REG_END     0x1250200