sound/soc/amd/rpl/Makefile | 5 - sound/soc/amd/rpl/rpl-pci-acp6x.c | 227 ------------------ sound/soc/amd/rpl/rpl_acp6x.h | 36 --- .../soc/amd/rpl/rpl_acp6x_chip_offset_byte.h | 30 --- sound/soc/amd/yc/acp6x-mach.c | 7 + sound/soc/amd/yc/pci-acp6x.c | 6 + 6 files changed, 13 insertions(+), 298 deletions(-) delete mode 100644 sound/soc/amd/rpl/Makefile delete mode 100644 sound/soc/amd/rpl/rpl-pci-acp6x.c delete mode 100644 sound/soc/amd/rpl/rpl_acp6x.h delete mode 100644 sound/soc/amd/rpl/rpl_acp6x_chip_offset_byte.h
Add DMIC support for the AMD RPL platform. The drivers are derived on
the YC platform driver.
Signed-off-by: Mingyou Chen <qby140326@gmail.com>
---
v2:
- Reverse ACP CONFIG PIN from 10 to 14 for rpl
- Remove the rpl folder
sound/soc/amd/rpl/Makefile | 5 -
sound/soc/amd/rpl/rpl-pci-acp6x.c | 227 ------------------
sound/soc/amd/rpl/rpl_acp6x.h | 36 ---
.../soc/amd/rpl/rpl_acp6x_chip_offset_byte.h | 30 ---
sound/soc/amd/yc/acp6x-mach.c | 7 +
sound/soc/amd/yc/pci-acp6x.c | 6 +
6 files changed, 13 insertions(+), 298 deletions(-)
delete mode 100644 sound/soc/amd/rpl/Makefile
delete mode 100644 sound/soc/amd/rpl/rpl-pci-acp6x.c
delete mode 100644 sound/soc/amd/rpl/rpl_acp6x.h
delete mode 100644 sound/soc/amd/rpl/rpl_acp6x_chip_offset_byte.h
diff --git a/sound/soc/amd/rpl/Makefile b/sound/soc/amd/rpl/Makefile
deleted file mode 100644
index a3825c5be4e7..000000000000
--- a/sound/soc/amd/rpl/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-# RPL platform Support
-snd-rpl-pci-acp6x-y := rpl-pci-acp6x.o
-
-obj-$(CONFIG_SND_SOC_AMD_RPL_ACP6x) += snd-rpl-pci-acp6x.o
diff --git a/sound/soc/amd/rpl/rpl-pci-acp6x.c b/sound/soc/amd/rpl/rpl-pci-acp6x.c
deleted file mode 100644
index e3afe9172bdf..000000000000
--- a/sound/soc/amd/rpl/rpl-pci-acp6x.c
+++ /dev/null
@@ -1,227 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * AMD RPL ACP PCI Driver
- *
- * Copyright 2022 Advanced Micro Devices, Inc.
- */
-
-#include <linux/pci.h>
-#include <linux/module.h>
-#include <linux/io.h>
-#include <linux/delay.h>
-#include <linux/platform_device.h>
-#include <linux/pm_runtime.h>
-
-#include "rpl_acp6x.h"
-
-struct rpl_dev_data {
- void __iomem *acp6x_base;
-};
-
-static int rpl_power_on(void __iomem *acp_base)
-{
- u32 val;
- int timeout;
-
- val = rpl_acp_readl(acp_base + ACP_PGFSM_STATUS);
-
- if (!val)
- return val;
-
- if ((val & ACP_PGFSM_STATUS_MASK) != ACP_POWER_ON_IN_PROGRESS)
- rpl_acp_writel(ACP_PGFSM_CNTL_POWER_ON_MASK, acp_base + ACP_PGFSM_CONTROL);
- timeout = 0;
- while (++timeout < 500) {
- val = rpl_acp_readl(acp_base + ACP_PGFSM_STATUS);
- if (!val)
- return 0;
- udelay(1);
- }
- return -ETIMEDOUT;
-}
-
-static int rpl_reset(void __iomem *acp_base)
-{
- u32 val;
- int timeout;
-
- rpl_acp_writel(1, acp_base + ACP_SOFT_RESET);
- timeout = 0;
- while (++timeout < 500) {
- val = rpl_acp_readl(acp_base + ACP_SOFT_RESET);
- if (val & ACP_SOFT_RESET_SOFTRESET_AUDDONE_MASK)
- break;
- cpu_relax();
- }
- rpl_acp_writel(0, acp_base + ACP_SOFT_RESET);
- timeout = 0;
- while (++timeout < 500) {
- val = rpl_acp_readl(acp_base + ACP_SOFT_RESET);
- if (!val)
- return 0;
- cpu_relax();
- }
- return -ETIMEDOUT;
-}
-
-static int rpl_init(void __iomem *acp_base)
-{
- int ret;
-
- /* power on */
- ret = rpl_power_on(acp_base);
- if (ret) {
- pr_err("ACP power on failed\n");
- return ret;
- }
- rpl_acp_writel(0x01, acp_base + ACP_CONTROL);
- /* Reset */
- ret = rpl_reset(acp_base);
- if (ret) {
- pr_err("ACP reset failed\n");
- return ret;
- }
- rpl_acp_writel(0x03, acp_base + ACP_CLKMUX_SEL);
- return 0;
-}
-
-static int rpl_deinit(void __iomem *acp_base)
-{
- int ret;
-
- /* Reset */
- ret = rpl_reset(acp_base);
- if (ret) {
- pr_err("ACP reset failed\n");
- return ret;
- }
- rpl_acp_writel(0x00, acp_base + ACP_CLKMUX_SEL);
- rpl_acp_writel(0x00, acp_base + ACP_CONTROL);
- return 0;
-}
-
-static int snd_rpl_probe(struct pci_dev *pci,
- const struct pci_device_id *pci_id)
-{
- struct rpl_dev_data *adata;
- u32 addr;
- int ret;
-
- /* RPL device check */
- switch (pci->revision) {
- case 0x62:
- break;
- default:
- dev_dbg(&pci->dev, "acp6x pci device not found\n");
- return -ENODEV;
- }
- if (pci_enable_device(pci)) {
- dev_err(&pci->dev, "pci_enable_device failed\n");
- return -ENODEV;
- }
-
- ret = pci_request_regions(pci, "AMD ACP6x audio");
- if (ret < 0) {
- dev_err(&pci->dev, "pci_request_regions failed\n");
- goto disable_pci;
- }
-
- adata = devm_kzalloc(&pci->dev, sizeof(struct rpl_dev_data),
- GFP_KERNEL);
- if (!adata) {
- ret = -ENOMEM;
- goto release_regions;
- }
-
- addr = pci_resource_start(pci, 0);
- adata->acp6x_base = devm_ioremap(&pci->dev, addr,
- pci_resource_len(pci, 0));
- if (!adata->acp6x_base) {
- ret = -ENOMEM;
- goto release_regions;
- }
- pci_set_master(pci);
- pci_set_drvdata(pci, adata);
- ret = rpl_init(adata->acp6x_base);
- if (ret)
- goto release_regions;
- pm_runtime_set_autosuspend_delay(&pci->dev, ACP_SUSPEND_DELAY_MS);
- pm_runtime_use_autosuspend(&pci->dev);
- pm_runtime_put_noidle(&pci->dev);
- pm_runtime_allow(&pci->dev);
-
- return 0;
-release_regions:
- pci_release_regions(pci);
-disable_pci:
- pci_disable_device(pci);
-
- return ret;
-}
-
-static int snd_rpl_suspend(struct device *dev)
-{
- struct rpl_dev_data *adata;
- int ret;
-
- adata = dev_get_drvdata(dev);
- ret = rpl_deinit(adata->acp6x_base);
- if (ret)
- dev_err(dev, "ACP de-init failed\n");
- return ret;
-}
-
-static int snd_rpl_resume(struct device *dev)
-{
- struct rpl_dev_data *adata;
- int ret;
-
- adata = dev_get_drvdata(dev);
- ret = rpl_init(adata->acp6x_base);
- if (ret)
- dev_err(dev, "ACP init failed\n");
- return ret;
-}
-
-static const struct dev_pm_ops rpl_pm = {
- RUNTIME_PM_OPS(snd_rpl_suspend, snd_rpl_resume, NULL)
- SYSTEM_SLEEP_PM_OPS(snd_rpl_suspend, snd_rpl_resume)
-};
-
-static void snd_rpl_remove(struct pci_dev *pci)
-{
- struct rpl_dev_data *adata;
- int ret;
-
- adata = pci_get_drvdata(pci);
- ret = rpl_deinit(adata->acp6x_base);
- if (ret)
- dev_err(&pci->dev, "ACP de-init failed\n");
- pm_runtime_forbid(&pci->dev);
- pm_runtime_get_noresume(&pci->dev);
- pci_release_regions(pci);
- pci_disable_device(pci);
-}
-
-static const struct pci_device_id snd_rpl_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_rpl_ids);
-
-static struct pci_driver rpl_acp6x_driver = {
- .name = KBUILD_MODNAME,
- .id_table = snd_rpl_ids,
- .probe = snd_rpl_probe,
- .remove = snd_rpl_remove,
- .driver = {
- .pm = pm_ptr(&rpl_pm),
- }
-};
-
-module_pci_driver(rpl_acp6x_driver);
-
-MODULE_DESCRIPTION("AMD ACP RPL PCI driver");
-MODULE_LICENSE("GPL v2");
diff --git a/sound/soc/amd/rpl/rpl_acp6x.h b/sound/soc/amd/rpl/rpl_acp6x.h
deleted file mode 100644
index f5816a33632e..000000000000
--- a/sound/soc/amd/rpl/rpl_acp6x.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * AMD ACP Driver
- *
- * Copyright (C) 2021 Advanced Micro Devices, Inc. All rights reserved.
- */
-
-#include "rpl_acp6x_chip_offset_byte.h"
-
-#define ACP_DEVICE_ID 0x15E2
-#define ACP6x_PHY_BASE_ADDRESS 0x1240000
-
-#define ACP_SOFT_RESET_SOFTRESET_AUDDONE_MASK 0x00010001
-#define ACP_PGFSM_CNTL_POWER_ON_MASK 1
-#define ACP_PGFSM_CNTL_POWER_OFF_MASK 0
-#define ACP_PGFSM_STATUS_MASK 3
-#define ACP_POWERED_ON 0
-#define ACP_POWER_ON_IN_PROGRESS 1
-#define ACP_POWERED_OFF 2
-#define ACP_POWER_OFF_IN_PROGRESS 3
-
-#define DELAY_US 5
-#define ACP_COUNTER 20000
-
-/* time in ms for runtime suspend delay */
-#define ACP_SUSPEND_DELAY_MS 2000
-
-static inline u32 rpl_acp_readl(void __iomem *base_addr)
-{
- return readl(base_addr - ACP6x_PHY_BASE_ADDRESS);
-}
-
-static inline void rpl_acp_writel(u32 val, void __iomem *base_addr)
-{
- writel(val, base_addr - ACP6x_PHY_BASE_ADDRESS);
-}
diff --git a/sound/soc/amd/rpl/rpl_acp6x_chip_offset_byte.h b/sound/soc/amd/rpl/rpl_acp6x_chip_offset_byte.h
deleted file mode 100644
index 456498f5396d..000000000000
--- a/sound/soc/amd/rpl/rpl_acp6x_chip_offset_byte.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * AMD ACP 6.2 Register Documentation
- *
- * Copyright 2022 Advanced Micro Devices, Inc.
- */
-
-#ifndef _rpl_acp6x_OFFSET_HEADER
-#define _rpl_acp6x_OFFSET_HEADER
-
-/* Registers from ACP_CLKRST block */
-#define ACP_SOFT_RESET 0x1241000
-#define ACP_CONTROL 0x1241004
-#define ACP_STATUS 0x1241008
-#define ACP_DYNAMIC_CG_MASTER_CONTROL 0x1241010
-#define ACP_PGFSM_CONTROL 0x124101C
-#define ACP_PGFSM_STATUS 0x1241020
-#define ACP_CLKMUX_SEL 0x1241024
-
-/* Registers from ACP_AON block */
-#define ACP_PME_EN 0x1241400
-#define ACP_DEVICE_STATE 0x1241404
-#define AZ_DEVICE_STATE 0x1241408
-#define ACP_PIN_CONFIG 0x1241440
-#define ACP_PAD_PULLUP_CTRL 0x1241444
-#define ACP_PAD_PULLDOWN_CTRL 0x1241448
-#define ACP_PAD_DRIVE_STRENGTH_CTRL 0x124144C
-#define ACP_PAD_SCHMEN_CTRL 0x1241450
-
-#endif
diff --git a/sound/soc/amd/yc/acp6x-mach.c b/sound/soc/amd/yc/acp6x-mach.c
index 0294177acc66..de49c812124a 100644
--- a/sound/soc/amd/yc/acp6x-mach.c
+++ b/sound/soc/amd/yc/acp6x-mach.c
@@ -45,6 +45,13 @@ static struct snd_soc_card acp6x_card = {
};
static const struct dmi_system_id yc_acp_quirk_table[] = {
+ {
+ .driver_data = &acp6x_card,
+ .matches = {
+ DMI_MATCH(DMI_BOARD_VENDOR, "Lecoo"),
+ DMI_MATCH(DMI_PRODUCT_NAME, "Bellator N176"),
+ }
+ },
{
.driver_data = &acp6x_card,
.matches = {
diff --git a/sound/soc/amd/yc/pci-acp6x.c b/sound/soc/amd/yc/pci-acp6x.c
index 1140ed1cbb3d..296b74252a8a 100644
--- a/sound/soc/amd/yc/pci-acp6x.c
+++ b/sound/soc/amd/yc/pci-acp6x.c
@@ -163,6 +163,7 @@ static int snd_acp6x_probe(struct pci_dev *pci,
switch (pci->revision) {
case 0x60:
case 0x6f:
+ case 0x62: /* RPL */
break;
default:
dev_dbg(&pci->dev, "acp6x pci device not found\n");
@@ -205,6 +206,11 @@ static int snd_acp6x_probe(struct pci_dev *pci,
case ACP_CONFIG_2:
case ACP_CONFIG_3:
case ACP_CONFIG_9:
+ case ACP_CONFIG_10: /* Reserved for RPL */
+ case ACP_CONFIG_11: /* Reserved for RPL */
+ case ACP_CONFIG_12: /* Reserved for RPL */
+ case ACP_CONFIG_13: /* Reserved for RPL */
+ case ACP_CONFIG_14: /* Reserved for RPL */
case ACP_CONFIG_15:
dev_info(&pci->dev, "Audio Mode %d\n", val);
break;
base-commit: 63804fed149a6750ffd28610c5c1c98cce6bd377
--
2.51.2Hi Mingyou, kernel test robot noticed the following build errors: [auto build test ERROR on 63804fed149a6750ffd28610c5c1c98cce6bd377] url: https://github.com/intel-lab-lkp/linux/commits/Mingyou-Chen/ASoC-amd-add-DMIC-support-for-RPL-platform/20260211-195242 base: 63804fed149a6750ffd28610c5c1c98cce6bd377 patch link: https://lore.kernel.org/r/20260211115008.100239-1-qby140326%40gmail.com patch subject: [PATCH v2] ASoC: amd: add DMIC support for RPL platform config: x86_64-buildonly-randconfig-002-20260211 (https://download.01.org/0day-ci/archive/20260212/202602120639.za1Vo64M-lkp@intel.com/config) compiler: gcc-14 (Debian 14.2.0-19) 14.2.0 reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20260212/202602120639.za1Vo64M-lkp@intel.com/reproduce) If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags | Reported-by: kernel test robot <lkp@intel.com> | Closes: https://lore.kernel.org/oe-kbuild-all/202602120639.za1Vo64M-lkp@intel.com/ All errors (new ones prefixed by >>): >> scripts/Makefile.build:37: sound/soc/amd/rpl/Makefile: No such file or directory make[7]: *** No rule to make target 'sound/soc/amd/rpl/Makefile'. scripts/Makefile.build:37: Failed to remake makefile 'sound/soc/amd/rpl/Makefile'. vim +37 scripts/Makefile.build ^1da177e4c3f41 Linus Torvalds 2005-04-16 34 3204a7fb98a3bc Masahiro Yamada 2021-02-28 35 include $(srctree)/scripts/Kbuild.include 57fd251c789647 Masahiro Yamada 2021-02-28 36 include $(srctree)/scripts/Makefile.compiler a2430b25c31840 Masahiro Yamada 2022-11-19 @37 include $(kbuild-file) 3204a7fb98a3bc Masahiro Yamada 2021-02-28 38 include $(srctree)/scripts/Makefile.lib ^1da177e4c3f41 Linus Torvalds 2005-04-16 39 -- 0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki
Hi Mingyou, kernel test robot noticed the following build errors: [auto build test ERROR on 63804fed149a6750ffd28610c5c1c98cce6bd377] url: https://github.com/intel-lab-lkp/linux/commits/Mingyou-Chen/ASoC-amd-add-DMIC-support-for-RPL-platform/20260211-195242 base: 63804fed149a6750ffd28610c5c1c98cce6bd377 patch link: https://lore.kernel.org/r/20260211115008.100239-1-qby140326%40gmail.com patch subject: [PATCH v2] ASoC: amd: add DMIC support for RPL platform config: sh-allnoconfig (https://download.01.org/0day-ci/archive/20260212/202602120150.0yxjhYKZ-lkp@intel.com/config) compiler: sh4-linux-gcc (GCC) 15.2.0 reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20260212/202602120150.0yxjhYKZ-lkp@intel.com/reproduce) If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags | Reported-by: kernel test robot <lkp@intel.com> | Closes: https://lore.kernel.org/oe-kbuild-all/202602120150.0yxjhYKZ-lkp@intel.com/ All errors (new ones prefixed by >>): >> scripts/Makefile.clean:12: sound/soc/amd/rpl/Makefile: No such file or directory >> make[7]: *** No rule to make target 'sound/soc/amd/rpl/Makefile'. scripts/Makefile.clean:12: Failed to remake makefile 'sound/soc/amd/rpl/Makefile'. make[6]: *** [scripts/Makefile.clean:61: sound/soc/amd/rpl] Error 2 make[6]: Target '__clean' not remade because of errors. make[5]: *** [scripts/Makefile.clean:61: sound/soc/amd] Error 2 make[5]: Target '__clean' not remade because of errors. make[4]: *** [scripts/Makefile.clean:61: sound/soc] Error 2 make[4]: Target '__clean' not remade because of errors. make[3]: *** [scripts/Makefile.clean:61: sound] Error 2 make[3]: Target '__clean' not remade because of errors. make[2]: *** [Makefile:2059: _clean_.] Error 2 make[2]: Target 'distclean' not remade because of errors. make[1]: *** [Makefile:248: __sub-make] Error 2 make[1]: Target 'distclean' not remade because of errors. make: *** [Makefile:248: __sub-make] Error 2 make: Target 'distclean' not remade because of errors. vim +12 scripts/Makefile.clean ^1da177e4c3f41 Linus Torvalds 2005-04-16 7 4f1933620f5714 Paul Smith 2006-03-05 8 PHONY := __clean ^1da177e4c3f41 Linus Torvalds 2005-04-16 9 __clean: ^1da177e4c3f41 Linus Torvalds 2005-04-16 10 3204a7fb98a3bc Masahiro Yamada 2021-02-28 11 include $(srctree)/scripts/Kbuild.include a2430b25c31840 Masahiro Yamada 2022-11-19 @12 include $(kbuild-file) ^1da177e4c3f41 Linus Torvalds 2005-04-16 13 -- 0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki
On 2/11/26 5:50 AM, Mingyou Chen wrote:
> Add DMIC support for the AMD RPL platform. The drivers are derived on
> the YC platform driver.
>
> Signed-off-by: Mingyou Chen <qby140326@gmail.com>
> ---
> v2:
> - Reverse ACP CONFIG PIN from 10 to 14 for rpl
> - Remove the rpl folder
>
> sound/soc/amd/rpl/Makefile | 5 -
> sound/soc/amd/rpl/rpl-pci-acp6x.c | 227 ------------------
> sound/soc/amd/rpl/rpl_acp6x.h | 36 ---
> .../soc/amd/rpl/rpl_acp6x_chip_offset_byte.h | 30 ---
> sound/soc/amd/yc/acp6x-mach.c | 7 +
> sound/soc/amd/yc/pci-acp6x.c | 6 +
> 6 files changed, 13 insertions(+), 298 deletions(-)
> delete mode 100644 sound/soc/amd/rpl/Makefile
> delete mode 100644 sound/soc/amd/rpl/rpl-pci-acp6x.c
> delete mode 100644 sound/soc/amd/rpl/rpl_acp6x.h
> delete mode 100644 sound/soc/amd/rpl/rpl_acp6x_chip_offset_byte.h
Your diff should be relative to sound.git, not relative to your last patch.
That means you shouldn't be "deleting the rpl directory" because it
isn't there in upstream.
On your local tree you can probably just rebase to drop it or revert it.
>
> diff --git a/sound/soc/amd/rpl/Makefile b/sound/soc/amd/rpl/Makefile
> deleted file mode 100644
> index a3825c5be4e7..000000000000
> --- a/sound/soc/amd/rpl/Makefile
> +++ /dev/null
> @@ -1,5 +0,0 @@
> -# SPDX-License-Identifier: GPL-2.0+
> -# RPL platform Support
> -snd-rpl-pci-acp6x-y := rpl-pci-acp6x.o
> -
> -obj-$(CONFIG_SND_SOC_AMD_RPL_ACP6x) += snd-rpl-pci-acp6x.o
> diff --git a/sound/soc/amd/rpl/rpl-pci-acp6x.c b/sound/soc/amd/rpl/rpl-pci-acp6x.c
> deleted file mode 100644
> index e3afe9172bdf..000000000000
> --- a/sound/soc/amd/rpl/rpl-pci-acp6x.c
> +++ /dev/null
> @@ -1,227 +0,0 @@
> -// SPDX-License-Identifier: GPL-2.0+
> -/*
> - * AMD RPL ACP PCI Driver
> - *
> - * Copyright 2022 Advanced Micro Devices, Inc.
> - */
> -
> -#include <linux/pci.h>
> -#include <linux/module.h>
> -#include <linux/io.h>
> -#include <linux/delay.h>
> -#include <linux/platform_device.h>
> -#include <linux/pm_runtime.h>
> -
> -#include "rpl_acp6x.h"
> -
> -struct rpl_dev_data {
> - void __iomem *acp6x_base;
> -};
> -
> -static int rpl_power_on(void __iomem *acp_base)
> -{
> - u32 val;
> - int timeout;
> -
> - val = rpl_acp_readl(acp_base + ACP_PGFSM_STATUS);
> -
> - if (!val)
> - return val;
> -
> - if ((val & ACP_PGFSM_STATUS_MASK) != ACP_POWER_ON_IN_PROGRESS)
> - rpl_acp_writel(ACP_PGFSM_CNTL_POWER_ON_MASK, acp_base + ACP_PGFSM_CONTROL);
> - timeout = 0;
> - while (++timeout < 500) {
> - val = rpl_acp_readl(acp_base + ACP_PGFSM_STATUS);
> - if (!val)
> - return 0;
> - udelay(1);
> - }
> - return -ETIMEDOUT;
> -}
> -
> -static int rpl_reset(void __iomem *acp_base)
> -{
> - u32 val;
> - int timeout;
> -
> - rpl_acp_writel(1, acp_base + ACP_SOFT_RESET);
> - timeout = 0;
> - while (++timeout < 500) {
> - val = rpl_acp_readl(acp_base + ACP_SOFT_RESET);
> - if (val & ACP_SOFT_RESET_SOFTRESET_AUDDONE_MASK)
> - break;
> - cpu_relax();
> - }
> - rpl_acp_writel(0, acp_base + ACP_SOFT_RESET);
> - timeout = 0;
> - while (++timeout < 500) {
> - val = rpl_acp_readl(acp_base + ACP_SOFT_RESET);
> - if (!val)
> - return 0;
> - cpu_relax();
> - }
> - return -ETIMEDOUT;
> -}
> -
> -static int rpl_init(void __iomem *acp_base)
> -{
> - int ret;
> -
> - /* power on */
> - ret = rpl_power_on(acp_base);
> - if (ret) {
> - pr_err("ACP power on failed\n");
> - return ret;
> - }
> - rpl_acp_writel(0x01, acp_base + ACP_CONTROL);
> - /* Reset */
> - ret = rpl_reset(acp_base);
> - if (ret) {
> - pr_err("ACP reset failed\n");
> - return ret;
> - }
> - rpl_acp_writel(0x03, acp_base + ACP_CLKMUX_SEL);
> - return 0;
> -}
> -
> -static int rpl_deinit(void __iomem *acp_base)
> -{
> - int ret;
> -
> - /* Reset */
> - ret = rpl_reset(acp_base);
> - if (ret) {
> - pr_err("ACP reset failed\n");
> - return ret;
> - }
> - rpl_acp_writel(0x00, acp_base + ACP_CLKMUX_SEL);
> - rpl_acp_writel(0x00, acp_base + ACP_CONTROL);
> - return 0;
> -}
> -
> -static int snd_rpl_probe(struct pci_dev *pci,
> - const struct pci_device_id *pci_id)
> -{
> - struct rpl_dev_data *adata;
> - u32 addr;
> - int ret;
> -
> - /* RPL device check */
> - switch (pci->revision) {
> - case 0x62:
> - break;
> - default:
> - dev_dbg(&pci->dev, "acp6x pci device not found\n");
> - return -ENODEV;
> - }
> - if (pci_enable_device(pci)) {
> - dev_err(&pci->dev, "pci_enable_device failed\n");
> - return -ENODEV;
> - }
> -
> - ret = pci_request_regions(pci, "AMD ACP6x audio");
> - if (ret < 0) {
> - dev_err(&pci->dev, "pci_request_regions failed\n");
> - goto disable_pci;
> - }
> -
> - adata = devm_kzalloc(&pci->dev, sizeof(struct rpl_dev_data),
> - GFP_KERNEL);
> - if (!adata) {
> - ret = -ENOMEM;
> - goto release_regions;
> - }
> -
> - addr = pci_resource_start(pci, 0);
> - adata->acp6x_base = devm_ioremap(&pci->dev, addr,
> - pci_resource_len(pci, 0));
> - if (!adata->acp6x_base) {
> - ret = -ENOMEM;
> - goto release_regions;
> - }
> - pci_set_master(pci);
> - pci_set_drvdata(pci, adata);
> - ret = rpl_init(adata->acp6x_base);
> - if (ret)
> - goto release_regions;
> - pm_runtime_set_autosuspend_delay(&pci->dev, ACP_SUSPEND_DELAY_MS);
> - pm_runtime_use_autosuspend(&pci->dev);
> - pm_runtime_put_noidle(&pci->dev);
> - pm_runtime_allow(&pci->dev);
> -
> - return 0;
> -release_regions:
> - pci_release_regions(pci);
> -disable_pci:
> - pci_disable_device(pci);
> -
> - return ret;
> -}
> -
> -static int snd_rpl_suspend(struct device *dev)
> -{
> - struct rpl_dev_data *adata;
> - int ret;
> -
> - adata = dev_get_drvdata(dev);
> - ret = rpl_deinit(adata->acp6x_base);
> - if (ret)
> - dev_err(dev, "ACP de-init failed\n");
> - return ret;
> -}
> -
> -static int snd_rpl_resume(struct device *dev)
> -{
> - struct rpl_dev_data *adata;
> - int ret;
> -
> - adata = dev_get_drvdata(dev);
> - ret = rpl_init(adata->acp6x_base);
> - if (ret)
> - dev_err(dev, "ACP init failed\n");
> - return ret;
> -}
> -
> -static const struct dev_pm_ops rpl_pm = {
> - RUNTIME_PM_OPS(snd_rpl_suspend, snd_rpl_resume, NULL)
> - SYSTEM_SLEEP_PM_OPS(snd_rpl_suspend, snd_rpl_resume)
> -};
> -
> -static void snd_rpl_remove(struct pci_dev *pci)
> -{
> - struct rpl_dev_data *adata;
> - int ret;
> -
> - adata = pci_get_drvdata(pci);
> - ret = rpl_deinit(adata->acp6x_base);
> - if (ret)
> - dev_err(&pci->dev, "ACP de-init failed\n");
> - pm_runtime_forbid(&pci->dev);
> - pm_runtime_get_noresume(&pci->dev);
> - pci_release_regions(pci);
> - pci_disable_device(pci);
> -}
> -
> -static const struct pci_device_id snd_rpl_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_rpl_ids);
> -
> -static struct pci_driver rpl_acp6x_driver = {
> - .name = KBUILD_MODNAME,
> - .id_table = snd_rpl_ids,
> - .probe = snd_rpl_probe,
> - .remove = snd_rpl_remove,
> - .driver = {
> - .pm = pm_ptr(&rpl_pm),
> - }
> -};
> -
> -module_pci_driver(rpl_acp6x_driver);
> -
> -MODULE_DESCRIPTION("AMD ACP RPL PCI driver");
> -MODULE_LICENSE("GPL v2");
> diff --git a/sound/soc/amd/rpl/rpl_acp6x.h b/sound/soc/amd/rpl/rpl_acp6x.h
> deleted file mode 100644
> index f5816a33632e..000000000000
> --- a/sound/soc/amd/rpl/rpl_acp6x.h
> +++ /dev/null
> @@ -1,36 +0,0 @@
> -/* SPDX-License-Identifier: GPL-2.0+ */
> -/*
> - * AMD ACP Driver
> - *
> - * Copyright (C) 2021 Advanced Micro Devices, Inc. All rights reserved.
> - */
> -
> -#include "rpl_acp6x_chip_offset_byte.h"
> -
> -#define ACP_DEVICE_ID 0x15E2
> -#define ACP6x_PHY_BASE_ADDRESS 0x1240000
> -
> -#define ACP_SOFT_RESET_SOFTRESET_AUDDONE_MASK 0x00010001
> -#define ACP_PGFSM_CNTL_POWER_ON_MASK 1
> -#define ACP_PGFSM_CNTL_POWER_OFF_MASK 0
> -#define ACP_PGFSM_STATUS_MASK 3
> -#define ACP_POWERED_ON 0
> -#define ACP_POWER_ON_IN_PROGRESS 1
> -#define ACP_POWERED_OFF 2
> -#define ACP_POWER_OFF_IN_PROGRESS 3
> -
> -#define DELAY_US 5
> -#define ACP_COUNTER 20000
> -
> -/* time in ms for runtime suspend delay */
> -#define ACP_SUSPEND_DELAY_MS 2000
> -
> -static inline u32 rpl_acp_readl(void __iomem *base_addr)
> -{
> - return readl(base_addr - ACP6x_PHY_BASE_ADDRESS);
> -}
> -
> -static inline void rpl_acp_writel(u32 val, void __iomem *base_addr)
> -{
> - writel(val, base_addr - ACP6x_PHY_BASE_ADDRESS);
> -}
> diff --git a/sound/soc/amd/rpl/rpl_acp6x_chip_offset_byte.h b/sound/soc/amd/rpl/rpl_acp6x_chip_offset_byte.h
> deleted file mode 100644
> index 456498f5396d..000000000000
> --- a/sound/soc/amd/rpl/rpl_acp6x_chip_offset_byte.h
> +++ /dev/null
> @@ -1,30 +0,0 @@
> -/* SPDX-License-Identifier: GPL-2.0+ */
> -/*
> - * AMD ACP 6.2 Register Documentation
> - *
> - * Copyright 2022 Advanced Micro Devices, Inc.
> - */
> -
> -#ifndef _rpl_acp6x_OFFSET_HEADER
> -#define _rpl_acp6x_OFFSET_HEADER
> -
> -/* Registers from ACP_CLKRST block */
> -#define ACP_SOFT_RESET 0x1241000
> -#define ACP_CONTROL 0x1241004
> -#define ACP_STATUS 0x1241008
> -#define ACP_DYNAMIC_CG_MASTER_CONTROL 0x1241010
> -#define ACP_PGFSM_CONTROL 0x124101C
> -#define ACP_PGFSM_STATUS 0x1241020
> -#define ACP_CLKMUX_SEL 0x1241024
> -
> -/* Registers from ACP_AON block */
> -#define ACP_PME_EN 0x1241400
> -#define ACP_DEVICE_STATE 0x1241404
> -#define AZ_DEVICE_STATE 0x1241408
> -#define ACP_PIN_CONFIG 0x1241440
> -#define ACP_PAD_PULLUP_CTRL 0x1241444
> -#define ACP_PAD_PULLDOWN_CTRL 0x1241448
> -#define ACP_PAD_DRIVE_STRENGTH_CTRL 0x124144C
> -#define ACP_PAD_SCHMEN_CTRL 0x1241450
> -
> -#endif
> diff --git a/sound/soc/amd/yc/acp6x-mach.c b/sound/soc/amd/yc/acp6x-mach.c
> index 0294177acc66..de49c812124a 100644
> --- a/sound/soc/amd/yc/acp6x-mach.c
> +++ b/sound/soc/amd/yc/acp6x-mach.c
> @@ -45,6 +45,13 @@ static struct snd_soc_card acp6x_card = {
> };
>
> static const struct dmi_system_id yc_acp_quirk_table[] = {
> + {
> + .driver_data = &acp6x_card,
> + .matches = {
> + DMI_MATCH(DMI_BOARD_VENDOR, "Lecoo"),
> + DMI_MATCH(DMI_PRODUCT_NAME, "Bellator N176"),
> + }
> + },
> {
> .driver_data = &acp6x_card,
> .matches = {
> diff --git a/sound/soc/amd/yc/pci-acp6x.c b/sound/soc/amd/yc/pci-acp6x.c
> index 1140ed1cbb3d..296b74252a8a 100644
> --- a/sound/soc/amd/yc/pci-acp6x.c
> +++ b/sound/soc/amd/yc/pci-acp6x.c
> @@ -163,6 +163,7 @@ static int snd_acp6x_probe(struct pci_dev *pci,
> switch (pci->revision) {
> case 0x60:
> case 0x6f:
> + case 0x62: /* RPL */
> break;
> default:
> dev_dbg(&pci->dev, "acp6x pci device not found\n");
> @@ -205,6 +206,11 @@ static int snd_acp6x_probe(struct pci_dev *pci,
> case ACP_CONFIG_2:
> case ACP_CONFIG_3:
> case ACP_CONFIG_9:
> + case ACP_CONFIG_10: /* Reserved for RPL */
> + case ACP_CONFIG_11: /* Reserved for RPL */
> + case ACP_CONFIG_12: /* Reserved for RPL */
> + case ACP_CONFIG_13: /* Reserved for RPL */
> + case ACP_CONFIG_14: /* Reserved for RPL */
> case ACP_CONFIG_15:
> dev_info(&pci->dev, "Audio Mode %d\n", val);
> break;
>
> base-commit: 63804fed149a6750ffd28610c5c1c98cce6bd377
On 2/11/26 23:21, Mario Limonciello wrote: > Your diff should be relative to sound.git, not relative to your last > patch. > > That means you shouldn't be "deleting the rpl directory" because it > isn't there in upstream. > > On your local tree you can probably just rebase to drop it or revert it. Hi Mario, Regarding the sound/soc/amd/rpl directory, I believe it actually exists in the current upstream sound.git (and mainline). You can find it here: sound/soc/amd/rpl/ The goal of this patch is to follow the suggestion from Vijendar Mukunda to consolidate the RPL support into the yc driver, as they share very similar logic. By doing this, we can completely remove the redundant rpl folder to simplify the codebase. PS: I noticed the Makefile and Kconfig problem, I'll create the v3 patch shortly to ensure everything builds correctly.
Add DMIC support for the AMD RPL platform. The drivers are derived on
the YC platform driver.
Signed-off-by: Mingyou Chen <qby140326@gmail.com>
---
v2:
- Reverse ACP CONFIG PIN from 10 to 14 for rpl
- Remove the rpl folder
v3:
- Remove rpl configuration from Kconfig and Makefile
sound/soc/amd/Kconfig | 10 -
sound/soc/amd/Makefile | 1 -
sound/soc/amd/rpl/Makefile | 5 -
sound/soc/amd/rpl/rpl-pci-acp6x.c | 227 ------------------
sound/soc/amd/rpl/rpl_acp6x.h | 36 ---
.../soc/amd/rpl/rpl_acp6x_chip_offset_byte.h | 30 ---
sound/soc/amd/yc/acp6x-mach.c | 7 +
sound/soc/amd/yc/pci-acp6x.c | 6 +
8 files changed, 13 insertions(+), 309 deletions(-)
delete mode 100644 sound/soc/amd/rpl/Makefile
delete mode 100644 sound/soc/amd/rpl/rpl-pci-acp6x.c
delete mode 100644 sound/soc/amd/rpl/rpl_acp6x.h
delete mode 100644 sound/soc/amd/rpl/rpl_acp6x_chip_offset_byte.h
diff --git a/sound/soc/amd/Kconfig b/sound/soc/amd/Kconfig
index fd35a03aadcb..a6eecbe12e84 100644
--- a/sound/soc/amd/Kconfig
+++ b/sound/soc/amd/Kconfig
@@ -124,16 +124,6 @@ config SND_AMD_ACP_CONFIG
source "sound/soc/amd/acp/Kconfig"
-config SND_SOC_AMD_RPL_ACP6x
- tristate "AMD Audio Coprocessor-v6.2 RPL support"
- depends on X86 && PCI
- help
- This option enables Audio Coprocessor i.e. ACP v6.2 support on
- AMD RPL platform. By enabling this flag build will be
- triggered for ACP PCI driver.
- Say m if you have such a device.
- If unsure select "N".
-
config SND_SOC_AMD_ACP63_TOPLEVEL
tristate "support for AMD platforms with ACP version >= 6.3"
default SND_AMD_ACP_CONFIG
diff --git a/sound/soc/amd/Makefile b/sound/soc/amd/Makefile
index 4f89d962cce2..23b25ff0d800 100644
--- a/sound/soc/amd/Makefile
+++ b/sound/soc/amd/Makefile
@@ -17,5 +17,4 @@ obj-$(CONFIG_SND_SOC_AMD_ACP5x) += vangogh/
obj-$(CONFIG_SND_SOC_AMD_ACP6x) += yc/
obj-$(CONFIG_SND_AMD_ACP_CONFIG) += acp/
obj-$(CONFIG_SND_AMD_ACP_CONFIG) += snd-acp-config.o
-obj-$(CONFIG_SND_SOC_AMD_RPL_ACP6x) += rpl/
obj-$(CONFIG_SND_SOC_AMD_PS) += ps/
diff --git a/sound/soc/amd/rpl/Makefile b/sound/soc/amd/rpl/Makefile
deleted file mode 100644
index a3825c5be4e7..000000000000
--- a/sound/soc/amd/rpl/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-# RPL platform Support
-snd-rpl-pci-acp6x-y := rpl-pci-acp6x.o
-
-obj-$(CONFIG_SND_SOC_AMD_RPL_ACP6x) += snd-rpl-pci-acp6x.o
diff --git a/sound/soc/amd/rpl/rpl-pci-acp6x.c b/sound/soc/amd/rpl/rpl-pci-acp6x.c
deleted file mode 100644
index e3afe9172bdf..000000000000
--- a/sound/soc/amd/rpl/rpl-pci-acp6x.c
+++ /dev/null
@@ -1,227 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * AMD RPL ACP PCI Driver
- *
- * Copyright 2022 Advanced Micro Devices, Inc.
- */
-
-#include <linux/pci.h>
-#include <linux/module.h>
-#include <linux/io.h>
-#include <linux/delay.h>
-#include <linux/platform_device.h>
-#include <linux/pm_runtime.h>
-
-#include "rpl_acp6x.h"
-
-struct rpl_dev_data {
- void __iomem *acp6x_base;
-};
-
-static int rpl_power_on(void __iomem *acp_base)
-{
- u32 val;
- int timeout;
-
- val = rpl_acp_readl(acp_base + ACP_PGFSM_STATUS);
-
- if (!val)
- return val;
-
- if ((val & ACP_PGFSM_STATUS_MASK) != ACP_POWER_ON_IN_PROGRESS)
- rpl_acp_writel(ACP_PGFSM_CNTL_POWER_ON_MASK, acp_base + ACP_PGFSM_CONTROL);
- timeout = 0;
- while (++timeout < 500) {
- val = rpl_acp_readl(acp_base + ACP_PGFSM_STATUS);
- if (!val)
- return 0;
- udelay(1);
- }
- return -ETIMEDOUT;
-}
-
-static int rpl_reset(void __iomem *acp_base)
-{
- u32 val;
- int timeout;
-
- rpl_acp_writel(1, acp_base + ACP_SOFT_RESET);
- timeout = 0;
- while (++timeout < 500) {
- val = rpl_acp_readl(acp_base + ACP_SOFT_RESET);
- if (val & ACP_SOFT_RESET_SOFTRESET_AUDDONE_MASK)
- break;
- cpu_relax();
- }
- rpl_acp_writel(0, acp_base + ACP_SOFT_RESET);
- timeout = 0;
- while (++timeout < 500) {
- val = rpl_acp_readl(acp_base + ACP_SOFT_RESET);
- if (!val)
- return 0;
- cpu_relax();
- }
- return -ETIMEDOUT;
-}
-
-static int rpl_init(void __iomem *acp_base)
-{
- int ret;
-
- /* power on */
- ret = rpl_power_on(acp_base);
- if (ret) {
- pr_err("ACP power on failed\n");
- return ret;
- }
- rpl_acp_writel(0x01, acp_base + ACP_CONTROL);
- /* Reset */
- ret = rpl_reset(acp_base);
- if (ret) {
- pr_err("ACP reset failed\n");
- return ret;
- }
- rpl_acp_writel(0x03, acp_base + ACP_CLKMUX_SEL);
- return 0;
-}
-
-static int rpl_deinit(void __iomem *acp_base)
-{
- int ret;
-
- /* Reset */
- ret = rpl_reset(acp_base);
- if (ret) {
- pr_err("ACP reset failed\n");
- return ret;
- }
- rpl_acp_writel(0x00, acp_base + ACP_CLKMUX_SEL);
- rpl_acp_writel(0x00, acp_base + ACP_CONTROL);
- return 0;
-}
-
-static int snd_rpl_probe(struct pci_dev *pci,
- const struct pci_device_id *pci_id)
-{
- struct rpl_dev_data *adata;
- u32 addr;
- int ret;
-
- /* RPL device check */
- switch (pci->revision) {
- case 0x62:
- break;
- default:
- dev_dbg(&pci->dev, "acp6x pci device not found\n");
- return -ENODEV;
- }
- if (pci_enable_device(pci)) {
- dev_err(&pci->dev, "pci_enable_device failed\n");
- return -ENODEV;
- }
-
- ret = pci_request_regions(pci, "AMD ACP6x audio");
- if (ret < 0) {
- dev_err(&pci->dev, "pci_request_regions failed\n");
- goto disable_pci;
- }
-
- adata = devm_kzalloc(&pci->dev, sizeof(struct rpl_dev_data),
- GFP_KERNEL);
- if (!adata) {
- ret = -ENOMEM;
- goto release_regions;
- }
-
- addr = pci_resource_start(pci, 0);
- adata->acp6x_base = devm_ioremap(&pci->dev, addr,
- pci_resource_len(pci, 0));
- if (!adata->acp6x_base) {
- ret = -ENOMEM;
- goto release_regions;
- }
- pci_set_master(pci);
- pci_set_drvdata(pci, adata);
- ret = rpl_init(adata->acp6x_base);
- if (ret)
- goto release_regions;
- pm_runtime_set_autosuspend_delay(&pci->dev, ACP_SUSPEND_DELAY_MS);
- pm_runtime_use_autosuspend(&pci->dev);
- pm_runtime_put_noidle(&pci->dev);
- pm_runtime_allow(&pci->dev);
-
- return 0;
-release_regions:
- pci_release_regions(pci);
-disable_pci:
- pci_disable_device(pci);
-
- return ret;
-}
-
-static int snd_rpl_suspend(struct device *dev)
-{
- struct rpl_dev_data *adata;
- int ret;
-
- adata = dev_get_drvdata(dev);
- ret = rpl_deinit(adata->acp6x_base);
- if (ret)
- dev_err(dev, "ACP de-init failed\n");
- return ret;
-}
-
-static int snd_rpl_resume(struct device *dev)
-{
- struct rpl_dev_data *adata;
- int ret;
-
- adata = dev_get_drvdata(dev);
- ret = rpl_init(adata->acp6x_base);
- if (ret)
- dev_err(dev, "ACP init failed\n");
- return ret;
-}
-
-static const struct dev_pm_ops rpl_pm = {
- RUNTIME_PM_OPS(snd_rpl_suspend, snd_rpl_resume, NULL)
- SYSTEM_SLEEP_PM_OPS(snd_rpl_suspend, snd_rpl_resume)
-};
-
-static void snd_rpl_remove(struct pci_dev *pci)
-{
- struct rpl_dev_data *adata;
- int ret;
-
- adata = pci_get_drvdata(pci);
- ret = rpl_deinit(adata->acp6x_base);
- if (ret)
- dev_err(&pci->dev, "ACP de-init failed\n");
- pm_runtime_forbid(&pci->dev);
- pm_runtime_get_noresume(&pci->dev);
- pci_release_regions(pci);
- pci_disable_device(pci);
-}
-
-static const struct pci_device_id snd_rpl_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_rpl_ids);
-
-static struct pci_driver rpl_acp6x_driver = {
- .name = KBUILD_MODNAME,
- .id_table = snd_rpl_ids,
- .probe = snd_rpl_probe,
- .remove = snd_rpl_remove,
- .driver = {
- .pm = pm_ptr(&rpl_pm),
- }
-};
-
-module_pci_driver(rpl_acp6x_driver);
-
-MODULE_DESCRIPTION("AMD ACP RPL PCI driver");
-MODULE_LICENSE("GPL v2");
diff --git a/sound/soc/amd/rpl/rpl_acp6x.h b/sound/soc/amd/rpl/rpl_acp6x.h
deleted file mode 100644
index f5816a33632e..000000000000
--- a/sound/soc/amd/rpl/rpl_acp6x.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * AMD ACP Driver
- *
- * Copyright (C) 2021 Advanced Micro Devices, Inc. All rights reserved.
- */
-
-#include "rpl_acp6x_chip_offset_byte.h"
-
-#define ACP_DEVICE_ID 0x15E2
-#define ACP6x_PHY_BASE_ADDRESS 0x1240000
-
-#define ACP_SOFT_RESET_SOFTRESET_AUDDONE_MASK 0x00010001
-#define ACP_PGFSM_CNTL_POWER_ON_MASK 1
-#define ACP_PGFSM_CNTL_POWER_OFF_MASK 0
-#define ACP_PGFSM_STATUS_MASK 3
-#define ACP_POWERED_ON 0
-#define ACP_POWER_ON_IN_PROGRESS 1
-#define ACP_POWERED_OFF 2
-#define ACP_POWER_OFF_IN_PROGRESS 3
-
-#define DELAY_US 5
-#define ACP_COUNTER 20000
-
-/* time in ms for runtime suspend delay */
-#define ACP_SUSPEND_DELAY_MS 2000
-
-static inline u32 rpl_acp_readl(void __iomem *base_addr)
-{
- return readl(base_addr - ACP6x_PHY_BASE_ADDRESS);
-}
-
-static inline void rpl_acp_writel(u32 val, void __iomem *base_addr)
-{
- writel(val, base_addr - ACP6x_PHY_BASE_ADDRESS);
-}
diff --git a/sound/soc/amd/rpl/rpl_acp6x_chip_offset_byte.h b/sound/soc/amd/rpl/rpl_acp6x_chip_offset_byte.h
deleted file mode 100644
index 456498f5396d..000000000000
--- a/sound/soc/amd/rpl/rpl_acp6x_chip_offset_byte.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * AMD ACP 6.2 Register Documentation
- *
- * Copyright 2022 Advanced Micro Devices, Inc.
- */
-
-#ifndef _rpl_acp6x_OFFSET_HEADER
-#define _rpl_acp6x_OFFSET_HEADER
-
-/* Registers from ACP_CLKRST block */
-#define ACP_SOFT_RESET 0x1241000
-#define ACP_CONTROL 0x1241004
-#define ACP_STATUS 0x1241008
-#define ACP_DYNAMIC_CG_MASTER_CONTROL 0x1241010
-#define ACP_PGFSM_CONTROL 0x124101C
-#define ACP_PGFSM_STATUS 0x1241020
-#define ACP_CLKMUX_SEL 0x1241024
-
-/* Registers from ACP_AON block */
-#define ACP_PME_EN 0x1241400
-#define ACP_DEVICE_STATE 0x1241404
-#define AZ_DEVICE_STATE 0x1241408
-#define ACP_PIN_CONFIG 0x1241440
-#define ACP_PAD_PULLUP_CTRL 0x1241444
-#define ACP_PAD_PULLDOWN_CTRL 0x1241448
-#define ACP_PAD_DRIVE_STRENGTH_CTRL 0x124144C
-#define ACP_PAD_SCHMEN_CTRL 0x1241450
-
-#endif
diff --git a/sound/soc/amd/yc/acp6x-mach.c b/sound/soc/amd/yc/acp6x-mach.c
index 0294177acc66..de49c812124a 100644
--- a/sound/soc/amd/yc/acp6x-mach.c
+++ b/sound/soc/amd/yc/acp6x-mach.c
@@ -45,6 +45,13 @@ static struct snd_soc_card acp6x_card = {
};
static const struct dmi_system_id yc_acp_quirk_table[] = {
+ {
+ .driver_data = &acp6x_card,
+ .matches = {
+ DMI_MATCH(DMI_BOARD_VENDOR, "Lecoo"),
+ DMI_MATCH(DMI_PRODUCT_NAME, "Bellator N176"),
+ }
+ },
{
.driver_data = &acp6x_card,
.matches = {
diff --git a/sound/soc/amd/yc/pci-acp6x.c b/sound/soc/amd/yc/pci-acp6x.c
index 1140ed1cbb3d..296b74252a8a 100644
--- a/sound/soc/amd/yc/pci-acp6x.c
+++ b/sound/soc/amd/yc/pci-acp6x.c
@@ -163,6 +163,7 @@ static int snd_acp6x_probe(struct pci_dev *pci,
switch (pci->revision) {
case 0x60:
case 0x6f:
+ case 0x62: /* RPL */
break;
default:
dev_dbg(&pci->dev, "acp6x pci device not found\n");
@@ -205,6 +206,11 @@ static int snd_acp6x_probe(struct pci_dev *pci,
case ACP_CONFIG_2:
case ACP_CONFIG_3:
case ACP_CONFIG_9:
+ case ACP_CONFIG_10: /* Reserved for RPL */
+ case ACP_CONFIG_11: /* Reserved for RPL */
+ case ACP_CONFIG_12: /* Reserved for RPL */
+ case ACP_CONFIG_13: /* Reserved for RPL */
+ case ACP_CONFIG_14: /* Reserved for RPL */
case ACP_CONFIG_15:
dev_info(&pci->dev, "Audio Mode %d\n", val);
break;
--
2.51.2On 12/02/26 07:16, Mingyou Chen wrote:
> Add DMIC support for the AMD RPL platform. The drivers are derived on
> the YC platform driver.
>
> Signed-off-by: Mingyou Chen <qby140326@gmail.com>
> ---
> v2:
> - Reverse ACP CONFIG PIN from 10 to 14 for rpl
> - Remove the rpl folder
> v3:
> - Remove rpl configuration from Kconfig and Makefile
>
> sound/soc/amd/Kconfig | 10 -
> sound/soc/amd/Makefile | 1 -
> sound/soc/amd/rpl/Makefile | 5 -
> sound/soc/amd/rpl/rpl-pci-acp6x.c | 227 ------------------
> sound/soc/amd/rpl/rpl_acp6x.h | 36 ---
> .../soc/amd/rpl/rpl_acp6x_chip_offset_byte.h | 30 ---
> sound/soc/amd/yc/acp6x-mach.c | 7 +
> sound/soc/amd/yc/pci-acp6x.c | 6 +
> 8 files changed, 13 insertions(+), 309 deletions(-)
> delete mode 100644 sound/soc/amd/rpl/Makefile
> delete mode 100644 sound/soc/amd/rpl/rpl-pci-acp6x.c
> delete mode 100644 sound/soc/amd/rpl/rpl_acp6x.h
> delete mode 100644 sound/soc/amd/rpl/rpl_acp6x_chip_offset_byte.h
>
> diff --git a/sound/soc/amd/Kconfig b/sound/soc/amd/Kconfig
> index fd35a03aadcb..a6eecbe12e84 100644
> --- a/sound/soc/amd/Kconfig
> +++ b/sound/soc/amd/Kconfig
> @@ -124,16 +124,6 @@ config SND_AMD_ACP_CONFIG
>
> source "sound/soc/amd/acp/Kconfig"
>
> -config SND_SOC_AMD_RPL_ACP6x
> - tristate "AMD Audio Coprocessor-v6.2 RPL support"
> - depends on X86 && PCI
> - help
> - This option enables Audio Coprocessor i.e. ACP v6.2 support on
> - AMD RPL platform. By enabling this flag build will be
> - triggered for ACP PCI driver.
> - Say m if you have such a device.
> - If unsure select "N".
> -
> config SND_SOC_AMD_ACP63_TOPLEVEL
> tristate "support for AMD platforms with ACP version >= 6.3"
> default SND_AMD_ACP_CONFIG
> diff --git a/sound/soc/amd/Makefile b/sound/soc/amd/Makefile
> index 4f89d962cce2..23b25ff0d800 100644
> --- a/sound/soc/amd/Makefile
> +++ b/sound/soc/amd/Makefile
> @@ -17,5 +17,4 @@ obj-$(CONFIG_SND_SOC_AMD_ACP5x) += vangogh/
> obj-$(CONFIG_SND_SOC_AMD_ACP6x) += yc/
> obj-$(CONFIG_SND_AMD_ACP_CONFIG) += acp/
> obj-$(CONFIG_SND_AMD_ACP_CONFIG) += snd-acp-config.o
> -obj-$(CONFIG_SND_SOC_AMD_RPL_ACP6x) += rpl/
> obj-$(CONFIG_SND_SOC_AMD_PS) += ps/
> diff --git a/sound/soc/amd/rpl/Makefile b/sound/soc/amd/rpl/Makefile
> deleted file mode 100644
> index a3825c5be4e7..000000000000
> --- a/sound/soc/amd/rpl/Makefile
> +++ /dev/null
> @@ -1,5 +0,0 @@
> -# SPDX-License-Identifier: GPL-2.0+
> -# RPL platform Support
> -snd-rpl-pci-acp6x-y := rpl-pci-acp6x.o
> -
> -obj-$(CONFIG_SND_SOC_AMD_RPL_ACP6x) += snd-rpl-pci-acp6x.o
> diff --git a/sound/soc/amd/rpl/rpl-pci-acp6x.c b/sound/soc/amd/rpl/rpl-pci-acp6x.c
> deleted file mode 100644
> index e3afe9172bdf..000000000000
> --- a/sound/soc/amd/rpl/rpl-pci-acp6x.c
> +++ /dev/null
> @@ -1,227 +0,0 @@
> -// SPDX-License-Identifier: GPL-2.0+
> -/*
> - * AMD RPL ACP PCI Driver
> - *
> - * Copyright 2022 Advanced Micro Devices, Inc.
> - */
> -
> -#include <linux/pci.h>
> -#include <linux/module.h>
> -#include <linux/io.h>
> -#include <linux/delay.h>
> -#include <linux/platform_device.h>
> -#include <linux/pm_runtime.h>
> -
> -#include "rpl_acp6x.h"
> -
> -struct rpl_dev_data {
> - void __iomem *acp6x_base;
> -};
> -
> -static int rpl_power_on(void __iomem *acp_base)
> -{
> - u32 val;
> - int timeout;
> -
> - val = rpl_acp_readl(acp_base + ACP_PGFSM_STATUS);
> -
> - if (!val)
> - return val;
> -
> - if ((val & ACP_PGFSM_STATUS_MASK) != ACP_POWER_ON_IN_PROGRESS)
> - rpl_acp_writel(ACP_PGFSM_CNTL_POWER_ON_MASK, acp_base + ACP_PGFSM_CONTROL);
> - timeout = 0;
> - while (++timeout < 500) {
> - val = rpl_acp_readl(acp_base + ACP_PGFSM_STATUS);
> - if (!val)
> - return 0;
> - udelay(1);
> - }
> - return -ETIMEDOUT;
> -}
> -
> -static int rpl_reset(void __iomem *acp_base)
> -{
> - u32 val;
> - int timeout;
> -
> - rpl_acp_writel(1, acp_base + ACP_SOFT_RESET);
> - timeout = 0;
> - while (++timeout < 500) {
> - val = rpl_acp_readl(acp_base + ACP_SOFT_RESET);
> - if (val & ACP_SOFT_RESET_SOFTRESET_AUDDONE_MASK)
> - break;
> - cpu_relax();
> - }
> - rpl_acp_writel(0, acp_base + ACP_SOFT_RESET);
> - timeout = 0;
> - while (++timeout < 500) {
> - val = rpl_acp_readl(acp_base + ACP_SOFT_RESET);
> - if (!val)
> - return 0;
> - cpu_relax();
> - }
> - return -ETIMEDOUT;
> -}
> -
> -static int rpl_init(void __iomem *acp_base)
> -{
> - int ret;
> -
> - /* power on */
> - ret = rpl_power_on(acp_base);
> - if (ret) {
> - pr_err("ACP power on failed\n");
> - return ret;
> - }
> - rpl_acp_writel(0x01, acp_base + ACP_CONTROL);
> - /* Reset */
> - ret = rpl_reset(acp_base);
> - if (ret) {
> - pr_err("ACP reset failed\n");
> - return ret;
> - }
> - rpl_acp_writel(0x03, acp_base + ACP_CLKMUX_SEL);
> - return 0;
> -}
> -
> -static int rpl_deinit(void __iomem *acp_base)
> -{
> - int ret;
> -
> - /* Reset */
> - ret = rpl_reset(acp_base);
> - if (ret) {
> - pr_err("ACP reset failed\n");
> - return ret;
> - }
> - rpl_acp_writel(0x00, acp_base + ACP_CLKMUX_SEL);
> - rpl_acp_writel(0x00, acp_base + ACP_CONTROL);
> - return 0;
> -}
> -
> -static int snd_rpl_probe(struct pci_dev *pci,
> - const struct pci_device_id *pci_id)
> -{
> - struct rpl_dev_data *adata;
> - u32 addr;
> - int ret;
> -
> - /* RPL device check */
> - switch (pci->revision) {
> - case 0x62:
> - break;
> - default:
> - dev_dbg(&pci->dev, "acp6x pci device not found\n");
> - return -ENODEV;
> - }
> - if (pci_enable_device(pci)) {
> - dev_err(&pci->dev, "pci_enable_device failed\n");
> - return -ENODEV;
> - }
> -
> - ret = pci_request_regions(pci, "AMD ACP6x audio");
> - if (ret < 0) {
> - dev_err(&pci->dev, "pci_request_regions failed\n");
> - goto disable_pci;
> - }
> -
> - adata = devm_kzalloc(&pci->dev, sizeof(struct rpl_dev_data),
> - GFP_KERNEL);
> - if (!adata) {
> - ret = -ENOMEM;
> - goto release_regions;
> - }
> -
> - addr = pci_resource_start(pci, 0);
> - adata->acp6x_base = devm_ioremap(&pci->dev, addr,
> - pci_resource_len(pci, 0));
> - if (!adata->acp6x_base) {
> - ret = -ENOMEM;
> - goto release_regions;
> - }
> - pci_set_master(pci);
> - pci_set_drvdata(pci, adata);
> - ret = rpl_init(adata->acp6x_base);
> - if (ret)
> - goto release_regions;
> - pm_runtime_set_autosuspend_delay(&pci->dev, ACP_SUSPEND_DELAY_MS);
> - pm_runtime_use_autosuspend(&pci->dev);
> - pm_runtime_put_noidle(&pci->dev);
> - pm_runtime_allow(&pci->dev);
> -
> - return 0;
> -release_regions:
> - pci_release_regions(pci);
> -disable_pci:
> - pci_disable_device(pci);
> -
> - return ret;
> -}
> -
> -static int snd_rpl_suspend(struct device *dev)
> -{
> - struct rpl_dev_data *adata;
> - int ret;
> -
> - adata = dev_get_drvdata(dev);
> - ret = rpl_deinit(adata->acp6x_base);
> - if (ret)
> - dev_err(dev, "ACP de-init failed\n");
> - return ret;
> -}
> -
> -static int snd_rpl_resume(struct device *dev)
> -{
> - struct rpl_dev_data *adata;
> - int ret;
> -
> - adata = dev_get_drvdata(dev);
> - ret = rpl_init(adata->acp6x_base);
> - if (ret)
> - dev_err(dev, "ACP init failed\n");
> - return ret;
> -}
> -
> -static const struct dev_pm_ops rpl_pm = {
> - RUNTIME_PM_OPS(snd_rpl_suspend, snd_rpl_resume, NULL)
> - SYSTEM_SLEEP_PM_OPS(snd_rpl_suspend, snd_rpl_resume)
> -};
> -
> -static void snd_rpl_remove(struct pci_dev *pci)
> -{
> - struct rpl_dev_data *adata;
> - int ret;
> -
> - adata = pci_get_drvdata(pci);
> - ret = rpl_deinit(adata->acp6x_base);
> - if (ret)
> - dev_err(&pci->dev, "ACP de-init failed\n");
> - pm_runtime_forbid(&pci->dev);
> - pm_runtime_get_noresume(&pci->dev);
> - pci_release_regions(pci);
> - pci_disable_device(pci);
> -}
> -
> -static const struct pci_device_id snd_rpl_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_rpl_ids);
> -
> -static struct pci_driver rpl_acp6x_driver = {
> - .name = KBUILD_MODNAME,
> - .id_table = snd_rpl_ids,
> - .probe = snd_rpl_probe,
> - .remove = snd_rpl_remove,
> - .driver = {
> - .pm = pm_ptr(&rpl_pm),
> - }
> -};
> -
> -module_pci_driver(rpl_acp6x_driver);
> -
> -MODULE_DESCRIPTION("AMD ACP RPL PCI driver");
> -MODULE_LICENSE("GPL v2");
> diff --git a/sound/soc/amd/rpl/rpl_acp6x.h b/sound/soc/amd/rpl/rpl_acp6x.h
> deleted file mode 100644
> index f5816a33632e..000000000000
> --- a/sound/soc/amd/rpl/rpl_acp6x.h
> +++ /dev/null
> @@ -1,36 +0,0 @@
> -/* SPDX-License-Identifier: GPL-2.0+ */
> -/*
> - * AMD ACP Driver
> - *
> - * Copyright (C) 2021 Advanced Micro Devices, Inc. All rights reserved.
> - */
> -
> -#include "rpl_acp6x_chip_offset_byte.h"
> -
> -#define ACP_DEVICE_ID 0x15E2
> -#define ACP6x_PHY_BASE_ADDRESS 0x1240000
> -
> -#define ACP_SOFT_RESET_SOFTRESET_AUDDONE_MASK 0x00010001
> -#define ACP_PGFSM_CNTL_POWER_ON_MASK 1
> -#define ACP_PGFSM_CNTL_POWER_OFF_MASK 0
> -#define ACP_PGFSM_STATUS_MASK 3
> -#define ACP_POWERED_ON 0
> -#define ACP_POWER_ON_IN_PROGRESS 1
> -#define ACP_POWERED_OFF 2
> -#define ACP_POWER_OFF_IN_PROGRESS 3
> -
> -#define DELAY_US 5
> -#define ACP_COUNTER 20000
> -
> -/* time in ms for runtime suspend delay */
> -#define ACP_SUSPEND_DELAY_MS 2000
> -
> -static inline u32 rpl_acp_readl(void __iomem *base_addr)
> -{
> - return readl(base_addr - ACP6x_PHY_BASE_ADDRESS);
> -}
> -
> -static inline void rpl_acp_writel(u32 val, void __iomem *base_addr)
> -{
> - writel(val, base_addr - ACP6x_PHY_BASE_ADDRESS);
> -}
> diff --git a/sound/soc/amd/rpl/rpl_acp6x_chip_offset_byte.h b/sound/soc/amd/rpl/rpl_acp6x_chip_offset_byte.h
> deleted file mode 100644
> index 456498f5396d..000000000000
> --- a/sound/soc/amd/rpl/rpl_acp6x_chip_offset_byte.h
> +++ /dev/null
> @@ -1,30 +0,0 @@
> -/* SPDX-License-Identifier: GPL-2.0+ */
> -/*
> - * AMD ACP 6.2 Register Documentation
> - *
> - * Copyright 2022 Advanced Micro Devices, Inc.
> - */
> -
> -#ifndef _rpl_acp6x_OFFSET_HEADER
> -#define _rpl_acp6x_OFFSET_HEADER
> -
> -/* Registers from ACP_CLKRST block */
> -#define ACP_SOFT_RESET 0x1241000
> -#define ACP_CONTROL 0x1241004
> -#define ACP_STATUS 0x1241008
> -#define ACP_DYNAMIC_CG_MASTER_CONTROL 0x1241010
> -#define ACP_PGFSM_CONTROL 0x124101C
> -#define ACP_PGFSM_STATUS 0x1241020
> -#define ACP_CLKMUX_SEL 0x1241024
> -
> -/* Registers from ACP_AON block */
> -#define ACP_PME_EN 0x1241400
> -#define ACP_DEVICE_STATE 0x1241404
> -#define AZ_DEVICE_STATE 0x1241408
> -#define ACP_PIN_CONFIG 0x1241440
> -#define ACP_PAD_PULLUP_CTRL 0x1241444
> -#define ACP_PAD_PULLDOWN_CTRL 0x1241448
> -#define ACP_PAD_DRIVE_STRENGTH_CTRL 0x124144C
> -#define ACP_PAD_SCHMEN_CTRL 0x1241450
> -
> -#endif
> diff --git a/sound/soc/amd/yc/acp6x-mach.c b/sound/soc/amd/yc/acp6x-mach.c
> index 0294177acc66..de49c812124a 100644
> --- a/sound/soc/amd/yc/acp6x-mach.c
> +++ b/sound/soc/amd/yc/acp6x-mach.c
> @@ -45,6 +45,13 @@ static struct snd_soc_card acp6x_card = {
> };
>
> static const struct dmi_system_id yc_acp_quirk_table[] = {
> + {
> + .driver_data = &acp6x_card,
> + .matches = {
> + DMI_MATCH(DMI_BOARD_VENDOR, "Lecoo"),
> + DMI_MATCH(DMI_PRODUCT_NAME, "Bellator N176"),
> + }
> + },
> {
> .driver_data = &acp6x_card,
> .matches = {
> diff --git a/sound/soc/amd/yc/pci-acp6x.c b/sound/soc/amd/yc/pci-acp6x.c
> index 1140ed1cbb3d..296b74252a8a 100644
> --- a/sound/soc/amd/yc/pci-acp6x.c
> +++ b/sound/soc/amd/yc/pci-acp6x.c
> @@ -163,6 +163,7 @@ static int snd_acp6x_probe(struct pci_dev *pci,
> switch (pci->revision) {
> case 0x60:
> case 0x6f:
> + case 0x62: /* RPL */
> break;
> default:
> dev_dbg(&pci->dev, "acp6x pci device not found\n");
> @@ -205,6 +206,11 @@ static int snd_acp6x_probe(struct pci_dev *pci,
> case ACP_CONFIG_2:
> case ACP_CONFIG_3:
> case ACP_CONFIG_9:
> + case ACP_CONFIG_10: /* Reserved for RPL */
> + case ACP_CONFIG_11: /* Reserved for RPL */
> + case ACP_CONFIG_12: /* Reserved for RPL */
> + case ACP_CONFIG_13: /* Reserved for RPL */
> + case ACP_CONFIG_14: /* Reserved for RPL */
Need to handle separate switch case for RPL. Above changes breaks
the functionality for YC.
> case ACP_CONFIG_15:
> dev_info(&pci->dev, "Audio Mode %d\n", val);
> break;
Add DMIC support for the AMD RPL platform. The drivers are derived on
the YC platform driver.
Signed-off-by: Mingyou Chen <qby140326@gmail.com>
---
v2:
- Reverse ACP CONFIG PIN from 10 to 14 for rpl
- Remove the rpl folder
v3:
- Remove rpl configuration from Kconfig and Makefile
v4:
- Handle separate switch case for RPL platform (ACP Pin config)
sound/soc/amd/Kconfig | 10 -
sound/soc/amd/Makefile | 1 -
sound/soc/amd/rpl/Makefile | 5 -
sound/soc/amd/rpl/rpl-pci-acp6x.c | 227 ------------------
sound/soc/amd/rpl/rpl_acp6x.h | 36 ---
.../soc/amd/rpl/rpl_acp6x_chip_offset_byte.h | 30 ---
sound/soc/amd/yc/acp6x-mach.c | 7 +
sound/soc/amd/yc/pci-acp6x.c | 13 +
8 files changed, 20 insertions(+), 309 deletions(-)
delete mode 100644 sound/soc/amd/rpl/Makefile
delete mode 100644 sound/soc/amd/rpl/rpl-pci-acp6x.c
delete mode 100644 sound/soc/amd/rpl/rpl_acp6x.h
delete mode 100644 sound/soc/amd/rpl/rpl_acp6x_chip_offset_byte.h
diff --git a/sound/soc/amd/Kconfig b/sound/soc/amd/Kconfig
index fd35a03aadcb..a6eecbe12e84 100644
--- a/sound/soc/amd/Kconfig
+++ b/sound/soc/amd/Kconfig
@@ -124,16 +124,6 @@ config SND_AMD_ACP_CONFIG
source "sound/soc/amd/acp/Kconfig"
-config SND_SOC_AMD_RPL_ACP6x
- tristate "AMD Audio Coprocessor-v6.2 RPL support"
- depends on X86 && PCI
- help
- This option enables Audio Coprocessor i.e. ACP v6.2 support on
- AMD RPL platform. By enabling this flag build will be
- triggered for ACP PCI driver.
- Say m if you have such a device.
- If unsure select "N".
-
config SND_SOC_AMD_ACP63_TOPLEVEL
tristate "support for AMD platforms with ACP version >= 6.3"
default SND_AMD_ACP_CONFIG
diff --git a/sound/soc/amd/Makefile b/sound/soc/amd/Makefile
index 4f89d962cce2..23b25ff0d800 100644
--- a/sound/soc/amd/Makefile
+++ b/sound/soc/amd/Makefile
@@ -17,5 +17,4 @@ obj-$(CONFIG_SND_SOC_AMD_ACP5x) += vangogh/
obj-$(CONFIG_SND_SOC_AMD_ACP6x) += yc/
obj-$(CONFIG_SND_AMD_ACP_CONFIG) += acp/
obj-$(CONFIG_SND_AMD_ACP_CONFIG) += snd-acp-config.o
-obj-$(CONFIG_SND_SOC_AMD_RPL_ACP6x) += rpl/
obj-$(CONFIG_SND_SOC_AMD_PS) += ps/
diff --git a/sound/soc/amd/rpl/Makefile b/sound/soc/amd/rpl/Makefile
deleted file mode 100644
index a3825c5be4e7..000000000000
--- a/sound/soc/amd/rpl/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-# RPL platform Support
-snd-rpl-pci-acp6x-y := rpl-pci-acp6x.o
-
-obj-$(CONFIG_SND_SOC_AMD_RPL_ACP6x) += snd-rpl-pci-acp6x.o
diff --git a/sound/soc/amd/rpl/rpl-pci-acp6x.c b/sound/soc/amd/rpl/rpl-pci-acp6x.c
deleted file mode 100644
index e3afe9172bdf..000000000000
--- a/sound/soc/amd/rpl/rpl-pci-acp6x.c
+++ /dev/null
@@ -1,227 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * AMD RPL ACP PCI Driver
- *
- * Copyright 2022 Advanced Micro Devices, Inc.
- */
-
-#include <linux/pci.h>
-#include <linux/module.h>
-#include <linux/io.h>
-#include <linux/delay.h>
-#include <linux/platform_device.h>
-#include <linux/pm_runtime.h>
-
-#include "rpl_acp6x.h"
-
-struct rpl_dev_data {
- void __iomem *acp6x_base;
-};
-
-static int rpl_power_on(void __iomem *acp_base)
-{
- u32 val;
- int timeout;
-
- val = rpl_acp_readl(acp_base + ACP_PGFSM_STATUS);
-
- if (!val)
- return val;
-
- if ((val & ACP_PGFSM_STATUS_MASK) != ACP_POWER_ON_IN_PROGRESS)
- rpl_acp_writel(ACP_PGFSM_CNTL_POWER_ON_MASK, acp_base + ACP_PGFSM_CONTROL);
- timeout = 0;
- while (++timeout < 500) {
- val = rpl_acp_readl(acp_base + ACP_PGFSM_STATUS);
- if (!val)
- return 0;
- udelay(1);
- }
- return -ETIMEDOUT;
-}
-
-static int rpl_reset(void __iomem *acp_base)
-{
- u32 val;
- int timeout;
-
- rpl_acp_writel(1, acp_base + ACP_SOFT_RESET);
- timeout = 0;
- while (++timeout < 500) {
- val = rpl_acp_readl(acp_base + ACP_SOFT_RESET);
- if (val & ACP_SOFT_RESET_SOFTRESET_AUDDONE_MASK)
- break;
- cpu_relax();
- }
- rpl_acp_writel(0, acp_base + ACP_SOFT_RESET);
- timeout = 0;
- while (++timeout < 500) {
- val = rpl_acp_readl(acp_base + ACP_SOFT_RESET);
- if (!val)
- return 0;
- cpu_relax();
- }
- return -ETIMEDOUT;
-}
-
-static int rpl_init(void __iomem *acp_base)
-{
- int ret;
-
- /* power on */
- ret = rpl_power_on(acp_base);
- if (ret) {
- pr_err("ACP power on failed\n");
- return ret;
- }
- rpl_acp_writel(0x01, acp_base + ACP_CONTROL);
- /* Reset */
- ret = rpl_reset(acp_base);
- if (ret) {
- pr_err("ACP reset failed\n");
- return ret;
- }
- rpl_acp_writel(0x03, acp_base + ACP_CLKMUX_SEL);
- return 0;
-}
-
-static int rpl_deinit(void __iomem *acp_base)
-{
- int ret;
-
- /* Reset */
- ret = rpl_reset(acp_base);
- if (ret) {
- pr_err("ACP reset failed\n");
- return ret;
- }
- rpl_acp_writel(0x00, acp_base + ACP_CLKMUX_SEL);
- rpl_acp_writel(0x00, acp_base + ACP_CONTROL);
- return 0;
-}
-
-static int snd_rpl_probe(struct pci_dev *pci,
- const struct pci_device_id *pci_id)
-{
- struct rpl_dev_data *adata;
- u32 addr;
- int ret;
-
- /* RPL device check */
- switch (pci->revision) {
- case 0x62:
- break;
- default:
- dev_dbg(&pci->dev, "acp6x pci device not found\n");
- return -ENODEV;
- }
- if (pci_enable_device(pci)) {
- dev_err(&pci->dev, "pci_enable_device failed\n");
- return -ENODEV;
- }
-
- ret = pci_request_regions(pci, "AMD ACP6x audio");
- if (ret < 0) {
- dev_err(&pci->dev, "pci_request_regions failed\n");
- goto disable_pci;
- }
-
- adata = devm_kzalloc(&pci->dev, sizeof(struct rpl_dev_data),
- GFP_KERNEL);
- if (!adata) {
- ret = -ENOMEM;
- goto release_regions;
- }
-
- addr = pci_resource_start(pci, 0);
- adata->acp6x_base = devm_ioremap(&pci->dev, addr,
- pci_resource_len(pci, 0));
- if (!adata->acp6x_base) {
- ret = -ENOMEM;
- goto release_regions;
- }
- pci_set_master(pci);
- pci_set_drvdata(pci, adata);
- ret = rpl_init(adata->acp6x_base);
- if (ret)
- goto release_regions;
- pm_runtime_set_autosuspend_delay(&pci->dev, ACP_SUSPEND_DELAY_MS);
- pm_runtime_use_autosuspend(&pci->dev);
- pm_runtime_put_noidle(&pci->dev);
- pm_runtime_allow(&pci->dev);
-
- return 0;
-release_regions:
- pci_release_regions(pci);
-disable_pci:
- pci_disable_device(pci);
-
- return ret;
-}
-
-static int snd_rpl_suspend(struct device *dev)
-{
- struct rpl_dev_data *adata;
- int ret;
-
- adata = dev_get_drvdata(dev);
- ret = rpl_deinit(adata->acp6x_base);
- if (ret)
- dev_err(dev, "ACP de-init failed\n");
- return ret;
-}
-
-static int snd_rpl_resume(struct device *dev)
-{
- struct rpl_dev_data *adata;
- int ret;
-
- adata = dev_get_drvdata(dev);
- ret = rpl_init(adata->acp6x_base);
- if (ret)
- dev_err(dev, "ACP init failed\n");
- return ret;
-}
-
-static const struct dev_pm_ops rpl_pm = {
- RUNTIME_PM_OPS(snd_rpl_suspend, snd_rpl_resume, NULL)
- SYSTEM_SLEEP_PM_OPS(snd_rpl_suspend, snd_rpl_resume)
-};
-
-static void snd_rpl_remove(struct pci_dev *pci)
-{
- struct rpl_dev_data *adata;
- int ret;
-
- adata = pci_get_drvdata(pci);
- ret = rpl_deinit(adata->acp6x_base);
- if (ret)
- dev_err(&pci->dev, "ACP de-init failed\n");
- pm_runtime_forbid(&pci->dev);
- pm_runtime_get_noresume(&pci->dev);
- pci_release_regions(pci);
- pci_disable_device(pci);
-}
-
-static const struct pci_device_id snd_rpl_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_rpl_ids);
-
-static struct pci_driver rpl_acp6x_driver = {
- .name = KBUILD_MODNAME,
- .id_table = snd_rpl_ids,
- .probe = snd_rpl_probe,
- .remove = snd_rpl_remove,
- .driver = {
- .pm = pm_ptr(&rpl_pm),
- }
-};
-
-module_pci_driver(rpl_acp6x_driver);
-
-MODULE_DESCRIPTION("AMD ACP RPL PCI driver");
-MODULE_LICENSE("GPL v2");
diff --git a/sound/soc/amd/rpl/rpl_acp6x.h b/sound/soc/amd/rpl/rpl_acp6x.h
deleted file mode 100644
index f5816a33632e..000000000000
--- a/sound/soc/amd/rpl/rpl_acp6x.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * AMD ACP Driver
- *
- * Copyright (C) 2021 Advanced Micro Devices, Inc. All rights reserved.
- */
-
-#include "rpl_acp6x_chip_offset_byte.h"
-
-#define ACP_DEVICE_ID 0x15E2
-#define ACP6x_PHY_BASE_ADDRESS 0x1240000
-
-#define ACP_SOFT_RESET_SOFTRESET_AUDDONE_MASK 0x00010001
-#define ACP_PGFSM_CNTL_POWER_ON_MASK 1
-#define ACP_PGFSM_CNTL_POWER_OFF_MASK 0
-#define ACP_PGFSM_STATUS_MASK 3
-#define ACP_POWERED_ON 0
-#define ACP_POWER_ON_IN_PROGRESS 1
-#define ACP_POWERED_OFF 2
-#define ACP_POWER_OFF_IN_PROGRESS 3
-
-#define DELAY_US 5
-#define ACP_COUNTER 20000
-
-/* time in ms for runtime suspend delay */
-#define ACP_SUSPEND_DELAY_MS 2000
-
-static inline u32 rpl_acp_readl(void __iomem *base_addr)
-{
- return readl(base_addr - ACP6x_PHY_BASE_ADDRESS);
-}
-
-static inline void rpl_acp_writel(u32 val, void __iomem *base_addr)
-{
- writel(val, base_addr - ACP6x_PHY_BASE_ADDRESS);
-}
diff --git a/sound/soc/amd/rpl/rpl_acp6x_chip_offset_byte.h b/sound/soc/amd/rpl/rpl_acp6x_chip_offset_byte.h
deleted file mode 100644
index 456498f5396d..000000000000
--- a/sound/soc/amd/rpl/rpl_acp6x_chip_offset_byte.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * AMD ACP 6.2 Register Documentation
- *
- * Copyright 2022 Advanced Micro Devices, Inc.
- */
-
-#ifndef _rpl_acp6x_OFFSET_HEADER
-#define _rpl_acp6x_OFFSET_HEADER
-
-/* Registers from ACP_CLKRST block */
-#define ACP_SOFT_RESET 0x1241000
-#define ACP_CONTROL 0x1241004
-#define ACP_STATUS 0x1241008
-#define ACP_DYNAMIC_CG_MASTER_CONTROL 0x1241010
-#define ACP_PGFSM_CONTROL 0x124101C
-#define ACP_PGFSM_STATUS 0x1241020
-#define ACP_CLKMUX_SEL 0x1241024
-
-/* Registers from ACP_AON block */
-#define ACP_PME_EN 0x1241400
-#define ACP_DEVICE_STATE 0x1241404
-#define AZ_DEVICE_STATE 0x1241408
-#define ACP_PIN_CONFIG 0x1241440
-#define ACP_PAD_PULLUP_CTRL 0x1241444
-#define ACP_PAD_PULLDOWN_CTRL 0x1241448
-#define ACP_PAD_DRIVE_STRENGTH_CTRL 0x124144C
-#define ACP_PAD_SCHMEN_CTRL 0x1241450
-
-#endif
diff --git a/sound/soc/amd/yc/acp6x-mach.c b/sound/soc/amd/yc/acp6x-mach.c
index 0294177acc66..de49c812124a 100644
--- a/sound/soc/amd/yc/acp6x-mach.c
+++ b/sound/soc/amd/yc/acp6x-mach.c
@@ -45,6 +45,13 @@ static struct snd_soc_card acp6x_card = {
};
static const struct dmi_system_id yc_acp_quirk_table[] = {
+ {
+ .driver_data = &acp6x_card,
+ .matches = {
+ DMI_MATCH(DMI_BOARD_VENDOR, "Lecoo"),
+ DMI_MATCH(DMI_PRODUCT_NAME, "Bellator N176"),
+ }
+ },
{
.driver_data = &acp6x_card,
.matches = {
diff --git a/sound/soc/amd/yc/pci-acp6x.c b/sound/soc/amd/yc/pci-acp6x.c
index 1140ed1cbb3d..5883c1836f02 100644
--- a/sound/soc/amd/yc/pci-acp6x.c
+++ b/sound/soc/amd/yc/pci-acp6x.c
@@ -5,6 +5,7 @@
* Copyright 2021 Advanced Micro Devices, Inc.
*/
+#include "linux/compiler_attributes.h"
#include <linux/pci.h>
#include <linux/module.h>
#include <linux/io.h>
@@ -163,6 +164,7 @@ static int snd_acp6x_probe(struct pci_dev *pci,
switch (pci->revision) {
case 0x60:
case 0x6f:
+ case 0x62: /* RPL */
break;
default:
dev_dbg(&pci->dev, "acp6x pci device not found\n");
@@ -208,6 +210,17 @@ static int snd_acp6x_probe(struct pci_dev *pci,
case ACP_CONFIG_15:
dev_info(&pci->dev, "Audio Mode %d\n", val);
break;
+ /* PIN 10 to 14 is reversed for RPL */
+ case ACP_CONFIG_10:
+ case ACP_CONFIG_11:
+ case ACP_CONFIG_12:
+ case ACP_CONFIG_13:
+ case ACP_CONFIG_14:
+ if (pci->revision == 0x62) {
+ dev_info(&pci->dev, "RPL Audio Mode %d\n", val);
+ break;
+ }
+ fallthrough;
default:
adata->res = devm_kzalloc(&pci->dev,
sizeof(struct resource),
--
2.51.2On 2/12/26 5:15 AM, Mingyou Chen wrote:
> Add DMIC support for the AMD RPL platform. The drivers are derived on
> the YC platform driver.
>
> Signed-off-by: Mingyou Chen <qby140326@gmail.com>
> ---
> v2:
> - Reverse ACP CONFIG PIN from 10 to 14 for rpl
> - Remove the rpl folder
> v3:
> - Remove rpl configuration from Kconfig and Makefile
> v4:
> - Handle separate switch case for RPL platform (ACP Pin config)
I didn't realize there was a RPL driver upstream at this point, sorry
about my mistake on the earlier patch. But I do still have a concern
with the approach you're doing considering that. You have way too much
stuff going on in one patch.
I feel that this should be a series with multiple patches.
1) Add support for correct pin config in YC
2) Drop RPL driver
3) Add the quirk for your system
Think it through like this - when I look over your diff for each patch
your changelog should mention exactly what it is going in that
individual patch. If it's covering more than one thing it needs to be
an atomic action and justifiable to happen at once. Otherwise split
each thing to it's own patch.
This is important for a variety of reasons.
1) It makes the work of a reviewer a lot easier.
2) It makes bisection possible to figure out the smallest change that
caused an issue.
>
> sound/soc/amd/Kconfig | 10 -
> sound/soc/amd/Makefile | 1 -
> sound/soc/amd/rpl/Makefile | 5 -
> sound/soc/amd/rpl/rpl-pci-acp6x.c | 227 ------------------
> sound/soc/amd/rpl/rpl_acp6x.h | 36 ---
> .../soc/amd/rpl/rpl_acp6x_chip_offset_byte.h | 30 ---
> sound/soc/amd/yc/acp6x-mach.c | 7 +
> sound/soc/amd/yc/pci-acp6x.c | 13 +
> 8 files changed, 20 insertions(+), 309 deletions(-)
> delete mode 100644 sound/soc/amd/rpl/Makefile
> delete mode 100644 sound/soc/amd/rpl/rpl-pci-acp6x.c
> delete mode 100644 sound/soc/amd/rpl/rpl_acp6x.h
> delete mode 100644 sound/soc/amd/rpl/rpl_acp6x_chip_offset_byte.h
>
> diff --git a/sound/soc/amd/Kconfig b/sound/soc/amd/Kconfig
> index fd35a03aadcb..a6eecbe12e84 100644
> --- a/sound/soc/amd/Kconfig
> +++ b/sound/soc/amd/Kconfig
> @@ -124,16 +124,6 @@ config SND_AMD_ACP_CONFIG
>
> source "sound/soc/amd/acp/Kconfig"
>
> -config SND_SOC_AMD_RPL_ACP6x
> - tristate "AMD Audio Coprocessor-v6.2 RPL support"
> - depends on X86 && PCI
> - help
> - This option enables Audio Coprocessor i.e. ACP v6.2 support on
> - AMD RPL platform. By enabling this flag build will be
> - triggered for ACP PCI driver.
> - Say m if you have such a device.
> - If unsure select "N".
> -
> config SND_SOC_AMD_ACP63_TOPLEVEL
> tristate "support for AMD platforms with ACP version >= 6.3"
> default SND_AMD_ACP_CONFIG
> diff --git a/sound/soc/amd/Makefile b/sound/soc/amd/Makefile
> index 4f89d962cce2..23b25ff0d800 100644
> --- a/sound/soc/amd/Makefile
> +++ b/sound/soc/amd/Makefile
> @@ -17,5 +17,4 @@ obj-$(CONFIG_SND_SOC_AMD_ACP5x) += vangogh/
> obj-$(CONFIG_SND_SOC_AMD_ACP6x) += yc/
> obj-$(CONFIG_SND_AMD_ACP_CONFIG) += acp/
> obj-$(CONFIG_SND_AMD_ACP_CONFIG) += snd-acp-config.o
> -obj-$(CONFIG_SND_SOC_AMD_RPL_ACP6x) += rpl/
> obj-$(CONFIG_SND_SOC_AMD_PS) += ps/
> diff --git a/sound/soc/amd/rpl/Makefile b/sound/soc/amd/rpl/Makefile
> deleted file mode 100644
> index a3825c5be4e7..000000000000
> --- a/sound/soc/amd/rpl/Makefile
> +++ /dev/null
> @@ -1,5 +0,0 @@
> -# SPDX-License-Identifier: GPL-2.0+
> -# RPL platform Support
> -snd-rpl-pci-acp6x-y := rpl-pci-acp6x.o
> -
> -obj-$(CONFIG_SND_SOC_AMD_RPL_ACP6x) += snd-rpl-pci-acp6x.o
> diff --git a/sound/soc/amd/rpl/rpl-pci-acp6x.c b/sound/soc/amd/rpl/rpl-pci-acp6x.c
> deleted file mode 100644
> index e3afe9172bdf..000000000000
> --- a/sound/soc/amd/rpl/rpl-pci-acp6x.c
> +++ /dev/null
> @@ -1,227 +0,0 @@
> -// SPDX-License-Identifier: GPL-2.0+
> -/*
> - * AMD RPL ACP PCI Driver
> - *
> - * Copyright 2022 Advanced Micro Devices, Inc.
> - */
> -
> -#include <linux/pci.h>
> -#include <linux/module.h>
> -#include <linux/io.h>
> -#include <linux/delay.h>
> -#include <linux/platform_device.h>
> -#include <linux/pm_runtime.h>
> -
> -#include "rpl_acp6x.h"
> -
> -struct rpl_dev_data {
> - void __iomem *acp6x_base;
> -};
> -
> -static int rpl_power_on(void __iomem *acp_base)
> -{
> - u32 val;
> - int timeout;
> -
> - val = rpl_acp_readl(acp_base + ACP_PGFSM_STATUS);
> -
> - if (!val)
> - return val;
> -
> - if ((val & ACP_PGFSM_STATUS_MASK) != ACP_POWER_ON_IN_PROGRESS)
> - rpl_acp_writel(ACP_PGFSM_CNTL_POWER_ON_MASK, acp_base + ACP_PGFSM_CONTROL);
> - timeout = 0;
> - while (++timeout < 500) {
> - val = rpl_acp_readl(acp_base + ACP_PGFSM_STATUS);
> - if (!val)
> - return 0;
> - udelay(1);
> - }
> - return -ETIMEDOUT;
> -}
> -
> -static int rpl_reset(void __iomem *acp_base)
> -{
> - u32 val;
> - int timeout;
> -
> - rpl_acp_writel(1, acp_base + ACP_SOFT_RESET);
> - timeout = 0;
> - while (++timeout < 500) {
> - val = rpl_acp_readl(acp_base + ACP_SOFT_RESET);
> - if (val & ACP_SOFT_RESET_SOFTRESET_AUDDONE_MASK)
> - break;
> - cpu_relax();
> - }
> - rpl_acp_writel(0, acp_base + ACP_SOFT_RESET);
> - timeout = 0;
> - while (++timeout < 500) {
> - val = rpl_acp_readl(acp_base + ACP_SOFT_RESET);
> - if (!val)
> - return 0;
> - cpu_relax();
> - }
> - return -ETIMEDOUT;
> -}
> -
> -static int rpl_init(void __iomem *acp_base)
> -{
> - int ret;
> -
> - /* power on */
> - ret = rpl_power_on(acp_base);
> - if (ret) {
> - pr_err("ACP power on failed\n");
> - return ret;
> - }
> - rpl_acp_writel(0x01, acp_base + ACP_CONTROL);
> - /* Reset */
> - ret = rpl_reset(acp_base);
> - if (ret) {
> - pr_err("ACP reset failed\n");
> - return ret;
> - }
> - rpl_acp_writel(0x03, acp_base + ACP_CLKMUX_SEL);
> - return 0;
> -}
> -
> -static int rpl_deinit(void __iomem *acp_base)
> -{
> - int ret;
> -
> - /* Reset */
> - ret = rpl_reset(acp_base);
> - if (ret) {
> - pr_err("ACP reset failed\n");
> - return ret;
> - }
> - rpl_acp_writel(0x00, acp_base + ACP_CLKMUX_SEL);
> - rpl_acp_writel(0x00, acp_base + ACP_CONTROL);
> - return 0;
> -}
> -
> -static int snd_rpl_probe(struct pci_dev *pci,
> - const struct pci_device_id *pci_id)
> -{
> - struct rpl_dev_data *adata;
> - u32 addr;
> - int ret;
> -
> - /* RPL device check */
> - switch (pci->revision) {
> - case 0x62:
> - break;
> - default:
> - dev_dbg(&pci->dev, "acp6x pci device not found\n");
> - return -ENODEV;
> - }
> - if (pci_enable_device(pci)) {
> - dev_err(&pci->dev, "pci_enable_device failed\n");
> - return -ENODEV;
> - }
> -
> - ret = pci_request_regions(pci, "AMD ACP6x audio");
> - if (ret < 0) {
> - dev_err(&pci->dev, "pci_request_regions failed\n");
> - goto disable_pci;
> - }
> -
> - adata = devm_kzalloc(&pci->dev, sizeof(struct rpl_dev_data),
> - GFP_KERNEL);
> - if (!adata) {
> - ret = -ENOMEM;
> - goto release_regions;
> - }
> -
> - addr = pci_resource_start(pci, 0);
> - adata->acp6x_base = devm_ioremap(&pci->dev, addr,
> - pci_resource_len(pci, 0));
> - if (!adata->acp6x_base) {
> - ret = -ENOMEM;
> - goto release_regions;
> - }
> - pci_set_master(pci);
> - pci_set_drvdata(pci, adata);
> - ret = rpl_init(adata->acp6x_base);
> - if (ret)
> - goto release_regions;
> - pm_runtime_set_autosuspend_delay(&pci->dev, ACP_SUSPEND_DELAY_MS);
> - pm_runtime_use_autosuspend(&pci->dev);
> - pm_runtime_put_noidle(&pci->dev);
> - pm_runtime_allow(&pci->dev);
> -
> - return 0;
> -release_regions:
> - pci_release_regions(pci);
> -disable_pci:
> - pci_disable_device(pci);
> -
> - return ret;
> -}
> -
> -static int snd_rpl_suspend(struct device *dev)
> -{
> - struct rpl_dev_data *adata;
> - int ret;
> -
> - adata = dev_get_drvdata(dev);
> - ret = rpl_deinit(adata->acp6x_base);
> - if (ret)
> - dev_err(dev, "ACP de-init failed\n");
> - return ret;
> -}
> -
> -static int snd_rpl_resume(struct device *dev)
> -{
> - struct rpl_dev_data *adata;
> - int ret;
> -
> - adata = dev_get_drvdata(dev);
> - ret = rpl_init(adata->acp6x_base);
> - if (ret)
> - dev_err(dev, "ACP init failed\n");
> - return ret;
> -}
> -
> -static const struct dev_pm_ops rpl_pm = {
> - RUNTIME_PM_OPS(snd_rpl_suspend, snd_rpl_resume, NULL)
> - SYSTEM_SLEEP_PM_OPS(snd_rpl_suspend, snd_rpl_resume)
> -};
> -
> -static void snd_rpl_remove(struct pci_dev *pci)
> -{
> - struct rpl_dev_data *adata;
> - int ret;
> -
> - adata = pci_get_drvdata(pci);
> - ret = rpl_deinit(adata->acp6x_base);
> - if (ret)
> - dev_err(&pci->dev, "ACP de-init failed\n");
> - pm_runtime_forbid(&pci->dev);
> - pm_runtime_get_noresume(&pci->dev);
> - pci_release_regions(pci);
> - pci_disable_device(pci);
> -}
> -
> -static const struct pci_device_id snd_rpl_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_rpl_ids);
> -
> -static struct pci_driver rpl_acp6x_driver = {
> - .name = KBUILD_MODNAME,
> - .id_table = snd_rpl_ids,
> - .probe = snd_rpl_probe,
> - .remove = snd_rpl_remove,
> - .driver = {
> - .pm = pm_ptr(&rpl_pm),
> - }
> -};
> -
> -module_pci_driver(rpl_acp6x_driver);
> -
> -MODULE_DESCRIPTION("AMD ACP RPL PCI driver");
> -MODULE_LICENSE("GPL v2");
> diff --git a/sound/soc/amd/rpl/rpl_acp6x.h b/sound/soc/amd/rpl/rpl_acp6x.h
> deleted file mode 100644
> index f5816a33632e..000000000000
> --- a/sound/soc/amd/rpl/rpl_acp6x.h
> +++ /dev/null
> @@ -1,36 +0,0 @@
> -/* SPDX-License-Identifier: GPL-2.0+ */
> -/*
> - * AMD ACP Driver
> - *
> - * Copyright (C) 2021 Advanced Micro Devices, Inc. All rights reserved.
> - */
> -
> -#include "rpl_acp6x_chip_offset_byte.h"
> -
> -#define ACP_DEVICE_ID 0x15E2
> -#define ACP6x_PHY_BASE_ADDRESS 0x1240000
> -
> -#define ACP_SOFT_RESET_SOFTRESET_AUDDONE_MASK 0x00010001
> -#define ACP_PGFSM_CNTL_POWER_ON_MASK 1
> -#define ACP_PGFSM_CNTL_POWER_OFF_MASK 0
> -#define ACP_PGFSM_STATUS_MASK 3
> -#define ACP_POWERED_ON 0
> -#define ACP_POWER_ON_IN_PROGRESS 1
> -#define ACP_POWERED_OFF 2
> -#define ACP_POWER_OFF_IN_PROGRESS 3
> -
> -#define DELAY_US 5
> -#define ACP_COUNTER 20000
> -
> -/* time in ms for runtime suspend delay */
> -#define ACP_SUSPEND_DELAY_MS 2000
> -
> -static inline u32 rpl_acp_readl(void __iomem *base_addr)
> -{
> - return readl(base_addr - ACP6x_PHY_BASE_ADDRESS);
> -}
> -
> -static inline void rpl_acp_writel(u32 val, void __iomem *base_addr)
> -{
> - writel(val, base_addr - ACP6x_PHY_BASE_ADDRESS);
> -}
> diff --git a/sound/soc/amd/rpl/rpl_acp6x_chip_offset_byte.h b/sound/soc/amd/rpl/rpl_acp6x_chip_offset_byte.h
> deleted file mode 100644
> index 456498f5396d..000000000000
> --- a/sound/soc/amd/rpl/rpl_acp6x_chip_offset_byte.h
> +++ /dev/null
> @@ -1,30 +0,0 @@
> -/* SPDX-License-Identifier: GPL-2.0+ */
> -/*
> - * AMD ACP 6.2 Register Documentation
> - *
> - * Copyright 2022 Advanced Micro Devices, Inc.
> - */
> -
> -#ifndef _rpl_acp6x_OFFSET_HEADER
> -#define _rpl_acp6x_OFFSET_HEADER
> -
> -/* Registers from ACP_CLKRST block */
> -#define ACP_SOFT_RESET 0x1241000
> -#define ACP_CONTROL 0x1241004
> -#define ACP_STATUS 0x1241008
> -#define ACP_DYNAMIC_CG_MASTER_CONTROL 0x1241010
> -#define ACP_PGFSM_CONTROL 0x124101C
> -#define ACP_PGFSM_STATUS 0x1241020
> -#define ACP_CLKMUX_SEL 0x1241024
> -
> -/* Registers from ACP_AON block */
> -#define ACP_PME_EN 0x1241400
> -#define ACP_DEVICE_STATE 0x1241404
> -#define AZ_DEVICE_STATE 0x1241408
> -#define ACP_PIN_CONFIG 0x1241440
> -#define ACP_PAD_PULLUP_CTRL 0x1241444
> -#define ACP_PAD_PULLDOWN_CTRL 0x1241448
> -#define ACP_PAD_DRIVE_STRENGTH_CTRL 0x124144C
> -#define ACP_PAD_SCHMEN_CTRL 0x1241450
> -
> -#endif
> diff --git a/sound/soc/amd/yc/acp6x-mach.c b/sound/soc/amd/yc/acp6x-mach.c
> index 0294177acc66..de49c812124a 100644
> --- a/sound/soc/amd/yc/acp6x-mach.c
> +++ b/sound/soc/amd/yc/acp6x-mach.c
> @@ -45,6 +45,13 @@ static struct snd_soc_card acp6x_card = {
> };
>
> static const struct dmi_system_id yc_acp_quirk_table[] = {
> + {
> + .driver_data = &acp6x_card,
> + .matches = {
> + DMI_MATCH(DMI_BOARD_VENDOR, "Lecoo"),
> + DMI_MATCH(DMI_PRODUCT_NAME, "Bellator N176"),
> + }
> + },
> {
> .driver_data = &acp6x_card,
> .matches = {
> diff --git a/sound/soc/amd/yc/pci-acp6x.c b/sound/soc/amd/yc/pci-acp6x.c
> index 1140ed1cbb3d..5883c1836f02 100644
> --- a/sound/soc/amd/yc/pci-acp6x.c
> +++ b/sound/soc/amd/yc/pci-acp6x.c
> @@ -5,6 +5,7 @@
> * Copyright 2021 Advanced Micro Devices, Inc.
> */
>
> +#include "linux/compiler_attributes.h"
This is really weird - did you mean to include this?
> #include <linux/pci.h>
> #include <linux/module.h>
> #include <linux/io.h>
> @@ -163,6 +164,7 @@ static int snd_acp6x_probe(struct pci_dev *pci,
> switch (pci->revision) {
> case 0x60:
> case 0x6f:
> + case 0x62: /* RPL */
> break;
> default:
> dev_dbg(&pci->dev, "acp6x pci device not found\n");
> @@ -208,6 +210,17 @@ static int snd_acp6x_probe(struct pci_dev *pci,
> case ACP_CONFIG_15:
> dev_info(&pci->dev, "Audio Mode %d\n", val);
> break;
> + /* PIN 10 to 14 is reversed for RPL */
> + case ACP_CONFIG_10:
> + case ACP_CONFIG_11:
> + case ACP_CONFIG_12:
> + case ACP_CONFIG_13:
> + case ACP_CONFIG_14:
> + if (pci->revision == 0x62) {
> + dev_info(&pci->dev, "RPL Audio Mode %d\n", val);
> + break;
> + }
> + fallthrough;
> default:
> adata->res = devm_kzalloc(&pci->dev,
> sizeof(struct resource),
On Thu, Feb 12, 2026 at 07:15:18PM +0800, Mingyou Chen wrote: > Add DMIC support for the AMD RPL platform. The drivers are derived on > the YC platform driver. Please don't send new patches in reply to old patches or serieses, this makes it harder for both people and tools to understand what is going on - it can bury things in mailboxes and make it difficult to keep track of what current patches are, both for the new patches and the old ones.
© 2016 - 2026 Red Hat, Inc.