iio: adc: stm32-dfsdm: Add support for stm32mp1
diff mbox series

Message ID 1525266323-4922-1-git-send-email-fabrice.gasnier@st.com
State New, archived
Headers show
Series
  • iio: adc: stm32-dfsdm: Add support for stm32mp1
Related show

Commit Message

Fabrice Gasnier May 2, 2018, 1:05 p.m. UTC
Add support for DFSDM (Digital Filter For Sigma Delta Modulators)
to STM32MP1. This variant is close to STM32H7 DFSDM, it implements
6 filter instances. Registers map is also increased.

Signed-off-by: Fabrice Gasnier <fabrice.gasnier@st.com>
---
 .../bindings/iio/adc/st,stm32-dfsdm-adc.txt         |  7 +++++--
 drivers/iio/adc/stm32-dfsdm-core.c                  | 21 +++++++++++++++++++++
 2 files changed, 26 insertions(+), 2 deletions(-)

Comments

Jonathan Cameron May 6, 2018, 5:56 p.m. UTC | #1
On Wed, 2 May 2018 15:05:23 +0200
Fabrice Gasnier <fabrice.gasnier@st.com> wrote:

> Add support for DFSDM (Digital Filter For Sigma Delta Modulators)
> to STM32MP1. This variant is close to STM32H7 DFSDM, it implements
> 6 filter instances. Registers map is also increased.
> 
> Signed-off-by: Fabrice Gasnier <fabrice.gasnier@st.com>
Looks good to me. I'd like to give a little more time for others
to comment however.  Give me a poke if I seem to have forgotten
about it.

Jonathan

