]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
ASoC: Drop RPL driver
authorMingyou Chen <qby140326@gmail.com>
Fri, 13 Feb 2026 05:59:03 +0000 (13:59 +0800)
committerMark Brown <broonie@kernel.org>
Sun, 22 Feb 2026 23:51:51 +0000 (23:51 +0000)
The RPL driver is no longer needed because its functionality has been
superseded by the YC driver

Signed-off-by: Mingyou Chen <qby140326@gmail.com>
Reviewed-by: Mario Limonciello (AMD) <superm1@kernel.org>
Link: https://patch.msgid.link/20260213055904.110256-3-qby140326@gmail.com
Reviewed-by: Vijendar Mukunda <Vijendar.Mukunda@amd.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/amd/Kconfig
sound/soc/amd/Makefile
sound/soc/amd/rpl/Makefile [deleted file]
sound/soc/amd/rpl/rpl-pci-acp6x.c [deleted file]
sound/soc/amd/rpl/rpl_acp6x.h [deleted file]
sound/soc/amd/rpl/rpl_acp6x_chip_offset_byte.h [deleted file]

index f7c3010624df21b965b670a448dfc1496267a085..53139766fafb9ab5c8bdd4496501ce5dc95f793b 100644 (file)
@@ -122,16 +122,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
index 4f89d962cce20cdcc0d3dfb9c82c38d1efefede9..23b25ff0d8005fe10cad1a344977e3377873ef59 100644 (file)
@@ -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 (file)
index a3825c5..0000000
+++ /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 (file)
index e3afe91..0000000
+++ /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 (file)
index f5816a3..0000000
+++ /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 (file)
index 456498f..0000000
+++ /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