ASoC: amd: Create multiple I2S platform device endpoint

Creates Platform Device endpoints for multiple
I2S instances: SP and  BT endpoints device.
Pass PCI resources like MMIO, irq to the platform devices.

Signed-off-by: Ravulapati Vishnu vardhan rao <Vishnuvardhanrao.Ravulapati@amd.com>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Link: https://lore.kernel.org/r/1575553053-18344-2-git-send-email-Vishnuvardhanrao.Ravulapati@amd.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/amd/raven/acp3x.h b/sound/soc/amd/raven/acp3x.h
index 4f2cadd90a87e5bca85f1e20170aa0952c1568fe..2f15fe10ead5fdf48ab9909e48043cdd4114b583 100644 (file)
--- a/sound/soc/amd/raven/acp3x.h
+++ b/sound/soc/amd/raven/acp3x.h
@@ -7,10 +7,15 @@
 
 #include "chip_offset_byte.h"
 
+#define ACP3x_DEVS             3
 #define ACP3x_PHY_BASE_ADDRESS 0x1240000
 #define        ACP3x_I2S_MODE  0
 #define        ACP3x_REG_START 0x1240000
 #define        ACP3x_REG_END   0x1250200
+#define ACP3x_I2STDM_REG_START 0x1242400
+#define ACP3x_I2STDM_REG_END   0x1242410
+#define ACP3x_BT_TDM_REG_START 0x1242800
+#define ACP3x_BT_TDM_REG_END   0x1242810
 #define I2S_MODE       0x04
 #define        BT_TX_THRESHOLD 26
 #define        BT_RX_THRESHOLD 25

