From: Vijendar Mukunda <vijendar.mukunda@amd.com> To: <broonie@kernel.org>, <alsa-devel@alsa-project.org> Cc: <Alexander.Deucher@amd.com>, <Sunil-kumar.Dommati@amd.com>, "Vijendar Mukunda" <Vijendar.Mukunda@amd.com>, Liam Girdwood <lgirdwood@gmail.com>, Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.com>, "Vijendar Mukunda" <vijendar.mukunda@amd.com>, open list <linux-kernel@vger.kernel.org> Subject: [PATCH 02/12] ASoC: amd: add Vangogh ACP PCI driver Date: Wed, 7 Jul 2021 11:26:13 +0530 [thread overview] Message-ID: <20210707055623.27371-3-vijendar.mukunda@amd.com> (raw) In-Reply-To: <20210707055623.27371-1-vijendar.mukunda@amd.com> From: Vijendar Mukunda <Vijendar.Mukunda@amd.com> ACP is a PCI audio device. This patch adds PCI driver to bind to this device and get PCI resources. Signed-off-by: Vijendar Mukunda <Vijendar.Mukunda@amd.com> --- sound/soc/amd/vangogh/acp5x.h | 21 ++++++++ sound/soc/amd/vangogh/pci-acp5x.c | 87 +++++++++++++++++++++++++++++++ 2 files changed, 108 insertions(+) create mode 100644 sound/soc/amd/vangogh/acp5x.h create mode 100644 sound/soc/amd/vangogh/pci-acp5x.c diff --git a/sound/soc/amd/vangogh/acp5x.h b/sound/soc/amd/vangogh/acp5x.h new file mode 100644 index 000000000000..a5e7f7cb65a1 --- /dev/null +++ b/sound/soc/amd/vangogh/acp5x.h @@ -0,0 +1,21 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * AMD ALSA SoC PCM Driver + * + * Copyright (C) 2021 Advanced Micro Devices, Inc. All rights reserved. + */ + +#include "vg_chip_offset_byte.h" + +#define ACP5x_PHY_BASE_ADDRESS 0x1240000 +#define ACP_DEVICE_ID 0x15E2 + +static inline u32 acp_readl(void __iomem *base_addr) +{ + return readl(base_addr - ACP5x_PHY_BASE_ADDRESS); +} + +static inline void acp_writel(u32 val, void __iomem *base_addr) +{ + writel(val, base_addr - ACP5x_PHY_BASE_ADDRESS); +} diff --git a/sound/soc/amd/vangogh/pci-acp5x.c b/sound/soc/amd/vangogh/pci-acp5x.c new file mode 100644 index 000000000000..e56d060a5cb9 --- /dev/null +++ b/sound/soc/amd/vangogh/pci-acp5x.c @@ -0,0 +1,87 @@ +// SPDX-License-Identifier: GPL-2.0+ +// +// AMD Vangogh ACP PCI Driver +// +// Copyright (C) 2021 Advanced Micro Devices, Inc. All rights reserved. + +#include <linux/pci.h> +#include <linux/module.h> +#include <linux/io.h> + +#include "acp5x.h" + +struct acp5x_dev_data { + void __iomem *acp5x_base; +}; + +static int snd_acp5x_probe(struct pci_dev *pci, + const struct pci_device_id *pci_id) +{ + struct acp5x_dev_data *adata; + int ret; + u32 addr; + + if (pci->revision != 0x50) + return -ENODEV; + + if (pci_enable_device(pci)) { + dev_err(&pci->dev, "pci_enable_device failed\n"); + return -ENODEV; + } + + ret = pci_request_regions(pci, "AMD ACP5x audio"); + if (ret < 0) { + dev_err(&pci->dev, "pci_request_regions failed\n"); + goto disable_pci; + } + + adata = devm_kzalloc(&pci->dev, sizeof(struct acp5x_dev_data), + GFP_KERNEL); + if (!adata) { + ret = -ENOMEM; + goto release_regions; + } + addr = pci_resource_start(pci, 0); + adata->acp5x_base = devm_ioremap(&pci->dev, addr, + pci_resource_len(pci, 0)); + if (!adata->acp5x_base) { + ret = -ENOMEM; + goto release_regions; + } + pci_set_master(pci); + pci_set_drvdata(pci, adata); + +release_regions: + pci_release_regions(pci); +disable_pci: + pci_disable_device(pci); + + return ret; +} + +static void snd_acp5x_remove(struct pci_dev *pci) +{ + pci_release_regions(pci); + pci_disable_device(pci); +} + +static const struct pci_device_id snd_acp5x_ids[] = { + { PCI_DEVICE(PCI_VENDOR_ID_AMD, ACP_DEVICE_ID), + .class = PCI_CLASS_MULTIMEDIA_OTHER << 8, + .class_mask = 0xffffff }, + { 0, }, +}; +MODULE_DEVICE_TABLE(pci, snd_acp5x_ids); + +static struct pci_driver acp5x_driver = { + .name = KBUILD_MODNAME, + .id_table = snd_acp5x_ids, + .probe = snd_acp5x_probe, + .remove = snd_acp5x_remove, +}; + +module_pci_driver(acp5x_driver); + +MODULE_AUTHOR("Vijendar.Mukunda@amd.com"); +MODULE_DESCRIPTION("AMD Vangogh ACP PCI driver"); +MODULE_LICENSE("GPL v2"); -- 2.17.1
WARNING: multiple messages have this Message-ID (diff)
From: Vijendar Mukunda <vijendar.mukunda@amd.com> To: <broonie@kernel.org>, <alsa-devel@alsa-project.org> Cc: Sunil-kumar.Dommati@amd.com, Liam Girdwood <lgirdwood@gmail.com>, open list <linux-kernel@vger.kernel.org>, Takashi Iwai <tiwai@suse.com>, Vijendar Mukunda <vijendar.mukunda@amd.com>, Alexander.Deucher@amd.com Subject: [PATCH 02/12] ASoC: amd: add Vangogh ACP PCI driver Date: Wed, 7 Jul 2021 11:26:13 +0530 [thread overview] Message-ID: <20210707055623.27371-3-vijendar.mukunda@amd.com> (raw) In-Reply-To: <20210707055623.27371-1-vijendar.mukunda@amd.com> From: Vijendar Mukunda <Vijendar.Mukunda@amd.com> ACP is a PCI audio device. This patch adds PCI driver to bind to this device and get PCI resources. Signed-off-by: Vijendar Mukunda <Vijendar.Mukunda@amd.com> --- sound/soc/amd/vangogh/acp5x.h | 21 ++++++++ sound/soc/amd/vangogh/pci-acp5x.c | 87 +++++++++++++++++++++++++++++++ 2 files changed, 108 insertions(+) create mode 100644 sound/soc/amd/vangogh/acp5x.h create mode 100644 sound/soc/amd/vangogh/pci-acp5x.c diff --git a/sound/soc/amd/vangogh/acp5x.h b/sound/soc/amd/vangogh/acp5x.h new file mode 100644 index 000000000000..a5e7f7cb65a1 --- /dev/null +++ b/sound/soc/amd/vangogh/acp5x.h @@ -0,0 +1,21 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * AMD ALSA SoC PCM Driver + * + * Copyright (C) 2021 Advanced Micro Devices, Inc. All rights reserved. + */ + +#include "vg_chip_offset_byte.h" + +#define ACP5x_PHY_BASE_ADDRESS 0x1240000 +#define ACP_DEVICE_ID 0x15E2 + +static inline u32 acp_readl(void __iomem *base_addr) +{ + return readl(base_addr - ACP5x_PHY_BASE_ADDRESS); +} + +static inline void acp_writel(u32 val, void __iomem *base_addr) +{ + writel(val, base_addr - ACP5x_PHY_BASE_ADDRESS); +} diff --git a/sound/soc/amd/vangogh/pci-acp5x.c b/sound/soc/amd/vangogh/pci-acp5x.c new file mode 100644 index 000000000000..e56d060a5cb9 --- /dev/null +++ b/sound/soc/amd/vangogh/pci-acp5x.c @@ -0,0 +1,87 @@ +// SPDX-License-Identifier: GPL-2.0+ +// +// AMD Vangogh ACP PCI Driver +// +// Copyright (C) 2021 Advanced Micro Devices, Inc. All rights reserved. + +#include <linux/pci.h> +#include <linux/module.h> +#include <linux/io.h> + +#include "acp5x.h" + +struct acp5x_dev_data { + void __iomem *acp5x_base; +}; + +static int snd_acp5x_probe(struct pci_dev *pci, + const struct pci_device_id *pci_id) +{ + struct acp5x_dev_data *adata; + int ret; + u32 addr; + + if (pci->revision != 0x50) + return -ENODEV; + + if (pci_enable_device(pci)) { + dev_err(&pci->dev, "pci_enable_device failed\n"); + return -ENODEV; + } + + ret = pci_request_regions(pci, "AMD ACP5x audio"); + if (ret < 0) { + dev_err(&pci->dev, "pci_request_regions failed\n"); + goto disable_pci; + } + + adata = devm_kzalloc(&pci->dev, sizeof(struct acp5x_dev_data), + GFP_KERNEL); + if (!adata) { + ret = -ENOMEM; + goto release_regions; + } + addr = pci_resource_start(pci, 0); + adata->acp5x_base = devm_ioremap(&pci->dev, addr, + pci_resource_len(pci, 0)); + if (!adata->acp5x_base) { + ret = -ENOMEM; + goto release_regions; + } + pci_set_master(pci); + pci_set_drvdata(pci, adata); + +release_regions: + pci_release_regions(pci); +disable_pci: + pci_disable_device(pci); + + return ret; +} + +static void snd_acp5x_remove(struct pci_dev *pci) +{ + pci_release_regions(pci); + pci_disable_device(pci); +} + +static const struct pci_device_id snd_acp5x_ids[] = { + { PCI_DEVICE(PCI_VENDOR_ID_AMD, ACP_DEVICE_ID), + .class = PCI_CLASS_MULTIMEDIA_OTHER << 8, + .class_mask = 0xffffff }, + { 0, }, +}; +MODULE_DEVICE_TABLE(pci, snd_acp5x_ids); + +static struct pci_driver acp5x_driver = { + .name = KBUILD_MODNAME, + .id_table = snd_acp5x_ids, + .probe = snd_acp5x_probe, + .remove = snd_acp5x_remove, +}; + +module_pci_driver(acp5x_driver); + +MODULE_AUTHOR("Vijendar.Mukunda@amd.com"); +MODULE_DESCRIPTION("AMD Vangogh ACP PCI driver"); +MODULE_LICENSE("GPL v2"); -- 2.17.1
next prev parent reply other threads:[~2021-07-07 5:39 UTC|newest] Thread overview: 76+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-07-07 5:56 [PATCH 00/12] Add Vangogh ACP ASoC driver Vijendar Mukunda 2021-07-07 5:56 ` [PATCH 01/12] ASoC: amd: add Vangogh ACP5x IP register header Vijendar Mukunda 2021-07-07 5:56 ` Vijendar Mukunda 2021-07-07 5:56 ` Vijendar Mukunda [this message] 2021-07-07 5:56 ` [PATCH 02/12] ASoC: amd: add Vangogh ACP PCI driver Vijendar Mukunda 2021-07-07 16:17 ` Mark Brown 2021-07-07 16:17 ` Mark Brown 2021-07-08 14:07 ` Mukunda,Vijendar 2021-07-08 14:07 ` Mukunda,Vijendar 2021-07-07 5:56 ` [PATCH 03/12] add acp5x init/de-init functions Vijendar Mukunda 2021-07-07 5:56 ` Vijendar Mukunda 2021-07-07 16:15 ` Pierre-Louis Bossart 2021-07-07 16:15 ` Pierre-Louis Bossart 2021-07-08 13:30 ` Mukunda,Vijendar 2021-07-08 13:30 ` Mukunda,Vijendar 2021-07-07 5:56 ` [PATCH 04/12] ASoC: amd: create acp5x platform devices Vijendar Mukunda 2021-07-07 5:56 ` Vijendar Mukunda 2021-07-07 16:22 ` Mark Brown 2021-07-07 16:22 ` Mark Brown 2021-07-08 15:02 ` Mukunda,Vijendar 2021-07-08 15:02 ` Mukunda,Vijendar 2021-07-07 5:56 ` [PATCH 05/12] ASoC: amd: add ACP5x PCM platform driver Vijendar Mukunda 2021-07-07 5:56 ` Vijendar Mukunda 2021-07-07 16:17 ` Pierre-Louis Bossart 2021-07-07 16:17 ` Pierre-Louis Bossart 2021-07-08 13:31 ` Mukunda,Vijendar 2021-07-08 13:31 ` Mukunda,Vijendar 2021-07-07 16:24 ` Mark Brown 2021-07-07 16:24 ` Mark Brown 2021-07-08 11:57 ` Mukunda,Vijendar 2021-07-08 11:57 ` Mukunda,Vijendar 2021-07-07 5:56 ` [PATCH 06/12] ASoC: amd: irq handler changes for ACP5x PCM dma driver Vijendar Mukunda 2021-07-07 5:56 ` Vijendar Mukunda 2021-07-07 16:20 ` Pierre-Louis Bossart 2021-07-07 16:20 ` Pierre-Louis Bossart 2021-07-08 13:32 ` Mukunda,Vijendar 2021-07-08 13:32 ` Mukunda,Vijendar 2021-07-07 5:56 ` [PATCH 07/12] ASoC: amd: add ACP5x pcm dma driver ops Vijendar Mukunda 2021-07-07 5:56 ` Vijendar Mukunda 2021-07-07 16:27 ` Pierre-Louis Bossart 2021-07-07 16:27 ` Pierre-Louis Bossart 2021-07-08 11:56 ` Mukunda,Vijendar 2021-07-08 11:56 ` Mukunda,Vijendar 2021-07-07 16:30 ` Mark Brown 2021-07-07 16:30 ` Mark Brown 2021-07-08 11:43 ` Mukunda,Vijendar 2021-07-08 11:43 ` Mukunda,Vijendar 2021-07-07 5:56 ` [PATCH 08/12] ASoC: amd: add vangogh i2s controller driver Vijendar Mukunda 2021-07-07 5:56 ` Vijendar Mukunda 2021-07-07 5:56 ` [PATCH 09/12] ASoC: amd: add vangogh i2s dai driver ops Vijendar Mukunda 2021-07-07 5:56 ` Vijendar Mukunda 2021-07-07 16:35 ` Mark Brown 2021-07-07 16:35 ` Mark Brown 2021-07-08 11:30 ` Mukunda,Vijendar 2021-07-08 11:30 ` Mukunda,Vijendar 2021-07-07 5:56 ` [PATCH 10/12] ASoC: amd: add vangogh pci driver pm ops Vijendar Mukunda 2021-07-07 5:56 ` Vijendar Mukunda 2021-07-07 16:34 ` Pierre-Louis Bossart 2021-07-07 16:34 ` Pierre-Louis Bossart 2021-07-08 11:41 ` Mukunda,Vijendar 2021-07-08 11:41 ` Mukunda,Vijendar 2021-07-13 6:36 ` Mukunda,Vijendar 2021-07-13 6:36 ` Mukunda,Vijendar 2021-07-14 16:23 ` Mark Brown 2021-07-15 23:49 ` Mukunda,Vijendar 2021-07-07 5:56 ` [PATCH 11/12] ASoc: amd: add vangogh i2s dma " Vijendar Mukunda 2021-07-07 5:56 ` Vijendar Mukunda 2021-07-07 5:56 ` [PATCH 12/12] ASoC: amd: enable vangogh acp5x driver build Vijendar Mukunda 2021-07-07 5:56 ` Vijendar Mukunda 2021-07-07 9:00 ` kernel test robot 2021-07-07 9:00 ` kernel test robot 2021-07-07 9:00 ` kernel test robot 2021-07-08 14:08 ` Mukunda,Vijendar 2021-07-08 14:08 ` Mukunda, Vijendar 2021-07-08 14:08 ` Mukunda,Vijendar 2021-07-07 16:55 ` [PATCH 00/12] Add Vangogh ACP ASoC driver Mark Brown
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=20210707055623.27371-3-vijendar.mukunda@amd.com \ --to=vijendar.mukunda@amd.com \ --cc=Alexander.Deucher@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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.