> ---
>  .../bindings/iio/adc/st,stm32-dfsdm-adc.txt         |  7 +++++--
>  drivers/iio/adc/stm32-dfsdm-core.c                  | 21 +++++++++++++++++++++
>  2 files changed, 26 insertions(+), 2 deletions(-)
> 
> diff --git a/Documentation/devicetree/bindings/iio/adc/st,stm32-dfsdm-adc.txt b/Documentation/devicetree/bindings/iio/adc/st,stm32-dfsdm-adc.txt
> index ed7520d..75ba25d 100644
> --- a/Documentation/devicetree/bindings/iio/adc/st,stm32-dfsdm-adc.txt
> +++ b/Documentation/devicetree/bindings/iio/adc/st,stm32-dfsdm-adc.txt
> @@ -8,14 +8,16 @@ It is mainly targeted for:
>  - PDM microphones (audio digital microphone)
>  
>  It features up to 8 serial digital interfaces (SPI or Manchester) and
> -up to 4 filters on stm32h7.
> +up to 4 filters on stm32h7 or 6 filters on stm32mp1.
>  
>  Each child node match with a filter instance.
>  
>  Contents of a STM32 DFSDM root node:
>  ------------------------------------
>  Required properties:
> -- compatible: Should be "st,stm32h7-dfsdm".
> +- compatible: Should be one of:
> +  "st,stm32h7-dfsdm"
> +  "st,stm32mp1-dfsdm"
>  - reg: Offset and length of the DFSDM block register set.
>  - clocks: IP and serial interfaces clocking. Should be set according
>  		to rcc clock ID and "clock-names".
> @@ -45,6 +47,7 @@ Required properties:
>  	"st,stm32-dfsdm-adc" for sigma delta ADCs
>  	"st,stm32-dfsdm-dmic" for audio digital microphone.
>  - reg: Specifies the DFSDM filter instance used.
> +	Valid values are from 0 to 3 on stm32h7, 0 to 5 on stm32mp1.
>  - interrupts: IRQ lines connected to each DFSDM filter instance.
>  - st,adc-channels:	List of single-ended channels muxed for this ADC.
>  			valid values:
> diff --git a/drivers/iio/adc/stm32-dfsdm-core.c b/drivers/iio/adc/stm32-dfsdm-core.c
> index e50efdc..d924e6c 100644
> --- a/drivers/iio/adc/stm32-dfsdm-core.c
> +++ b/drivers/iio/adc/stm32-dfsdm-core.c
> @@ -25,6 +25,8 @@ struct stm32_dfsdm_dev_data {
>  
>  #define STM32H7_DFSDM_NUM_FILTERS	4
>  #define STM32H7_DFSDM_NUM_CHANNELS	8
> +#define STM32MP1_DFSDM_NUM_FILTERS	6
> +#define STM32MP1_DFSDM_NUM_CHANNELS	8
>  
>  static bool stm32_dfsdm_volatile_reg(struct device *dev, unsigned int reg)
>  {
> @@ -61,6 +63,21 @@ static bool stm32_dfsdm_volatile_reg(struct device *dev, unsigned int reg)
>  	.regmap_cfg = &stm32h7_dfsdm_regmap_cfg,
>  };
>  
> +static const struct regmap_config stm32mp1_dfsdm_regmap_cfg = {
> +	.reg_bits = 32,
> +	.val_bits = 32,
> +	.reg_stride = sizeof(u32),
> +	.max_register = 0x7fc,
> +	.volatile_reg = stm32_dfsdm_volatile_reg,
> +	.fast_io = true,
> +};
> +
> +static const struct stm32_dfsdm_dev_data stm32mp1_dfsdm_data = {
> +	.num_filters = STM32MP1_DFSDM_NUM_FILTERS,
> +	.num_channels = STM32MP1_DFSDM_NUM_CHANNELS,
> +	.regmap_cfg = &stm32mp1_dfsdm_regmap_cfg,
> +};
> +
>  struct dfsdm_priv {
>  	struct platform_device *pdev; /* platform device */
>  
> @@ -243,6 +260,10 @@ static int stm32_dfsdm_parse_of(struct platform_device *pdev,
>  		.compatible = "st,stm32h7-dfsdm",
>  		.data = &stm32h7_dfsdm_data,
>  	},
> +	{
> +		.compatible = "st,stm32mp1-dfsdm",
> +		.data = &stm32mp1_dfsdm_data,
> +	},
>  	{}
>  };
>  MODULE_DEVICE_TABLE(of, stm32_dfsdm_of_match);
Rob Herring May 7, 2018, 8:51 p.m. UTC | #2
On Wed, May 02, 2018 at 03:05:23PM +0200, Fabrice Gasnier wrote:
> Add support for DFSDM (Digital Filter For Sigma Delta Modulators)
> to STM32MP1. This variant is close to STM32H7 DFSDM, it implements
> 6 filter instances. Registers map is also increased.
> 
> Signed-off-by: Fabrice Gasnier <fabrice.gasnier@st.com>
> ---
>  .../bindings/iio/adc/st,stm32-dfsdm-adc.txt         |  7 +++++--
>  drivers/iio/adc/stm32-dfsdm-core.c                  | 21 +++++++++++++++++++++
>  2 files changed, 26 insertions(+), 2 deletions(-)

Reviewed-by: Rob Herring <robh@kernel.org>
Jonathan Cameron May 12, 2018, 9:33 a.m. UTC | #3
On Mon, 7 May 2018 15:51:51 -0500
Rob Herring <robh@kernel.org> wrote:

> On Wed, May 02, 2018 at 03:05:23PM +0200, Fabrice Gasnier wrote:
> > Add support for DFSDM (Digital Filter For Sigma Delta Modulators)
> > to STM32MP1. This variant is close to STM32H7 DFSDM, it implements
> > 6 filter instances. Registers map is also increased.
> > 
> > Signed-off-by: Fabrice Gasnier <fabrice.gasnier@st.com>
> > ---
> >  .../bindings/iio/adc/st,stm32-dfsdm-adc.txt         |  7 +++++--
> >  drivers/iio/adc/stm32-dfsdm-core.c                  | 21 +++++++++++++++++++++
> >  2 files changed, 26 insertions(+), 2 deletions(-)  
> 
> Reviewed-by: Rob Herring <robh@kernel.org>
Applied.   Whilst doing this I note that I'm getting a few sparse
warnings for this driver that would be nice to clean up...

  CHECK   drivers/iio/adc/stm32-dfsdm-adc.c
drivers/iio/adc/stm32-dfsdm-adc.c:503:21: warning: expression using sizeof(void)
drivers/iio/adc/stm32-dfsdm-adc.c:503:21: warning: expression using sizeof(void)

Which is mystifying at first glance... Something deep and dirty in the min macro
but I can't see what..

drivers/iio/adc/stm32-dfsdm-adc.c:680:5: warning: symbol 'stm32_dfsdm_get_buff_cb' was not declared. Should it be static?
drivers/iio/adc/stm32-dfsdm-adc.c:703:5: warning: symbol 'stm32_dfsdm_release_buff_cb' was not declared. Should it be static?

Are rather more obvious
Fabrice Gasnier May 15, 2018, 3:23 p.m. UTC | #4
On 05/12/2018 11:33 AM, Jonathan Cameron wrote:
> On Mon, 7 May 2018 15:51:51 -0500
> Rob Herring <robh@kernel.org> wrote:
> 
>> On Wed, May 02, 2018 at 03:05:23PM +0200, Fabrice Gasnier wrote:
>>> Add support for DFSDM (Digital Filter For Sigma Delta Modulators)
>>> to STM32MP1. This variant is close to STM32H7 DFSDM, it implements
>>> 6 filter instances. Registers map is also increased.
>>>
>>> Signed-off-by: Fabrice Gasnier <fabrice.gasnier@st.com>
>>> ---
>>>  .../bindings/iio/adc/st,stm32-dfsdm-adc.txt         |  7 +++++--
>>>  drivers/iio/adc/stm32-dfsdm-core.c                  | 21 +++++++++++++++++++++
>>>  2 files changed, 26 insertions(+), 2 deletions(-)  
>>
>> Reviewed-by: Rob Herring <robh@kernel.org>
> Applied.   Whilst doing this I note that I'm getting a few sparse
> warnings for this driver that would be nice to clean up...
> 
>   CHECK   drivers/iio/adc/stm32-dfsdm-adc.c
> drivers/iio/adc/stm32-dfsdm-adc.c:503:21: warning: expression using sizeof(void)
> drivers/iio/adc/stm32-dfsdm-adc.c:503:21: warning: expression using sizeof(void)
> 
> Which is mystifying at first glance... Something deep and dirty in the min macro
> but I can't see what..

Hi Jonathan,

I just sent a patch to clean bellow warning. But this is more obscure
regarding min macro...

Many thanks,
Fabrice

> 
> drivers/iio/adc/stm32-dfsdm-adc.c:680:5: warning: symbol 'stm32_dfsdm_get_buff_cb' was not declared. Should it be static?
> drivers/iio/adc/stm32-dfsdm-adc.c:703:5: warning: symbol 'stm32_dfsdm_release_buff_cb' was not declared. Should it be static?
> 
> Are rather more obvious
>

Patch
diff mbox series

diff --git a/Documentation/devicetree/bindings/iio/adc/st,stm32-dfsdm-adc.txt b/Documentation/devicetree/bindings/iio/adc/st,stm32-dfsdm-adc.txt
index ed7520d..75ba25d 100644
--- a/Documentation/devicetree/bindings/iio/adc/st,stm32-dfsdm-adc.txt
+++ b/Documentation/devicetree/bindings/iio/adc/st,stm32-dfsdm-adc.txt
@@ -8,14 +8,16 @@  It is mainly targeted for:
 - PDM microphones (audio digital microphone)
 
 It features up to 8 serial digital interfaces (SPI or Manchester) and
-up to 4 filters on stm32h7.
+up to 4 filters on stm32h7 or 6 filters on stm32mp1.
 
 Each child node match with a filter instance.
 
 Contents of a STM32 DFSDM root node:
 ------------------------------------
 Required properties:
-- compatible: Should be "st,stm32h7-dfsdm".
+- compatible: Should be one of:
+  "st,stm32h7-dfsdm"
+  "st,stm32mp1-dfsdm"
 - reg: Offset and length of the DFSDM block register set.
 - clocks: IP and serial interfaces clocking. Should be set according
 		to rcc clock ID and "clock-names".
@@ -45,6 +47,7 @@  Required properties:
 	"st,stm32-dfsdm-adc" for sigma delta ADCs
 	"st,stm32-dfsdm-dmic" for audio digital microphone.
 - reg: Specifies the DFSDM filter instance used.
+	Valid values are from 0 to 3 on stm32h7, 0 to 5 on stm32mp1.
 - interrupts: IRQ lines connected to each DFSDM filter instance.
 - st,adc-channels:	List of single-ended channels muxed for this ADC.
 			valid values:
diff --git a/drivers/iio/adc/stm32-dfsdm-core.c b/drivers/iio/adc/stm32-dfsdm-core.c
index e50efdc..d924e6c 100644
--- a/drivers/iio/adc/stm32-dfsdm-core.c
+++ b/drivers/iio/adc/stm32-dfsdm-core.c
@@ -25,6 +25,8 @@  struct stm32_dfsdm_dev_data {
 
 #define STM32H7_DFSDM_NUM_FILTERS	4
 #define STM32H7_DFSDM_NUM_CHANNELS	8
+#define STM32MP1_DFSDM_NUM_FILTERS	6
+#define STM32MP1_DFSDM_NUM_CHANNELS	8
 
 static bool stm32_dfsdm_volatile_reg(struct device *dev, unsigned int reg)
 {
@@ -61,6 +63,21 @@  static bool stm32_dfsdm_volatile_reg(struct device *dev, unsigned int reg)
 	.regmap_cfg = &stm32h7_dfsdm_regmap_cfg,
 };
 
+static const struct regmap_config stm32mp1_dfsdm_regmap_cfg = {
+	.reg_bits = 32,
+	.val_bits = 32,
+	.reg_stride = sizeof(u32),
+	.max_register = 0x7fc,
+	.volatile_reg = stm32_dfsdm_volatile_reg,
+	.fast_io = true,
+};
+
+static const struct stm32_dfsdm_dev_data stm32mp1_dfsdm_data = {
+	.num_filters = STM32MP1_DFSDM_NUM_FILTERS,
+	.num_channels = STM32MP1_DFSDM_NUM_CHANNELS,
+	.regmap_cfg = &stm32mp1_dfsdm_regmap_cfg,
+};
+
 struct dfsdm_priv {
 	struct platform_device *pdev; /* platform device */
 
@@ -243,6 +260,10 @@  static int stm32_dfsdm_parse_of(struct platform_device *pdev,
 		.compatible = "st,stm32h7-dfsdm",
 		.data = &stm32h7_dfsdm_data,
 	},
+	{
+		.compatible = "st,stm32mp1-dfsdm",
+		.data = &stm32mp1_dfsdm_data,
+	},
 	{}
 };
 MODULE_DEVICE_TABLE(of, stm32_dfsdm_of_match);