From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8A84AC8CE; Fri, 13 Feb 2026 03:25:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770953143; cv=none; b=Ei0DyQFGV7mH+/TSDRF2WEnTXYokCvov3Pu0+4xNNCu1MI8DTIfQ9gPDctKJQ5cRns6lwCWcjEK5A8P3EWcA4Nr8tpdbSslZSfnxc9135cqBEI1tnbjVH12aCcQtVE2Rlkar4a5fXpF72x4N1pNf+oVEVZ/lgnWB1xTC1/uqUrE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770953143; c=relaxed/simple; bh=YxnmxEbPS1lCP/S0KpndDnOUQpuuzQrPLiQ60wXsOxo=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=jK0OofPekahx66HGOiVl8vTrBgJ+oP7kxnx5ru0sNZjvJlwYUjO8FJcV6jBUilmSF/FI5rY4hwm216QVplpcZKFaKX/MDr/sahHhJOHjSY7Sd3fTiRwxLK9JOpKx9CGKuhqRadZYufE4T/UU/hagBkhE+lScuyuOEAWbQ8bPXd0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=H0jXqkni; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="H0jXqkni" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 01747C4CEF7; Fri, 13 Feb 2026 03:25:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1770953143; bh=YxnmxEbPS1lCP/S0KpndDnOUQpuuzQrPLiQ60wXsOxo=; h=Date:Subject:To:Cc:References:From:In-Reply-To:From; b=H0jXqknikgTSIKYP5CyFb7/7iHzmDvZKHk4S6w0ty2bjL8Xq72kkciiMGplehKJka G9H5eTwws+1+1f9ek0gncG9leXZSZTzNHKRoBMAzOEjNp9XHzyZUlP2cdsaEUCMbxH h1VbCesOk+mdcKQW/Wkvg/DF+5JAj1V6+NfvefWNMEA4y8rzmOI8i6v/o2UmJhaFO+ TfFCOurp3ZwJKuBKwyE9qesAsU+Rtey8dyy8VSp//VZrntn29jD1kmIRu7oYJfNqYV 0lMuJQtqw+w4ZBYwOJZjCpRTzOYXaw8FHuKlvHDB9BHQf9oHqW8nXOTvaDqCqf/7WR q7B6PH1myxQaQ== Message-ID: Date: Thu, 12 Feb 2026 21:25:40 -0600 Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v5 2/3] ASoC: Drop RPL driver To: Mingyou Chen , vijendar.mukunda@amd.com Cc: broonie@kernel.org, lgirdwood@gmail.com, perex@perex.cz, tiwai@suse.com, venkataprasad.potturu@amd.com, Sunil-kumar.Dommati@amd.com, linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org References: <20260213004246.16615-1-qby140326@gmail.com> <20260213004246.16615-3-qby140326@gmail.com> Content-Language: en-US From: "Mario Limonciello (AMD) (kernel.org)" In-Reply-To: <20260213004246.16615-3-qby140326@gmail.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 2/12/2026 6:42 PM, Mingyou Chen wrote: > The RPL driver is no longer needed because its functionality has been > superseded by the YC driver > > Signed-off-by: Mingyou Chen Reviewed-by: Mario Limonciello (AMD) > --- > 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 --- > 6 files changed, 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 > -#include > -#include > -#include > -#include > -#include > - > -#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