| Message ID | 20220812120731.788052-5-Syed.SabaKareem@amd.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Add Pink Sardine platform ASoC driver | expand |
On 8/12/2022 2:07 PM, Syed Saba kareem wrote: > 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> > --- > sound/soc/amd/ps/acp62.h | 23 +++++++++++ > sound/soc/amd/ps/pci-ps.c | 83 ++++++++++++++++++++++++++++++++++++++- > 2 files changed, 104 insertions(+), 2 deletions(-) > > diff --git a/sound/soc/amd/ps/acp62.h b/sound/soc/amd/ps/acp62.h > index 8e734f190b11..ab56e1f8c31b 100644 > --- a/sound/soc/amd/ps/acp62.h > +++ b/sound/soc/amd/ps/acp62.h > @@ -9,6 +9,10 @@ > > #define ACP_DEVICE_ID 0x15E2 > #define ACP62_PHY_BASE_ADDRESS 0x1240000 > +#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_PGFSM_CNTL_POWER_ON_MASK 1 > @@ -22,6 +26,25 @@ > #define ACP_ERROR_MASK 0x20000000 > #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) > { > return readl(base_addr - ACP62_PHY_BASE_ADDRESS); > diff --git a/sound/soc/amd/ps/pci-ps.c b/sound/soc/amd/ps/pci-ps.c > index 2014f415af15..94201f75427a 100644 > --- a/sound/soc/amd/ps/pci-ps.c > +++ b/sound/soc/amd/ps/pci-ps.c > @@ -9,11 +9,16 @@ > #include <linux/module.h> > #include <linux/io.h> > #include <linux/delay.h> > +#include <linux/platform_device.h> > +#include <linux/acpi.h> > > #include "acp62.h" > > struct acp62_dev_data { > 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) > @@ -117,8 +122,11 @@ static int snd_acp62_probe(struct pci_dev *pci, > const struct pci_device_id *pci_id) > { > struct acp62_dev_data *adata; > + struct platform_device_info pdevinfo[ACP6x_DEVS]; > + int index, ret; > + int val = 0x00; > + struct acpi_device *adev; > u32 addr; > - int ret; > > /* Pink Sardine device check */ > switch (pci->revision) { > @@ -157,8 +165,75 @@ static int snd_acp62_probe(struct pci_dev *pci, > ret = acp62_init(adata->acp62_base); > if (ret) > 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); > + You can probably remove one level of indentation in following code if you do: if (!adev) break; > + if (adev) { > + const union acpi_object *obj; > + > + 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; > +unregister_devs: > + for (--index; index >= 0; index--) > + platform_device_unregister(adata->pdev[index]); > +de_init: > + if (acp62_deinit(adata->acp62_base)) > + dev_err(&pci->dev, "ACP de-init failed\n"); > release_regions: > pci_release_regions(pci); > disable_pci: > @@ -170,9 +245,13 @@ static int snd_acp62_probe(struct pci_dev *pci, > static void snd_acp62_remove(struct pci_dev *pci) > { > struct acp62_dev_data *adata; > - int ret; > + int ret, index; > > 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); > if (ret) > dev_err(&pci->dev, "ACP de-init failed\n");
On 8/12/22 19:50, Amadeusz Sławiński wrote: > [CAUTION: External Email] > > On 8/12/2022 2:07 PM, Syed Saba kareem wrote: >> 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> >> --- >> sound/soc/amd/ps/acp62.h | 23 +++++++++++ >> sound/soc/amd/ps/pci-ps.c | 83 ++++++++++++++++++++++++++++++++++++++- >> 2 files changed, 104 insertions(+), 2 deletions(-) >> >> diff --git a/sound/soc/amd/ps/acp62.h b/sound/soc/amd/ps/acp62.h >> index 8e734f190b11..ab56e1f8c31b 100644 >> --- a/sound/soc/amd/ps/acp62.h >> +++ b/sound/soc/amd/ps/acp62.h >> @@ -9,6 +9,10 @@ >> >> #define ACP_DEVICE_ID 0x15E2 >> #define ACP62_PHY_BASE_ADDRESS 0x1240000 >> +#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_PGFSM_CNTL_POWER_ON_MASK 1 >> @@ -22,6 +26,25 @@ >> #define ACP_ERROR_MASK 0x20000000 >> #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) >> { >> return readl(base_addr - ACP62_PHY_BASE_ADDRESS); >> diff --git a/sound/soc/amd/ps/pci-ps.c b/sound/soc/amd/ps/pci-ps.c >> index 2014f415af15..94201f75427a 100644 >> --- a/sound/soc/amd/ps/pci-ps.c >> +++ b/sound/soc/amd/ps/pci-ps.c >> @@ -9,11 +9,16 @@ >> #include <linux/module.h> >> #include <linux/io.h> >> #include <linux/delay.h> >> +#include <linux/platform_device.h> >> +#include <linux/acpi.h> >> >> #include "acp62.h" >> >> struct acp62_dev_data { >> 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) >> @@ -117,8 +122,11 @@ static int snd_acp62_probe(struct pci_dev *pci, >> const struct pci_device_id *pci_id) >> { >> struct acp62_dev_data *adata; >> + struct platform_device_info pdevinfo[ACP6x_DEVS]; >> + int index, ret; >> + int val = 0x00; >> + struct acpi_device *adev; >> u32 addr; >> - int ret; >> >> /* Pink Sardine device check */ >> switch (pci->revision) { >> @@ -157,8 +165,75 @@ static int snd_acp62_probe(struct pci_dev *pci, >> ret = acp62_init(adata->acp62_base); >> if (ret) >> 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); >> + > > You can probably remove one level of indentation in following code if > you do: > if (!adev) > break; > Okay Will use this logic. >> + if (adev) { >> + const union acpi_object *obj; >> + >> + 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; >> +unregister_devs: >> + for (--index; index >= 0; index--) >> + platform_device_unregister(adata->pdev[index]); >> +de_init: >> + if (acp62_deinit(adata->acp62_base)) >> + dev_err(&pci->dev, "ACP de-init failed\n"); >> release_regions: >> pci_release_regions(pci); >> disable_pci: >> @@ -170,9 +245,13 @@ static int snd_acp62_probe(struct pci_dev *pci, >> static void snd_acp62_remove(struct pci_dev *pci) >> { >> struct acp62_dev_data *adata; >> - int ret; >> + int ret, index; >> >> 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); >> if (ret) >> dev_err(&pci->dev, "ACP de-init failed\n"); >
diff --git a/sound/soc/amd/ps/acp62.h b/sound/soc/amd/ps/acp62.h index 8e734f190b11..ab56e1f8c31b 100644 --- a/sound/soc/amd/ps/acp62.h +++ b/sound/soc/amd/ps/acp62.h @@ -9,6 +9,10 @@ #define ACP_DEVICE_ID 0x15E2 #define ACP62_PHY_BASE_ADDRESS 0x1240000 +#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_PGFSM_CNTL_POWER_ON_MASK 1 @@ -22,6 +26,25 @@ #define ACP_ERROR_MASK 0x20000000 #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) { return readl(base_addr - ACP62_PHY_BASE_ADDRESS); diff --git a/sound/soc/amd/ps/pci-ps.c b/sound/soc/amd/ps/pci-ps.c index 2014f415af15..94201f75427a 100644 --- a/sound/soc/amd/ps/pci-ps.c +++ b/sound/soc/amd/ps/pci-ps.c @@ -9,11 +9,16 @@ #include <linux/module.h> #include <linux/io.h> #include <linux/delay.h> +#include <linux/platform_device.h> +#include <linux/acpi.h> #include "acp62.h" struct acp62_dev_data { 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) @@ -117,8 +122,11 @@ static int snd_acp62_probe(struct pci_dev *pci, const struct pci_device_id *pci_id) { struct acp62_dev_data *adata; + struct platform_device_info pdevinfo[ACP6x_DEVS]; + int index, ret; + int val = 0x00; + struct acpi_device *adev; u32 addr; - int ret; /* Pink Sardine device check */ switch (pci->revision) { @@ -157,8 +165,75 @@ static int snd_acp62_probe(struct pci_dev *pci, ret = acp62_init(adata->acp62_base); if (ret) 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) { + const union acpi_object *obj; + + 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; +unregister_devs: + for (--index; index >= 0; index--) + platform_device_unregister(adata->pdev[index]); +de_init: + if (acp62_deinit(adata->acp62_base)) + dev_err(&pci->dev, "ACP de-init failed\n"); release_regions: pci_release_regions(pci); disable_pci: @@ -170,9 +245,13 @@ static int snd_acp62_probe(struct pci_dev *pci, static void snd_acp62_remove(struct pci_dev *pci) { struct acp62_dev_data *adata; - int ret; + int ret, index; 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); if (ret) dev_err(&pci->dev, "ACP de-init failed\n");