Add driver for SAMA7G5's PDMC
Subsystems (7)
v3 cover Add driver for SAMA7G5's PDMC
This patch series adds support for Pulse Density Microphone Controller (PDMC), present on Microchip's SAMA7G5.
The PDMC interfaces up to 4 digital microphones having Pulse Density Modulated (PDM) outputs. It generates a single clock line and samples 1 or 2 data lines. The signal path includes an audio grade programmable decimation filter and outputs 24-bit audio words.
The source of each channel can be independently defined as PDMC_DS0 or PDMC_DS1, sampled at the rising or falling edge of PDMC_CLK.
The patch series starts with a fix on the ASoC DMA engine support. Then continues with the bindings and the driver of PDMC. It is followed by the DT nodes for SAMA7G5 and SAMA7G5-EK. In the end, the drivers for PDMC and PDM microphones are enabled in sama7_defconfig.
Changes in v3:
- addressed new DT bindings comments from Krzysztof Kozlowski
Changes in v2:
- addressed DT bindings comments from Krzysztof Kozlowski
Codrin Ciubotariu (6):
ASoC: dmaengine: do not use a NULL prepare_slave_config() callback
ASoC: dt-bindings: Document Microchip's PDMC
ASoC: atmel: mchp-pdmc: add PDMC driver
ARM: dts: at91: sama7g5: add nodes for PDMC
ARM: dts: at91: sama7g5ek: add node for PDMC0
ARM: configs: at91: sama7_defconfig: add MCHP PDMC and DMIC drivers
.../bindings/sound/microchip,pdmc.yaml | 100 ++ arch/arm/boot/dts/at91-sama7g5ek.dts | 21 +- arch/arm/boot/dts/sama7g5.dtsi | 24 + arch/arm/configs/sama7_defconfig | 2 + include/dt-bindings/sound/microchip,pdmc.h | 13 + sound/soc/atmel/Kconfig | 16 + sound/soc/atmel/Makefile | 2 + sound/soc/atmel/mchp-pdmc.c | 1084 +++++++++++++++++ sound/soc/soc-generic-dmaengine-pcm.c | 6 +- 9 files changed, 1264 insertions(+), 4 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/microchip,pdmc.yaml create mode 100644 include/dt-bindings/sound/microchip,pdmc.h create mode 100644 sound/soc/atmel/mchp-pdmc.c
Signature · 1 line
2.32.0
PATCH v3 1/6 ASoC: dmaengine: do not use a NULL prepare_slave_config() callback
Even if struct snd_dmaengine_pcm_config is used, prepare_slave_config() callback might not be set. Check if this callback is set before using it.
---
Changes in v2,v3:
- none
sound/soc/soc-generic-dmaengine-pcm.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
sound/soc/soc-generic-dmaengine-pcm.c +3 -3
@@ -86,10 +86,10 @@ static int dmaengine_pcm_hw_params(struct snd_soc_component *component,memset (&slave_config,0 ,sizeof (slave_config)); -if (!pcm->config) - prepare_slave_config = snd_dmaengine_pcm_prepare_slave_config; -else +if (pcm->config && pcm->config->prepare_slave_config) prepare_slave_config = pcm->config->prepare_slave_config; +else + prepare_slave_config = snd_dmaengine_pcm_prepare_slave_config;if (prepare_slave_config) {int ret =prepare_slave_config (substream, params, &slave_config);
Signature · 1 line
2.32.0
Re: [PATCH v3 1/6] ASoC: dmaengine: do not use a NULL prepare_slave_config() callback
Hi,
Quoted 21 lines · Codrin Ciubotariu
Even if struct
snd_dmaengine_pcm_configis used,prepare_slave_config()callback might not be set. Check if this callback is set before using it.Fixes fa654e085300 ("ASoC: dmaengine-pcm: Provide default config")Signed-off-by Codrin Ciubotariu <[email protected]>---
Changes in v2,v3:
- nonesound/soc/soc-generic-dmaengine-pcm.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)sound/soc/soc-generic-dmaengine-pcm.c +0
-0@@ -86,10 +86,10 @@ static int dmaengine_pcm_hw_params(struct snd_soc_component *component,memset (&slave_config,0 ,sizeof (slave_config));
sound/soc/soc-generic-dmaengine-pcm.c static int dmaengine_pcm_hw_params(struct snd_soc_component *component, · line 95
Quoted 10 lines
sound/soc/soc-generic-dmaengine-pcm.c +3
-3-if (!pcm->config) - prepare_slave_config = snd_dmaengine_pcm_prepare_slave_config; -else +if (pcm->config && pcm->config->prepare_slave_config) prepare_slave_config = pcm->config->prepare_slave_config; +else + prepare_slave_config = snd_dmaengine_pcm_prepare_slave_config;if (prepare_slave_config) {int ret =prepare_slave_config (substream, params, &slave_config);
I wonder if this patch is correct. There are drivers like sound/soc/mxs/mxs-pcm.c which call snd_dmaengine_pcm_register() with a config which has the prepare_slave_config callback unset. For these drivers dmaengine_pcm_hw_params() previously was a no-op. Now with this patch snd_dmaengine_pcm_prepare_slave_config() and dmaengine_slave_config() are called. At least for the mxs-pcm driver calling dmaengine_slave_config() will return -ENOSYS.
At least the "Check if this callback is set before using it" part is wrong, the callback is checked before using it with
if (prepare_slave_config) {
...
}I don't have any mxs hardware at hand to test this. I just stumbled upon the change of behaviour when rebasing
https://patchwork.kernel.org/project/alsa-devel/patch/[email protected]/
on current master.
Sascha
Signature · 4 lines
Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
Re: [PATCH v3 1/6] ASoC: dmaengine: do not use a NULL prepare_slave_config() callback
Quoted 3 lines · Sascha Hauer
EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
Hi,
Hi Sascha,
Quoted 45 lines · Codrin Ciubotariu
Quoted 21 lines
Even if struct
snd_dmaengine_pcm_configis used,prepare_slave_config()callback might not be set. Check if this callback is set before using it.Fixes fa654e085300 ("ASoC: dmaengine-pcm: Provide default config")Signed-off-by Codrin Ciubotariu <[email protected]>---
Changes in v2,v3:
- nonesound/soc/soc-generic-dmaengine-pcm.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)sound/soc/soc-generic-dmaengine-pcm.c +0
-0@@ -86,10 +86,10 @@ static int dmaengine_pcm_hw_params(struct snd_soc_component *component,memset (&slave_config,0 ,sizeof (slave_config));sound/soc/soc-generic-dmaengine-pcm.c static int dmaengine_pcm_hw_params(struct snd_soc_component *component, · line 95
Quoted 10 lines
sound/soc/soc-generic-dmaengine-pcm.c +3
-3-if (!pcm->config) - prepare_slave_config = snd_dmaengine_pcm_prepare_slave_config; -else +if (pcm->config && pcm->config->prepare_slave_config) prepare_slave_config = pcm->config->prepare_slave_config; +else + prepare_slave_config = snd_dmaengine_pcm_prepare_slave_config;if (prepare_slave_config) {int ret =prepare_slave_config (substream, params, &slave_config);I wonder if this patch is correct. There are drivers like
sound/soc/mxs/mxs-pcm.cwhich callsnd_dmaengine_pcm_register()with a config which has theprepare_slave_configcallback unset. For these driversdmaengine_pcm_hw_params()previously was a no-op. Now with this patchsnd_dmaengine_pcm_prepare_slave_config()anddmaengine_slave_config()are called. At least for the mxs-pcm driver callingdmaengine_slave_config()will return-ENOSYS.At least the "Check if this callback is set before using it" part is wrong, the callback is checked before using it with
Quoted 8 lines
if (prepare_slave_config) { ... }I don't have any mxs hardware at hand to test this. I just stumbled upon the change of behaviour when rebasing
https://patchwork.kernel.org/project/alsa-devel/patch/[email protected]/
on current master.
You are right. I changed the behavior from:
if (pmc->config && !pcm->config->prepare_slave_config)
<do nothing>
to:
if (pmc->config && !pcm->config->prepare_slave_config)
snd_dmaengine_pcm_prepare_slave_config()
It was not intended and I agree that the commit message is not accurate. I guess some drivers might not need dmaengine_slave_config()... However, in my case, for the mchp-pdmc driver, I do have pcm->config with pcm->config->prepare_slave_config NULL, but I still need snd_dmaengine_pcm_prepare_slave_config() to be called. Should we add a separate flag to call snd_dmaengine_pcm_prepare_slave_config() if pcm->config->prepare_slave_config is NULL?
Nice catch!
Best regards,
Codrin
Re: [PATCH v3 1/6] ASoC: dmaengine: do not use a NULL prepare_slave_config() callback
Quoted 68 lines · On Wed, Apr 20, 2022 at 09:58:06AM +0000, [email protected] wrote:
Quoted 3 lines · Sascha Hauer
EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
Hi,
Hi Sascha,
Quoted 45 lines · Codrin Ciubotariu
Quoted 21 lines
Even if struct
snd_dmaengine_pcm_configis used,prepare_slave_config()callback might not be set. Check if this callback is set before using it.Fixes fa654e085300 ("ASoC: dmaengine-pcm: Provide default config")Signed-off-by Codrin Ciubotariu <[email protected]>---
Changes in v2,v3:
- nonesound/soc/soc-generic-dmaengine-pcm.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)sound/soc/soc-generic-dmaengine-pcm.c +0
-0@@ -86,10 +86,10 @@ static int dmaengine_pcm_hw_params(struct snd_soc_component *component,memset (&slave_config,0 ,sizeof (slave_config));sound/soc/soc-generic-dmaengine-pcm.c static int dmaengine_pcm_hw_params(struct snd_soc_component *component, · line 95
Quoted 10 lines
sound/soc/soc-generic-dmaengine-pcm.c +3
-3-if (!pcm->config) - prepare_slave_config = snd_dmaengine_pcm_prepare_slave_config; -else +if (pcm->config && pcm->config->prepare_slave_config) prepare_slave_config = pcm->config->prepare_slave_config; +else + prepare_slave_config = snd_dmaengine_pcm_prepare_slave_config;if (prepare_slave_config) {int ret =prepare_slave_config (substream, params, &slave_config);I wonder if this patch is correct. There are drivers like
sound/soc/mxs/mxs-pcm.cwhich callsnd_dmaengine_pcm_register()with a config which has theprepare_slave_configcallback unset. For these driversdmaengine_pcm_hw_params()previously was a no-op. Now with this patchsnd_dmaengine_pcm_prepare_slave_config()anddmaengine_slave_config()are called. At least for the mxs-pcm driver callingdmaengine_slave_config()will return-ENOSYS.At least the "Check if this callback is set before using it" part is wrong, the callback is checked before using it with
Quoted 8 lines
if (prepare_slave_config) { ... }I don't have any mxs hardware at hand to test this. I just stumbled upon the change of behaviour when rebasing
https://patchwork.kernel.org/project/alsa-devel/patch/[email protected]/
on current master.You are right. I changed the behavior from:
if (pmc->config&& !pcm->config->prepare_slave_config)
<do nothing>
to:
if (pmc->config&& !pcm->config->prepare_slave_config)
snd_dmaengine_pcm_prepare_slave_config()
Quoted 7 lines
It was not intended and I agree that the commit message is not accurate. I guess some drivers might not need
dmaengine_slave_config()... However, in my case, for the mchp-pdmc driver, I do havepcm->configwithpcm->config->prepare_slave_configNULL, but I still needsnd_dmaengine_pcm_prepare_slave_config()to be called. Should we add a separate flag to callsnd_dmaengine_pcm_prepare_slave_config()ifpcm->config->prepare_slave_configis NULL?
Other drivers set pcm->config->prepare_slave_config to snd_dmaengine_pcm_prepare_slave_config() explicitly:
sound/soc/fsl/imx-pcm-dma.c:33: .prepare_slave_config = snd_dmaengine_pcm_prepare_slave_config,
I think that's the way to go.
Regards,
Sascha
Signature · 4 lines
Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
Re: [PATCH v3 1/6] ASoC: dmaengine: do not use a NULL prepare_slave_config() callback
Quoted 79 lines · Sascha Hauer
EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
Quoted 68 lines · On Wed, Apr 20, 2022 at 09:58:06AM +0000, [email protected] wrote:
Quoted 3 lines · Sascha Hauer
EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
Hi,
Hi Sascha,
Quoted 45 lines · Codrin Ciubotariu
Quoted 21 lines
Even if struct
snd_dmaengine_pcm_configis used,prepare_slave_config()callback might not be set. Check if this callback is set before using it.Fixes fa654e085300 ("ASoC: dmaengine-pcm: Provide default config")Signed-off-by Codrin Ciubotariu <[email protected]>---
Changes in v2,v3:
- nonesound/soc/soc-generic-dmaengine-pcm.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)sound/soc/soc-generic-dmaengine-pcm.c +0
-0@@ -86,10 +86,10 @@ static int dmaengine_pcm_hw_params(struct snd_soc_component *component,memset (&slave_config,0 ,sizeof (slave_config));sound/soc/soc-generic-dmaengine-pcm.c static int dmaengine_pcm_hw_params(struct snd_soc_component *component, · line 95
Quoted 10 lines
sound/soc/soc-generic-dmaengine-pcm.c +3
-3-if (!pcm->config) - prepare_slave_config = snd_dmaengine_pcm_prepare_slave_config; -else +if (pcm->config && pcm->config->prepare_slave_config) prepare_slave_config = pcm->config->prepare_slave_config; +else + prepare_slave_config = snd_dmaengine_pcm_prepare_slave_config;if (prepare_slave_config) {int ret =prepare_slave_config (substream, params, &slave_config);I wonder if this patch is correct. There are drivers like
sound/soc/mxs/mxs-pcm.cwhich callsnd_dmaengine_pcm_register()with a config which has theprepare_slave_configcallback unset. For these driversdmaengine_pcm_hw_params()previously was a no-op. Now with this patchsnd_dmaengine_pcm_prepare_slave_config()anddmaengine_slave_config()are called. At least for the mxs-pcm driver callingdmaengine_slave_config()will return-ENOSYS.At least the "Check if this callback is set before using it" part is wrong, the callback is checked before using it with
Quoted 8 lines
if (prepare_slave_config) { ... }I don't have any mxs hardware at hand to test this. I just stumbled upon the change of behaviour when rebasing
https://patchwork.kernel.org/project/alsa-devel/patch/[email protected]/
on current master.You are right. I changed the behavior from:
if (pmc->config&& !pcm->config->prepare_slave_config)
<do nothing>
to:
if (pmc->config&& !pcm->config->prepare_slave_config)
snd_dmaengine_pcm_prepare_slave_config()Quoted 7 lines
It was not intended and I agree that the commit message is not accurate. I guess some drivers might not need
dmaengine_slave_config()... However, in my case, for the mchp-pdmc driver, I do havepcm->configwithpcm->config->prepare_slave_configNULL, but I still needsnd_dmaengine_pcm_prepare_slave_config()to be called. Should we add a separate flag to callsnd_dmaengine_pcm_prepare_slave_config()ifpcm->config->prepare_slave_configis NULL?
Quoted 6 lines
Other drivers set
pcm->config->prepare_slave_configtosnd_dmaengine_pcm_prepare_slave_config()explicitly:
sound/soc/fsl/imx-pcm-dma.c:33: .prepare_slave_config =snd_dmaengine_pcm_prepare_slave_config,I think that's the way to go.
That's more elegant, right. I will revert this patch and use your suggestion for the mchp-pdmc driver.
Thanks and best regards,
Codrin
PATCH v3 2/6 ASoC: dt-bindings: Document Microchip's PDMC
In reply to Codrin CiubotariuAdd DT bindings for the new Microchip PDMC embedded in sama7g5 SoCs.
---
Changes in v3:
- set line length to 80 characters long
- set 'reg' as the second property
Changes in v2:
- renamed patch from 'ASoC: add DT bindings for Microchip PDMC' to 'ASoC: dt-bindings: Document Microchip's PDMC';
- renamed yaml file from 'mchp,pdmc.yaml' to 'microchip,pdmc.yaml';
- used imperative mode in commit description;
- renamed mchp,pdmc.h to microchip,pdmc.h;
- fixed 'title' to represent HW;
- made 'compatible' first property;
- s/microhpone/microphone
- none name in example set to 'sound'
.../bindings/sound/microchip,pdmc.yaml | 100 ++++++++++++++++++ include/dt-bindings/sound/microchip,pdmc.h | 13 +++ 2 files changed, 113 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/microchip,pdmc.yaml create mode 100644 include/dt-bindings/sound/microchip,pdmc.h
Documentation/devicetree/bindings/sound/microchip,pdmc.yaml new file +100 -0
@@ -0,0 +1,100 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/sound/microchip,pdmc.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Microchip Pulse Density Microphone Controller + +maintainers: + - Codrin Ciubotariu <[email protected]> + +description: + The Microchip Pulse Density Microphone Controller (PDMC) interfaces up to 4 + digital microphones having Pulse Density Modulated (PDM) outputs. + +properties: + compatible: + const: microchip,sama7g5-pdmc + + reg: + maxItems: 1 + + "#sound-dai-cells": + const: 0 + + interrupts: + maxItems: 1 + + clocks: + items: + - description: Peripheral Bus Clock + - description: Generic Clock + + clock-names: + items: + - const: pclk + - const: gclk + + dmas: + description: RX DMA Channel + maxItems: 1 + + dma-names: + const: rx + + microchip,mic-pos: + description: | + Position of PDM microphones on the DS line and the sampling edge (rising + or falling) of the CLK line. A microphone is represented as a pair of DS + line and the sampling edge. The first microphone is mapped to channel 0, + the second to channel 1, etc. + $ref: /schemas/types.yaml#/definitions/uint32-matrix + items: + items: + - description: value for DS line + - description: value for sampling edge + anyOf: + - enum: + - [0, 0] + - [0, 1] + - [1, 0] + - [1, 1] + minItems: 1 + maxItems: 4 + uniqueItems: true + +required: + - compatible + - reg + - "#sound-dai-cells" + - interrupts + - clocks + - clock-names + - dmas + - dma-names + - microchip,mic-pos + +additionalProperties: false + +examples: + - | + #include <dt-bindings/clock/at91.h> + #include <dt-bindings/dma/at91.h> + #include <dt-bindings/interrupt-controller/arm-gic.h> + #include <dt-bindings/sound/microchip,pdmc.h> + + pdmc: sound@e1608000 { + compatible = "microchip,sama7g5-pdmc"; + reg = <0xe1608000 0x4000>; + #sound-dai-cells = <0>; + interrupts = <GIC_SPI 68 IRQ_TYPE_LEVEL_HIGH>; + dmas = <&dma0 AT91_XDMAC_DT_PERID(37)>; + dma-names = "rx"; + clocks = <&pmc PMC_TYPE_PERIPHERAL 68>, <&pmc PMC_TYPE_GCK 68>; + clock-names = "pclk", "gclk"; + microchip,mic-pos = <MCHP_PDMC_DS0 MCHP_PDMC_CLK_POSITIVE>, + <MCHP_PDMC_DS0 MCHP_PDMC_CLK_NEGATIVE>, + <MCHP_PDMC_DS1 MCHP_PDMC_CLK_POSITIVE>, + <MCHP_PDMC_DS1 MCHP_PDMC_CLK_NEGATIVE>; + };
include/dt-bindings/sound/microchip,pdmc.h new file +13 -0
@@ -0,0 +1,13 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __DT_BINDINGS_MICROCHIP_PDMC_H__ +#define __DT_BINDINGS_MICROCHIP_PDMC_H__ + +/* PDM microphone's pin placement */ +#define MCHP_PDMC_DS0 0 +#define MCHP_PDMC_DS1 1 + +/* PDM microphone clock edge sampling */ +#define MCHP_PDMC_CLK_POSITIVE 0 +#define MCHP_PDMC_CLK_NEGATIVE 1 + +#endif /* __DT_BINDINGS_MICROCHIP_PDMC_H__ */
Signature · 1 line
2.32.0
Re: [PATCH v3 2/6] ASoC: dt-bindings: Document Microchip's PDMC
Quoted 9 lines · Codrin Ciubotariu
Add DT bindings for the new Microchip PDMC embedded in sama7g5 SoCs.
Signed-off-by Codrin Ciubotariu <[email protected]>---
Changes in v3:
- set line length to 80 characters long
- set 'reg' as the second property
Quoted 11 lines
Changes in v2:
- renamed patch from 'ASoC: add DT bindings for Microchip PDMC' to 'ASoC: dt-bindings: Document Microchip's PDMC';
- renamed yaml file from 'mchp,pdmc.yaml' to 'microchip,pdmc.yaml';
- used imperative mode in commit description;
- renamed mchp,pdmc.h to microchip,pdmc.h;
- fixed 'title' to represent HW;
- made 'compatible' first property;
- s/microhpone/microphone
- none name in example set to 'sound'
Best regards,
Krzysztof
PATCH v3 3/6 ASoC: atmel: mchp-pdmc: add PDMC driver
In reply to Codrin CiubotariuThe Pulse Density Microphone Controller (PDMC) interfaces up to 4 digital microphones having Pulse Density Modulated (PDM) outputs. It generates a single clock line and samples 1 or 2 data lines. The signal path includes an audio grade programmable decimation filter and outputs 24-bit audio words on the APB bus.
---
Changes in v3:
- none
Changes in v2:
- replaced included file dt-bindings/sound/mchp,pdmc.h wih dt-bindings/sound/microchip,pdmc.h
sound/soc/atmel/Kconfig | 16 + sound/soc/atmel/Makefile | 2 + sound/soc/atmel/mchp-pdmc.c | 1084 +++++++++++++++++++++++++++++++++++ 3 files changed, 1102 insertions(+) create mode 100644 sound/soc/atmel/mchp-pdmc.c
sound/soc/atmel/Kconfig +16 -0
@@ -160,4 +160,20 @@ config SND_MCHP_SOC_SPDIFRX This S/PDIF RX driver is compliant with IEC-60958 standard and includes programmable User Data and Channel Status fields. + +config SND_MCHP_SOC_PDMC + tristate "Microchip ASoC driver for boards using PDMC" + depends on OF && (ARCH_AT91 || COMPILE_TEST) + select SND_SOC_GENERIC_DMAENGINE_PCM + select REGMAP_MMIO + help + Say Y or M if you want to add support for Microchip ASoC PDMC driver on the + following Microchip platforms: + - sama7g5 + + The Pulse Density Microphone Controller (PDMC) interfaces up to 4 digital + microphones PDM outputs. It generates a single clock line and samples 1 or + 2 data lines. The signal path includes an audio grade programmable + decimation filter and outputs 24-bit audio words. + endif
sound/soc/atmel/Makefile +2 -0
@@ -7,6 +7,7 @@ snd-soc-atmel-i2s-objs := atmel-i2s.o snd-soc-mchp-i2s-mcc-objs := mchp-i2s-mcc.o snd-soc-mchp-spdiftx-objs := mchp-spdiftx.o snd-soc-mchp-spdifrx-objs := mchp-spdifrx.o +snd-soc-mchp-pdmc-objs := mchp-pdmc.o # pdc and dma need to both be built-in if any user of # ssc is built-in.
@@ -21,6 +22,7 @@ obj-$(CONFIG_SND_ATMEL_SOC_I2S) += snd-soc-atmel-i2s.o obj-$(CONFIG_SND_MCHP_SOC_I2S_MCC) += snd-soc-mchp-i2s-mcc.o obj-$(CONFIG_SND_MCHP_SOC_SPDIFTX) += snd-soc-mchp-spdiftx.o obj-$(CONFIG_SND_MCHP_SOC_SPDIFRX) += snd-soc-mchp-spdifrx.o +obj-$(CONFIG_SND_MCHP_SOC_PDMC) += snd-soc-mchp-pdmc.o # AT91 Machine Support snd-soc-sam9g20-wm8731-objs := sam9g20_wm8731.o
sound/soc/atmel/mchp-pdmc.c new file +1084 -0
1,084 lines not on this page · raw message
Signature · 1 line
2.32.0
PATCH v3 4/6 ARM: dts: at91: sama7g5: add nodes for PDMC
In reply to Codrin CiubotariuMicrochip's SAMA7G5 embeds two PDMCs. The PDMCs can be used to connect 2x4 PDM microphones.
---
Chnages in v3:
- none
Changes in v2:
- set 'sound' as nodes' name
arch/arm/boot/dts/sama7g5.dtsi | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+)
arch/arm/boot/dts/sama7g5.dtsi +24 -0
@@ -275,6 +275,30 @@ pwm: pwm@e1604000 { status = "disabled"; }; + pdmc0: sound@e1608000 { + compatible = "microchip,sama7g5-pdmc"; + reg = <0xe1608000 0x1000>; + interrupts = <GIC_SPI 68 IRQ_TYPE_LEVEL_HIGH>; + #sound-dai-cells = <0>; + dmas = <&dma0 AT91_XDMAC_DT_PERID(37)>; + dma-names = "rx"; + clocks = <&pmc PMC_TYPE_PERIPHERAL 68>, <&pmc PMC_TYPE_GCK 68>; + clock-names = "pclk", "gclk"; + status = "disabled"; + }; + + pdmc1: sound@e160c000 { + compatible = "microchip,sama7g5-pdmc"; + reg = <0xe160c000 0x1000>; + interrupts = <GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>; + #sound-dai-cells = <0>; + dmas = <&dma0 AT91_XDMAC_DT_PERID(38)>; + dma-names = "rx"; + clocks = <&pmc PMC_TYPE_PERIPHERAL 69>, <&pmc PMC_TYPE_GCK 69>; + clock-names = "pclk", "gclk"; + status = "disabled"; + }; + spdifrx: spdifrx@e1614000 { #sound-dai-cells = <0>; compatible = "microchip,sama7g5-spdifrx";
Signature · 1 line
2.32.0
PATCH v3 5/6 ARM: dts: at91: sama7g5ek: add node for PDMC0
In reply to Codrin CiubotariuSAMA7G5-EK has 4 PDM microphones connected to PDMC0. PDMC0 pinmux is in conflict with gmac1, gmac1 being enabled by default.
---
Changes in v3:
- none
Changes in v2:
- replaced included file dt-bindings/sound/mchp,pdmc.h wih dt-bindings/sound/microchip,pdmc.h
arch/arm/boot/dts/at91-sama7g5ek.dts | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-)
arch/arm/boot/dts/at91-sama7g5ek.dts +20 -1
@@ -14,6 +14,7 @@ #include <dt-bindings/mfd/atmel-flexcom.h> #include <dt-bindings/input/input.h> #include <dt-bindings/pinctrl/at91.h> +#include <dt-bindings/sound/microchip,pdmc.h> / { model = "Microchip SAMA7G5-EK";
@@ -439,7 +440,7 @@ &gmac1 { &pinctrl_gmac1_mdio_default &pinctrl_gmac1_phy_irq>; phy-mode = "rmii"; - status = "okay"; + status = "okay"; /* Conflict with pdmc0. */ ethernet-phy@0 { reg = <0x0>;
@@ -453,6 +454,17 @@ &i2s0 { pinctrl-0 = <&pinctrl_i2s0_default>; }; +&pdmc0 { + #sound-dai-cells = <0>; + microchip,mic-pos = <MCHP_PDMC_DS0 MCHP_PDMC_CLK_NEGATIVE>, /* MIC 1 */ + <MCHP_PDMC_DS1 MCHP_PDMC_CLK_NEGATIVE>, /* MIC 2 */ + <MCHP_PDMC_DS0 MCHP_PDMC_CLK_POSITIVE>, /* MIC 3 */ + <MCHP_PDMC_DS1 MCHP_PDMC_CLK_POSITIVE>; /* MIC 4 */ + status = "disabled"; /* Conflict with gmac1. */ + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_pdmc0_default>; +}; + &pioA { pinctrl_flx0_default: flx0_default { pinmux = <PIN_PE3__FLEXCOM0_IO0>,
@@ -609,6 +621,13 @@ pinctrl_mikrobus1_spi: mikrobus1_spi { bias-disable; }; + pinctrl_pdmc0_default: pdmc0_default { + pinmux = <PIN_PD23__PDMC0_DS0>, + <PIN_PD24__PDMC0_DS1>, + <PIN_PD22__PDMC0_CLK>; + bias_disable; + }; + pinctrl_qspi: qspi { pinmux = <PIN_PB12__QSPI0_IO0>, <PIN_PB11__QSPI0_IO1>,
Signature · 1 line
2.32.0
PATCH v3 6/6 ARM: configs: at91: sama7_defconfig: add MCHP PDMC and DMIC drivers
In reply to Codrin CiubotariuEnable drivers needed for Microchip's PDMC and PDM microphones.
---
Changes in v2,v3:
- none;
arch/arm/configs/sama7_defconfig | 2 ++ 1 file changed, 2 insertions(+)
arch/arm/configs/sama7_defconfig +2 -0
@@ -138,6 +138,8 @@ CONFIG_SND_SOC_MIKROE_PROTO=m CONFIG_SND_MCHP_SOC_I2S_MCC=y CONFIG_SND_MCHP_SOC_SPDIFTX=y CONFIG_SND_MCHP_SOC_SPDIFRX=y +CONFIG_SND_MCHP_SOC_PDMC=y +CONFIG_SND_SOC_DMIC=y CONFIG_SND_SOC_PCM5102A=y CONFIG_SND_SOC_SPDIF=y CONFIG_SND_SIMPLE_CARD=y
Signature · 1 line
2.32.0
Nicolas Ferre
maintainerRe: [PATCH v3 6/6] ARM: configs: at91: sama7_defconfig: add MCHP PDMC and DMIC drivers
Quoted 16 lines · Codrin Ciubotariu
Enable drivers needed for Microchip's PDMC and PDM microphones.
Signed-off-by Codrin Ciubotariu <[email protected]>---
Changes in v2,v3:
- none;arch/arm/configs/sama7_defconfig | 2 ++ 1 file changed, 2 insertions(+)arch/arm/configs/sama7_defconfig +0
-0
arch/arm/configs/sama7_defconfig CONFIG_SND_SOC_MIKROE_PROTO=m · line 142
Quoted 5 lines
arch/arm/configs/sama7_defconfig +2
-0@@ -138,6 +138,8 @@ CONFIG_SND_SOC_MIKROE_PROTO=m CONFIG_SND_MCHP_SOC_I2S_MCC=y CONFIG_SND_MCHP_SOC_SPDIFTX=y CONFIG_SND_MCHP_SOC_SPDIFRX=y +CONFIG_SND_MCHP_SOC_PDMC=y +CONFIG_SND_SOC_DMIC=y
I'm fine with that, but I see that some Kconfig entries "select" this SND_SOC_DMIC directly (amd, intel, mediatek, stm). If it's absolutely needed for PDMC to work, what about doing the same as it would prevent some broken configurations?
Regards,
Nicolas
Quoted 3 lines
arch/arm/configs/sama7_defconfig +0
-0CONFIG_SND_SOC_PCM5102A=y CONFIG_SND_SOC_SPDIF=y CONFIG_SND_SIMPLE_CARD=y
Signature · 1 line
Nicolas Ferre
Re: [PATCH v3 6/6] ARM: configs: at91: sama7_defconfig: add MCHP PDMC and DMIC drivers
Quoted 12 lines · Nicolas Ferre
Quoted 11 lines · Codrin Ciubotariu
Enable drivers needed for Microchip's PDMC and PDM microphones.
Signed-off-by Codrin Ciubotariu <[email protected]>---
Changes in v2,v3:
- none;
arch/arm/configs/sama7_defconfig| 2 ++1 file changed, 2 insertions(+)
Quoted 16 lines
arch/arm/configs/sama7_defconfig CONFIG_SND_SOC_MIKROE_PROTO=m · line 142
Quoted 11 lines
arch/arm/configs/sama7_defconfig +0
-0@@ -138,6 +138,8 @@ CONFIG_SND_SOC_MIKROE_PROTO=m
CONFIG_SND_MCHP_SOC_I2S_MCC=y
CONFIG_SND_MCHP_SOC_SPDIFTX=y
CONFIG_SND_MCHP_SOC_SPDIFRX=yarch/arm/configs/sama7_defconfig +2
-0+CONFIG_SND_MCHP_SOC_PDMC=y +CONFIG_SND_SOC_DMIC=yI'm fine with that, but I see that some
Kconfigentries "select" thisSND_SOC_DMICdirectly (amd, intel, mediatek, stm).
If it's absolutely needed for PDMC to work, what about doing the same as it would prevent some broken configurations?
The only way it makes sense to me to have this driver selected somewhere is in a sound card driver, used for a specific board, which we know it has PDM microphones. Since, for now, we use the simple sound card for our audio interfaces, we have no place to add this select. The reason I do not like to add this select under the controller driver, as some of the vendors did, is because, in the future, we might have different PDM microphones that might not work with SND_SOC_DMIC and might need a different driver.
I don't have a strong opinion on this. If you think I am overthinking, please let me know and I will change this.
Best regards,
Codrin
Mark Brown
maintainerRe: [PATCH v3 6/6] ARM: configs: at91: sama7_defconfig: add MCHP PDMC and DMIC drivers
Quoted 7 lines · On Thu, May 05, 2022 at 02:47:04PM +0000, [email protected] wrote:
Quoted 4 lines · Nicolas Ferre
I'm fine with that, but I see that some
Kconfigentries "select" thisSND_SOC_DMICdirectly (amd, intel, mediatek, stm).
If it's absolutely needed for PDMC to work, what about doing the same as it would prevent some broken configurations?
Quoted 10 lines
The only way it makes sense to me to have this driver selected somewhere is in a sound card driver, used for a specific board, which we know it has PDM microphones. Since, for now, we use the simple sound card for our audio interfaces, we have no place to add this select. The reason I do not like to add this select under the controller driver, as some of the vendors did, is because, in the future, we might have different PDM microphones that might not work with
SND_SOC_DMICand might need a different driver.
I don't have a strong opinion on this. If you think I am overthinking, please let me know and I will change this.
It's unlikely but possible that there could be some other device connected (eg, you could have a DSP or something that generates PDM output). If the driver doesn't directly instantiate the DMIC itself then it's probably reasonable for it to be user controllable if the DMIC driver is there.
Nicolas Ferre
maintainerRe: [PATCH v3 6/6] ARM: configs: at91: sama7_defconfig: add MCHP PDMC and DMIC drivers
Quoted 16 lines · Mark Brown
Quoted 5 lines · On Thu, May 05, 2022 at 02:47:04PM +0000,[email protected] wrote:
Quoted 4 lines · Nicolas Ferre
I'm fine with that, but I see that some
Kconfigentries "select" thisSND_SOC_DMICdirectly (amd, intel, mediatek, stm).
If it's absolutely needed for PDMC to work, what about doing the same as it would prevent some broken configurations?Quoted 10 lines
The only way it makes sense to me to have this driver selected somewhere is in a sound card driver, used for a specific board, which we know it has PDM microphones. Since, for now, we use the simple sound card for our audio interfaces, we have no place to add this select. The reason I do not like to add this select under the controller driver, as some of the vendors did, is because, in the future, we might have different PDM microphones that might not work with
SND_SOC_DMICand might need a different driver.
I don't have a strong opinion on this. If you think I am overthinking, please let me know and I will change this.
Quoted 5 lines
It's unlikely but possible that there could be some other device connected (eg, you could have a DSP or something that generates PDM output). If the driver doesn't directly instantiate the DMIC itself then it's probably reasonable for it to be user controllable if the DMIC driver is there.
Fair enough, It makes perfect sense to me as it is then. Thanks for the feedback!
Best regards,
Nicolas
Signature · 1 line
Nicolas Ferre
Mark Brown
maintainerRe: (subset) [PATCH v3 0/6] Add driver for SAMA7G5's PDMC
In reply to Codrin CiubotariuQuoted 10 lines · Codrin Ciubotariu
This patch series adds support for Pulse Density Microphone Controller (PDMC), present on Microchip's SAMA7G5.
The PDMC interfaces up to 4 digital microphones having Pulse Density Modulated (PDM) outputs. It generates a single clock line and samples 1 or 2 data lines. The signal path includes an audio grade programmable decimation filter and outputs 24-bit audio words.
The source of each channel can be independently defined asPDMC_DS0orPDMC_DS1, sampled at the rising or falling edge ofPDMC_CLK.[...]
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[1/6] ASoC: dmaengine: do not use a NULL prepare_slave_config() callback
commit: 9a1e13440a4f2e7566fd4c5eae6a53e6400e08a4
[2/6] ASoC: dt-bindings: Document Microchip's PDMC
commit: 015044e9610c8523794ea6cb55d5388bc00ba96a
[3/6] ASoC: atmel: mchp-pdmc: add PDMC driver
commit: 50291652af5269813baa6024eb0e81b5f0bbb451All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark