mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-20 14:16:02 +00:00
ASoC: amd: add platform devices for acp6.2 pdm driver and dmic driver
ACP6.2 IP has PDM decoder block. Create a platform device for it, so that the PDM platform driver can be bound to this device. Pass PCI resources like MMIO to this platform device. Create a platform device for generic dmic codec driver. Signed-off-by: Syed Saba Kareem <Syed.SabaKareem@amd.com> Signed-off-by: Vijendar Mukunda <Vijendar.Mukunda@amd.com> Link: https://lore.kernel.org/r/20220827165657.2343818-5-Syed.SabaKareem@amd.com Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
parent
9766bb62cf
commit
515ee2574a
2 changed files with 102 additions and 2 deletions
|
@ -8,6 +8,10 @@
|
||||||
#include <sound/acp62_chip_offset_byte.h>
|
#include <sound/acp62_chip_offset_byte.h>
|
||||||
|
|
||||||
#define ACP_DEVICE_ID 0x15E2
|
#define ACP_DEVICE_ID 0x15E2
|
||||||
|
#define ACP6x_REG_START 0x1240000
|
||||||
|
#define ACP6x_REG_END 0x1250200
|
||||||
|
#define ACP6x_DEVS 2
|
||||||
|
#define ACP6x_PDM_MODE 1
|
||||||
|
|
||||||
#define ACP_SOFT_RESET_SOFTRESET_AUDDONE_MASK 0x00010001
|
#define ACP_SOFT_RESET_SOFTRESET_AUDDONE_MASK 0x00010001
|
||||||
#define ACP_PGFSM_CNTL_POWER_ON_MASK 1
|
#define ACP_PGFSM_CNTL_POWER_ON_MASK 1
|
||||||
|
@ -21,6 +25,25 @@
|
||||||
#define ACP_ERROR_MASK 0x20000000
|
#define ACP_ERROR_MASK 0x20000000
|
||||||
#define ACP_EXT_INTR_STAT_CLEAR_MASK 0xFFFFFFFF
|
#define ACP_EXT_INTR_STAT_CLEAR_MASK 0xFFFFFFFF
|
||||||
|
|
||||||
|
enum acp_config {
|
||||||
|
ACP_CONFIG_0 = 0,
|
||||||
|
ACP_CONFIG_1,
|
||||||
|
ACP_CONFIG_2,
|
||||||
|
ACP_CONFIG_3,
|
||||||
|
ACP_CONFIG_4,
|
||||||
|
ACP_CONFIG_5,
|
||||||
|
ACP_CONFIG_6,
|
||||||
|
ACP_CONFIG_7,
|
||||||
|
ACP_CONFIG_8,
|
||||||
|
ACP_CONFIG_9,
|
||||||
|
ACP_CONFIG_10,
|
||||||
|
ACP_CONFIG_11,
|
||||||
|
ACP_CONFIG_12,
|
||||||
|
ACP_CONFIG_13,
|
||||||
|
ACP_CONFIG_14,
|
||||||
|
ACP_CONFIG_15,
|
||||||
|
};
|
||||||
|
|
||||||
static inline u32 acp62_readl(void __iomem *base_addr)
|
static inline u32 acp62_readl(void __iomem *base_addr)
|
||||||
{
|
{
|
||||||
return readl(base_addr);
|
return readl(base_addr);
|
||||||
|
|
|
@ -9,11 +9,16 @@
|
||||||
#include <linux/module.h>
|
#include <linux/module.h>
|
||||||
#include <linux/io.h>
|
#include <linux/io.h>
|
||||||
#include <linux/delay.h>
|
#include <linux/delay.h>
|
||||||
|
#include <linux/platform_device.h>
|
||||||
|
#include <linux/acpi.h>
|
||||||
|
|
||||||
#include "acp62.h"
|
#include "acp62.h"
|
||||||
|
|
||||||
struct acp62_dev_data {
|
struct acp62_dev_data {
|
||||||
void __iomem *acp62_base;
|
void __iomem *acp62_base;
|
||||||
|
struct resource *res;
|
||||||
|
bool acp62_audio_mode;
|
||||||
|
struct platform_device *pdev[ACP6x_DEVS];
|
||||||
};
|
};
|
||||||
|
|
||||||
static int acp62_power_on(void __iomem *acp_base)
|
static int acp62_power_on(void __iomem *acp_base)
|
||||||
|
@ -114,8 +119,12 @@ static int snd_acp62_probe(struct pci_dev *pci,
|
||||||
const struct pci_device_id *pci_id)
|
const struct pci_device_id *pci_id)
|
||||||
{
|
{
|
||||||
struct acp62_dev_data *adata;
|
struct acp62_dev_data *adata;
|
||||||
|
struct platform_device_info pdevinfo[ACP6x_DEVS];
|
||||||
|
int index, ret;
|
||||||
|
int val = 0x00;
|
||||||
|
struct acpi_device *adev;
|
||||||
|
const union acpi_object *obj;
|
||||||
u32 addr;
|
u32 addr;
|
||||||
int ret;
|
|
||||||
|
|
||||||
/* Pink Sardine device check */
|
/* Pink Sardine device check */
|
||||||
switch (pci->revision) {
|
switch (pci->revision) {
|
||||||
|
@ -154,8 +163,72 @@ static int snd_acp62_probe(struct pci_dev *pci,
|
||||||
ret = acp62_init(adata->acp62_base, &pci->dev);
|
ret = acp62_init(adata->acp62_base, &pci->dev);
|
||||||
if (ret)
|
if (ret)
|
||||||
goto release_regions;
|
goto release_regions;
|
||||||
|
val = acp62_readl(adata->acp62_base + ACP_PIN_CONFIG);
|
||||||
|
switch (val) {
|
||||||
|
case ACP_CONFIG_0:
|
||||||
|
case ACP_CONFIG_1:
|
||||||
|
case ACP_CONFIG_2:
|
||||||
|
case ACP_CONFIG_3:
|
||||||
|
case ACP_CONFIG_9:
|
||||||
|
case ACP_CONFIG_15:
|
||||||
|
dev_info(&pci->dev, "Audio Mode %d\n", val);
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
|
||||||
|
/* Checking DMIC hardware*/
|
||||||
|
adev = acpi_find_child_device(ACPI_COMPANION(&pci->dev), 0x02, 0);
|
||||||
|
|
||||||
|
if (!adev)
|
||||||
|
break;
|
||||||
|
|
||||||
|
if (!acpi_dev_get_property(adev, "acp-audio-device-type",
|
||||||
|
ACPI_TYPE_INTEGER, &obj) &&
|
||||||
|
obj->integer.value == 2) {
|
||||||
|
adata->res = devm_kzalloc(&pci->dev, sizeof(struct resource), GFP_KERNEL);
|
||||||
|
if (!adata->res) {
|
||||||
|
ret = -ENOMEM;
|
||||||
|
goto de_init;
|
||||||
|
}
|
||||||
|
|
||||||
|
adata->res->name = "acp_iomem";
|
||||||
|
adata->res->flags = IORESOURCE_MEM;
|
||||||
|
adata->res->start = addr;
|
||||||
|
adata->res->end = addr + (ACP6x_REG_END - ACP6x_REG_START);
|
||||||
|
adata->acp62_audio_mode = ACP6x_PDM_MODE;
|
||||||
|
|
||||||
|
memset(&pdevinfo, 0, sizeof(pdevinfo));
|
||||||
|
pdevinfo[0].name = "acp_ps_pdm_dma";
|
||||||
|
pdevinfo[0].id = 0;
|
||||||
|
pdevinfo[0].parent = &pci->dev;
|
||||||
|
pdevinfo[0].num_res = 1;
|
||||||
|
pdevinfo[0].res = adata->res;
|
||||||
|
|
||||||
|
pdevinfo[1].name = "dmic-codec";
|
||||||
|
pdevinfo[1].id = 0;
|
||||||
|
pdevinfo[1].parent = &pci->dev;
|
||||||
|
|
||||||
|
for (index = 0; index < ACP6x_DEVS; index++) {
|
||||||
|
adata->pdev[index] =
|
||||||
|
platform_device_register_full(&pdevinfo[index]);
|
||||||
|
|
||||||
|
if (IS_ERR(adata->pdev[index])) {
|
||||||
|
dev_err(&pci->dev,
|
||||||
|
"cannot register %s device\n",
|
||||||
|
pdevinfo[index].name);
|
||||||
|
ret = PTR_ERR(adata->pdev[index]);
|
||||||
|
goto unregister_devs;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
return 0;
|
return 0;
|
||||||
|
unregister_devs:
|
||||||
|
for (--index; index >= 0; index--)
|
||||||
|
platform_device_unregister(adata->pdev[index]);
|
||||||
|
de_init:
|
||||||
|
if (acp62_deinit(adata->acp62_base, &pci->dev))
|
||||||
|
dev_err(&pci->dev, "ACP de-init failed\n");
|
||||||
release_regions:
|
release_regions:
|
||||||
pci_release_regions(pci);
|
pci_release_regions(pci);
|
||||||
disable_pci:
|
disable_pci:
|
||||||
|
@ -167,9 +240,13 @@ static int snd_acp62_probe(struct pci_dev *pci,
|
||||||
static void snd_acp62_remove(struct pci_dev *pci)
|
static void snd_acp62_remove(struct pci_dev *pci)
|
||||||
{
|
{
|
||||||
struct acp62_dev_data *adata;
|
struct acp62_dev_data *adata;
|
||||||
int ret;
|
int ret, index;
|
||||||
|
|
||||||
adata = pci_get_drvdata(pci);
|
adata = pci_get_drvdata(pci);
|
||||||
|
if (adata->acp62_audio_mode == ACP6x_PDM_MODE) {
|
||||||
|
for (index = 0; index < ACP6x_DEVS; index++)
|
||||||
|
platform_device_unregister(adata->pdev[index]);
|
||||||
|
}
|
||||||
ret = acp62_deinit(adata->acp62_base, &pci->dev);
|
ret = acp62_deinit(adata->acp62_base, &pci->dev);
|
||||||
if (ret)
|
if (ret)
|
||||||
dev_err(&pci->dev, "ACP de-init failed\n");
|
dev_err(&pci->dev, "ACP de-init failed\n");
|
||||||
|
|
Loading…
Reference in a new issue