diff --git a/sound/soc/amd/raven/pci-acp3x.c b/sound/soc/amd/raven/pci-acp3x.c
index facec2472b34ce20da2b67c660aaed58a667ea49..94f5f21d9a538ba6b39df881a234f922837e21fb 100644 (file)
--- a/sound/soc/amd/raven/pci-acp3x.c
+++ b/sound/soc/amd/raven/pci-acp3x.c
@@ -16,17 +16,17 @@ struct acp3x_dev_data {
        void __iomem *acp3x_base;
        bool acp3x_audio_mode;
        struct resource *res;
-       struct platform_device *pdev;
+       struct platform_device *pdev[ACP3x_DEVS];
 };
 
 static int snd_acp3x_probe(struct pci_dev *pci,
                           const struct pci_device_id *pci_id)
 {
-       int ret;
-       u32 addr, val;
        struct acp3x_dev_data *adata;
-       struct platform_device_info pdevinfo;
+       struct platform_device_info pdevinfo[ACP3x_DEVS];
        unsigned int irqflags;
+       int ret, i;
+       u32 addr, val;
 
        if (pci_enable_device(pci)) {
                dev_err(&pci->dev, "pci_enable_device failed\n");
@@ -56,10 +56,11 @@ static int snd_acp3x_probe(struct pci_dev *pci,
                irqflags = 0;
 
        addr = pci_resource_start(pci, 0);
-       adata->acp3x_base = ioremap(addr, pci_resource_len(pci, 0));
+       adata->acp3x_base = devm_ioremap(&pci->dev, addr,
+                                       pci_resource_len(pci, 0));
        if (!adata->acp3x_base) {
                ret = -ENOMEM;
-               goto release_regions;
+               goto disable_msi;
        }
        pci_set_master(pci);
        pci_set_drvdata(pci, adata);
@@ -68,11 +69,11 @@ static int snd_acp3x_probe(struct pci_dev *pci,
        switch (val) {
        case I2S_MODE:
                adata->res = devm_kzalloc(&pci->dev,
-                                         sizeof(struct resource) * 2,
+                                         sizeof(struct resource) * 4,
                                          GFP_KERNEL);
                if (!adata->res) {
                        ret = -ENOMEM;
-                       goto unmap_mmio;
+                       goto disable_msi;
                }
 
                adata->res[0].name = "acp3x_i2s_iomem";
@@ -80,40 +81,67 @@ static int snd_acp3x_probe(struct pci_dev *pci,
                adata->res[0].start = addr;
                adata->res[0].end = addr + (ACP3x_REG_END - ACP3x_REG_START);
 
-               adata->res[1].name = "acp3x_i2s_irq";
-               adata->res[1].flags = IORESOURCE_IRQ;
-               adata->res[1].start = pci->irq;
-               adata->res[1].end = pci->irq;
+               adata->res[1].name = "acp3x_i2s_sp";
+               adata->res[1].flags = IORESOURCE_MEM;
+               adata->res[1].start = addr + ACP3x_I2STDM_REG_START;
+               adata->res[1].end = addr + ACP3x_I2STDM_REG_END;
+
+               adata->res[2].name = "acp3x_i2s_bt";
+               adata->res[2].flags = IORESOURCE_MEM;
+               adata->res[2].start = addr + ACP3x_BT_TDM_REG_START;
+               adata->res[2].end = addr + ACP3x_BT_TDM_REG_END;
+
+               adata->res[3].name = "acp3x_i2s_irq";
+               adata->res[3].flags = IORESOURCE_IRQ;
+               adata->res[3].start = pci->irq;
+               adata->res[3].end = adata->res[3].start;
 
                adata->acp3x_audio_mode = ACP3x_I2S_MODE;
 
                memset(&pdevinfo, 0, sizeof(pdevinfo));
-               pdevinfo.name = "acp3x_rv_i2s";
-               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 unmap_mmio;
+               pdevinfo[0].name = "acp3x_rv_i2s_dma";
+               pdevinfo[0].id = 0;
+               pdevinfo[0].parent = &pci->dev;
+               pdevinfo[0].num_res = 4;
+               pdevinfo[0].res = &adata->res[0];
+               pdevinfo[0].data = &irqflags;
+               pdevinfo[0].size_data = sizeof(irqflags);
+
+               pdevinfo[1].name = "acp3x_i2s_playcap";
+               pdevinfo[1].id = 0;
+               pdevinfo[1].parent = &pci->dev;
+               pdevinfo[1].num_res = 1;
+               pdevinfo[1].res = &adata->res[1];
+
+               pdevinfo[2].name = "acp3x_i2s_playcap";
+               pdevinfo[2].id = 1;
+               pdevinfo[2].parent = &pci->dev;
+               pdevinfo[2].num_res = 1;
+               pdevinfo[2].res = &adata->res[2];
+               for (i = 0; i < ACP3x_DEVS ; i++) {
+                       adata->pdev[i] =
+                               platform_device_register_full(&pdevinfo[i]);
+                       if (IS_ERR(adata->pdev[i])) {
+                               dev_err(&pci->dev, "cannot register %s device\n",
+                                       pdevinfo[i].name);
+                               ret = PTR_ERR(adata->pdev[i]);
+                               goto unregister_devs;
+                       }
                }
                break;
        default:
                dev_err(&pci->dev, "Invalid ACP audio mode : %d\n", val);
                ret = -ENODEV;
-               goto unmap_mmio;
+               goto disable_msi;
        }
        return 0;
 
-unmap_mmio:
+unregister_devs:
+       if (val == I2S_MODE)
+               for (i = 0 ; i < ACP3x_DEVS ; i++)
+                       platform_device_unregister(adata->pdev[i]);
+disable_msi:
        pci_disable_msi(pci);
-       iounmap(adata->acp3x_base);
 release_regions:
        pci_release_regions(pci);
 disable_pci:
@@ -125,10 +153,12 @@ disable_pci:
 static void snd_acp3x_remove(struct pci_dev *pci)
 {
        struct acp3x_dev_data *adata = pci_get_drvdata(pci);
+       int i;
 
-       platform_device_unregister(adata->pdev);
-       iounmap(adata->acp3x_base);
-
+       if (adata->acp3x_audio_mode == ACP3x_I2S_MODE) {
+               for (i = 0 ; i <  ACP3x_DEVS ; i++)
+                       platform_device_unregister(adata->pdev[i]);
+       }
        pci_disable_msi(pci);
        pci_release_regions(pci);
        pci_disable_device(pci);
@@ -151,6 +181,7 @@ static struct pci_driver acp3x_driver  = {
 
 module_pci_driver(acp3x_driver);
 
+MODULE_AUTHOR("Vishnuvardhanrao.Ravulapati@amd.com");
 MODULE_AUTHOR("Maruthi.Bayyavarapu@amd.com");
 MODULE_DESCRIPTION("AMD ACP3x PCI driver");
 MODULE_LICENSE("GPL v2");