mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Vijendar Mukunda <Vijendar.Mukunda@amd.com>
To: <broonie@kernel.org>, <alsa-devel@alsa-project.org>
Cc: <Alexander.Deucher@amd.com>, <Basavaraj.Hiregoudar@amd.com>,
	<Sunil-kumar.Dommati@amd.com>, <Mario.Limonciello@amd.com>,
	<Richard.Gong@amd.com>,
	Vijendar Mukunda <Vijendar.Mukunda@amd.com>,
	"Liam Girdwood" <lgirdwood@gmail.com>,
	Jaroslav Kysela <perex@perex.cz>, "Takashi Iwai" <tiwai@suse.com>,
	open list <linux-kernel@vger.kernel.org>
Subject: [PATCH 04/13] ASoC: amd: add platform devices for acp6x pdm driver and dmic driver
Date: Mon, 11 Oct 2021 11:26:12 +0530	[thread overview]
Message-ID: <20211011055621.13240-5-Vijendar.Mukunda@amd.com> (raw)
In-Reply-To: <20211011055621.13240-1-Vijendar.Mukunda@amd.com>

ACP6.x IP has PDM decoder block.
Create a platform device for it, so that the PDM platform driver
can be bound to this device.
Pass PCI resources like MMIO to this platform device.

Create a platform device for generic dmic codec driver.

Signed-off-by: Vijendar Mukunda <Vijendar.Mukunda@amd.com>
---
 sound/soc/amd/yc/acp6x.h     | 23 ++++++++++++
 sound/soc/amd/yc/pci-acp6x.c | 68 ++++++++++++++++++++++++++++++++++--
 2 files changed, 89 insertions(+), 2 deletions(-)

diff --git a/sound/soc/amd/yc/acp6x.h b/sound/soc/amd/yc/acp6x.h
index 76e9e860e9bb..63bdea3188ea 100644
--- a/sound/soc/amd/yc/acp6x.h
+++ b/sound/soc/amd/yc/acp6x.h
@@ -9,6 +9,10 @@
 
 #define ACP_DEVICE_ID 0x15E2
 #define ACP6x_PHY_BASE_ADDRESS 0x1240000
+#define ACP6x_REG_START		0x1240000
+#define ACP6x_REG_END		0x1250200
+#define ACP6x_DEVS		2
+#define ACP6x_PDM_MODE		1
 
 #define ACP_SOFT_RESET_SOFTRESET_AUDDONE_MASK	0x00010001
 #define ACP_PGFSM_CNTL_POWER_ON_MASK	1
@@ -22,6 +26,25 @@
 #define ACP_ERROR_MASK 0x20000000
 #define ACP_EXT_INTR_STAT_CLEAR_MASK 0xFFFFFFFF
 
+enum acp_config {
+	ACP_CONFIG_0 = 0,
+	ACP_CONFIG_1,
+	ACP_CONFIG_2,
+	ACP_CONFIG_3,
+	ACP_CONFIG_4,
+	ACP_CONFIG_5,
+	ACP_CONFIG_6,
+	ACP_CONFIG_7,
+	ACP_CONFIG_8,
+	ACP_CONFIG_9,
+	ACP_CONFIG_10,
+	ACP_CONFIG_11,
+	ACP_CONFIG_12,
+	ACP_CONFIG_13,
+	ACP_CONFIG_14,
+	ACP_CONFIG_15,
+};
+
 static inline u32 acp6x_readl(void __iomem *base_addr)
 {
 	return readl(base_addr - ACP6x_PHY_BASE_ADDRESS);
diff --git a/sound/soc/amd/yc/pci-acp6x.c b/sound/soc/amd/yc/pci-acp6x.c
index 56fd7cdbc442..26c8d652fd08 100644
--- a/sound/soc/amd/yc/pci-acp6x.c
+++ b/sound/soc/amd/yc/pci-acp6x.c
@@ -8,11 +8,15 @@
 #include <linux/module.h>
 #include <linux/io.h>
 #include <linux/delay.h>
+#include <linux/platform_device.h>
 
 #include "acp6x.h"
 
 struct acp6x_dev_data {
 	void __iomem *acp6x_base;
+	struct resource *res;
+	bool acp6x_audio_mode;
+	struct platform_device *pdev[ACP6x_DEVS];
 };
 
 static int acp6x_power_on(void __iomem *acp_base)
@@ -116,7 +120,9 @@ static int snd_acp6x_probe(struct pci_dev *pci,
 			   const struct pci_device_id *pci_id)
 {
 	struct acp6x_dev_data *adata;
-	int ret;
+	struct platform_device_info pdevinfo[ACP6x_DEVS];
+	int ret, index;
+	int val = 0x00;
 	u32 addr;
 
 	/* Yellow Carp device check */
@@ -153,8 +159,62 @@ static int snd_acp6x_probe(struct pci_dev *pci,
 	ret = acp6x_init(adata->acp6x_base);
 	if (ret)
 		goto release_regions;
+	val = acp6x_readl(adata->acp6x_base + ACP_PIN_CONFIG);
+	switch (val) {
+	case ACP_CONFIG_0:
+	case ACP_CONFIG_1:
+	case ACP_CONFIG_2:
+	case ACP_CONFIG_3:
+	case ACP_CONFIG_9:
+	case ACP_CONFIG_15:
+		dev_info(&pci->dev, "Audio Mode %d\n", val);
+		break;
+	default:
+		adata->res = devm_kzalloc(&pci->dev,
+					  sizeof(struct resource),
+					  GFP_KERNEL);
+		if (!adata->res) {
+			ret = -ENOMEM;
+			goto de_init;
+		}
+
+		adata->res->name = "acp_iomem";
+		adata->res->flags = IORESOURCE_MEM;
+		adata->res->start = addr;
+		adata->res->end = addr + (ACP6x_REG_END - ACP6x_REG_START);
+
+		adata->acp6x_audio_mode = ACP6x_PDM_MODE;
+
+		memset(&pdevinfo, 0, sizeof(pdevinfo));
+		pdevinfo[0].name = "acp_yc_pdm_dma";
+		pdevinfo[0].id = 0;
+		pdevinfo[0].parent = &pci->dev;
+		pdevinfo[0].num_res = 1;
+		pdevinfo[0].res = adata->res;
+
+		pdevinfo[1].name = "dmic-codec";
+		pdevinfo[1].id = 0;
+		pdevinfo[1].parent = &pci->dev;
 
+		for (index = 0; index < ACP6x_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;
+			}
+		}
+		break;
+	}
 	return 0;
+unregister_devs:
+	for (--index; index >= 0; index--)
+		platform_device_unregister(adata->pdev[index]);
+de_init:
+	if (acp6x_deinit(adata->acp6x_base))
+		dev_err(&pci->dev, "ACP de-init failed\n");
 release_regions:
 	pci_release_regions(pci);
 disable_pci:
@@ -166,9 +226,13 @@ static int snd_acp6x_probe(struct pci_dev *pci,
 static void snd_acp6x_remove(struct pci_dev *pci)
 {
 	struct acp6x_dev_data *adata;
-	int ret;
+	int ret, index;
 
 	adata = pci_get_drvdata(pci);
+	if (adata->acp6x_audio_mode == ACP6x_PDM_MODE) {
+		for (index = 0; index < ACP6x_DEVS; index++)
+			platform_device_unregister(adata->pdev[index]);
+	}
 	ret = acp6x_deinit(adata->acp6x_base);
 	if (ret)
 		dev_err(&pci->dev, "ACP de-init failed\n");
-- 
2.25.1


  parent reply	other threads:[~2021-10-11  5:39 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <20211011055621.13240-1-Vijendar.Mukunda@amd.com>
2021-10-11  5:56 ` [PATCH 01/13] ASoC: amd: add Yellow Carp ACP6x IP register header Vijendar Mukunda
2021-10-11  5:56 ` [PATCH 02/13] ASoC: amd: add Yellow Carp ACP PCI driver Vijendar Mukunda
     [not found]   ` <e61fa81d-bf63-8b41-03d8-12bd3e61af59@amd.com>
2021-10-11 11:43     ` Mukunda,Vijendar
2021-10-11  5:56 ` [PATCH 03/13] ASoC: amd: add acp6x init/de-init functions Vijendar Mukunda
2021-10-11 11:04   ` Gong, Richard
2021-10-11 11:06   ` Gong, Richard
2021-10-11 11:40     ` Mukunda,Vijendar
2021-10-11  5:56 ` Vijendar Mukunda [this message]
2021-10-11  5:56 ` [PATCH 05/13] ASoC: amd: add acp6x pdm platform driver Vijendar Mukunda
2021-10-11  5:56 ` [PATCH 06/13] ASoC: amd: add acp6x irq handler Vijendar Mukunda
2021-10-11  8:58   ` Joe Perches
2021-10-11  9:28     ` Mukunda,Vijendar
2021-10-11  5:56 ` [PATCH 07/13] ASoC: amd: add acp6x pdm driver dma ops Vijendar Mukunda
2021-10-11  5:56 ` [PATCH 08/13] ASoC: amd: add acp6x pci driver pm ops Vijendar Mukunda
2021-10-11  5:56 ` [PATCH 09/13] ASoC: amd: add acp6x pdm " Vijendar Mukunda
2021-10-11  5:56 ` [PATCH 10/13] ASoC: amd: enable Yellow carp acp6x drivers build Vijendar Mukunda
2021-10-11  5:56 ` [PATCH 11/13] ASoC: amd: create platform device for acp6x machine driver Vijendar Mukunda
2021-10-11  5:56 ` [PATCH 12/13] ASoC: amd: add YC machine driver using dmic Vijendar Mukunda
2021-10-11  5:56 ` [PATCH 13/13] ASoC: amd: enable yc machine driver build Vijendar Mukunda
2021-10-11  7:55   ` Randy Dunlap
2021-10-11  8:25     ` Mukunda,Vijendar

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20211011055621.13240-5-Vijendar.Mukunda@amd.com \
    --to=vijendar.mukunda@amd.com \
    --cc=Alexander.Deucher@amd.com \
    --cc=Basavaraj.Hiregoudar@amd.com \
    --cc=Mario.Limonciello@amd.com \
    --cc=Richard.Gong@amd.com \
    --cc=Sunil-kumar.Dommati@amd.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=broonie@kernel.org \
    --cc=lgirdwood@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=perex@perex.cz \
    --cc=tiwai@suse.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®