* [PATCH v4] mfd: arizona: Add DT options for max_channels_clocked and PDM speaker config
@ 2016-09-13 9:05 ` Richard Fitzgerald
0 siblings, 0 replies; 5+ messages in thread
From: Richard Fitzgerald @ 2016-09-13 9:05 UTC (permalink / raw)
To: lee.jones, robh+dt; +Cc: patches, devicetree, linux-kernel
This patch adds DT settings for the max_channels_clocked, spk_fmt and
spk_mute pdata.
Signed-off-by: Richard Fitzgerald <rf@opensource.wolfsonmicro.com>
---
Documentation/devicetree/bindings/mfd/arizona.txt | 18 ++++++++++++++
drivers/mfd/arizona-core.c | 30 +++++++++++++++++++++++
2 files changed, 48 insertions(+)
diff --git a/Documentation/devicetree/bindings/mfd/arizona.txt b/Documentation/devicetree/bindings/mfd/arizona.txt
index a6e2ea41..8f2e282 100644
--- a/Documentation/devicetree/bindings/mfd/arizona.txt
+++ b/Documentation/devicetree/bindings/mfd/arizona.txt
@@ -85,6 +85,24 @@ Optional properties:
present, the number of values should be less than or equal to the
number of inputs, unspecified inputs will use the chip default.
+ - wlf,max-channels-clocked : The maximum number of channels to be clocked on
+ each AIF, useful for I2S systems with multiple data lines being mastered.
+ Specify one cell for each AIF to be configured, specify zero for AIFs that
+ should be handled normally.
+ If present, number of cells must be less than or equal to the number of
+ AIFs. If less than the number of AIFs, for cells that have not been
+ specified the corresponding AIFs will be treated as default setting.
+
+ - wlf,spk-fmt : PDM speaker data format, must contain 2 cells (OUT5 and OUT6).
+ See the datasheet for values.
+ The second cell is ignored for codecs that do not have OUT6 (wm5102, wm8997,
+ wm8998, wm1814)
+
+ - wlf,spk-mute : PDM speaker mute setting, must contain 2 cells (OUT5 and OUT6).
+ See the datasheet for values.
+ The second cell is ignored for codecs that do not have OUT6 (wm5102, wm8997,
+ wm8998, wm1814)
+
- DCVDD-supply, MICVDD-supply : Power supplies, only need to be specified if
they are being externally supplied. As covered in
Documentation/devicetree/bindings/regulator/regulator.txt
diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c
index b95ff2d..3687e5f 100644
--- a/drivers/mfd/arizona-core.c
+++ b/drivers/mfd/arizona-core.c
@@ -760,6 +760,7 @@ static int arizona_of_get_core_pdata(struct arizona *arizona)
struct property *prop;
const __be32 *cur;
u32 val;
+ u32 pdm_val[ARIZONA_MAX_PDM_SPK];
int ret, i;
int count = 0;
@@ -816,6 +817,35 @@ static int arizona_of_get_core_pdata(struct arizona *arizona)
count++;
}
+ count = 0;
+ of_property_for_each_u32(arizona->dev->of_node,
+ "wlf,max-channels-clocked",
+ prop, cur, val) {
+ if (count == ARRAY_SIZE(pdata->max_channels_clocked))
+ break;
+
+ pdata->max_channels_clocked[count] = val;
+ count++;
+ }
+
+ ret = of_property_read_u32_array(arizona->dev->of_node,
+ "wlf,spk-fmt",
+ pdm_val,
+ ARRAY_SIZE(pdm_val));
+
+ if (ret >= 0)
+ for (count = 0; count < ARRAY_SIZE(pdata->spk_fmt); ++count)
+ pdata->spk_fmt[count] = pdm_val[count];
+
+ ret = of_property_read_u32_array(arizona->dev->of_node,
+ "wlf,spk-mute",
+ pdm_val,
+ ARRAY_SIZE(pdm_val));
+
+ if (ret >= 0)
+ for (count = 0; count < ARRAY_SIZE(pdata->spk_mute); ++count)
+ pdata->spk_mute[count] = pdm_val[count];
+
return 0;
}
--
1.9.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH v4] mfd: arizona: Add DT options for max_channels_clocked and PDM speaker config
@ 2016-09-13 9:05 ` Richard Fitzgerald
0 siblings, 0 replies; 5+ messages in thread
From: Richard Fitzgerald @ 2016-09-13 9:05 UTC (permalink / raw)
To: lee.jones, robh+dt; +Cc: patches, devicetree, linux-kernel
This patch adds DT settings for the max_channels_clocked, spk_fmt and
spk_mute pdata.
Signed-off-by: Richard Fitzgerald <rf@opensource.wolfsonmicro.com>
---
Documentation/devicetree/bindings/mfd/arizona.txt | 18 ++++++++++++++
drivers/mfd/arizona-core.c | 30 +++++++++++++++++++++++
2 files changed, 48 insertions(+)
diff --git a/Documentation/devicetree/bindings/mfd/arizona.txt b/Documentation/devicetree/bindings/mfd/arizona.txt
index a6e2ea41..8f2e282 100644
--- a/Documentation/devicetree/bindings/mfd/arizona.txt
+++ b/Documentation/devicetree/bindings/mfd/arizona.txt
@@ -85,6 +85,24 @@ Optional properties:
present, the number of values should be less than or equal to the
number of inputs, unspecified inputs will use the chip default.
+ - wlf,max-channels-clocked : The maximum number of channels to be clocked on
+ each AIF, useful for I2S systems with multiple data lines being mastered.
+ Specify one cell for each AIF to be configured, specify zero for AIFs that
+ should be handled normally.
+ If present, number of cells must be less than or equal to the number of
+ AIFs. If less than the number of AIFs, for cells that have not been
+ specified the corresponding AIFs will be treated as default setting.
+
+ - wlf,spk-fmt : PDM speaker data format, must contain 2 cells (OUT5 and OUT6).
+ See the datasheet for values.
+ The second cell is ignored for codecs that do not have OUT6 (wm5102, wm8997,
+ wm8998, wm1814)
+
+ - wlf,spk-mute : PDM speaker mute setting, must contain 2 cells (OUT5 and OUT6).
+ See the datasheet for values.
+ The second cell is ignored for codecs that do not have OUT6 (wm5102, wm8997,
+ wm8998, wm1814)
+
- DCVDD-supply, MICVDD-supply : Power supplies, only need to be specified if
they are being externally supplied. As covered in
Documentation/devicetree/bindings/regulator/regulator.txt
diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c
index b95ff2d..3687e5f 100644
--- a/drivers/mfd/arizona-core.c
+++ b/drivers/mfd/arizona-core.c
@@ -760,6 +760,7 @@ static int arizona_of_get_core_pdata(struct arizona *arizona)
struct property *prop;
const __be32 *cur;
u32 val;
+ u32 pdm_val[ARIZONA_MAX_PDM_SPK];
int ret, i;
int count = 0;
@@ -816,6 +817,35 @@ static int arizona_of_get_core_pdata(struct arizona *arizona)
count++;
}
+ count = 0;
+ of_property_for_each_u32(arizona->dev->of_node,
+ "wlf,max-channels-clocked",
+ prop, cur, val) {
+ if (count == ARRAY_SIZE(pdata->max_channels_clocked))
+ break;
+
+ pdata->max_channels_clocked[count] = val;
+ count++;
+ }
+
+ ret = of_property_read_u32_array(arizona->dev->of_node,
+ "wlf,spk-fmt",
+ pdm_val,
+ ARRAY_SIZE(pdm_val));
+
+ if (ret >= 0)
+ for (count = 0; count < ARRAY_SIZE(pdata->spk_fmt); ++count)
+ pdata->spk_fmt[count] = pdm_val[count];
+
+ ret = of_property_read_u32_array(arizona->dev->of_node,
+ "wlf,spk-mute",
+ pdm_val,
+ ARRAY_SIZE(pdm_val));
+
+ if (ret >= 0)
+ for (count = 0; count < ARRAY_SIZE(pdata->spk_mute); ++count)
+ pdata->spk_mute[count] = pdm_val[count];
+
return 0;
}
--
1.9.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH v4] mfd: arizona: Add DT options for max_channels_clocked and PDM speaker config
2016-09-13 9:05 ` Richard Fitzgerald
(?)
@ 2016-09-23 13:30 ` Rob Herring
-1 siblings, 0 replies; 5+ messages in thread
From: Rob Herring @ 2016-09-23 13:30 UTC (permalink / raw)
To: Richard Fitzgerald; +Cc: lee.jones, patches, devicetree, linux-kernel
On Tue, Sep 13, 2016 at 10:05:44AM +0100, Richard Fitzgerald wrote:
> This patch adds DT settings for the max_channels_clocked, spk_fmt and
> spk_mute pdata.
>
> Signed-off-by: Richard Fitzgerald <rf@opensource.wolfsonmicro.com>
> ---
> Documentation/devicetree/bindings/mfd/arizona.txt | 18 ++++++++++++++
> drivers/mfd/arizona-core.c | 30 +++++++++++++++++++++++
> 2 files changed, 48 insertions(+)
Acked-by: Rob Herring <robh@kernel.org>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v4] mfd: arizona: Add DT options for max_channels_clocked and PDM speaker config
@ 2016-09-27 19:44 ` Lee Jones
0 siblings, 0 replies; 5+ messages in thread
From: Lee Jones @ 2016-09-27 19:44 UTC (permalink / raw)
To: Richard Fitzgerald; +Cc: robh+dt, patches, devicetree, linux-kernel
On Tue, 13 Sep 2016, Richard Fitzgerald wrote:
> This patch adds DT settings for the max_channels_clocked, spk_fmt and
> spk_mute pdata.
>
> Signed-off-by: Richard Fitzgerald <rf@opensource.wolfsonmicro.com>
> ---
> Documentation/devicetree/bindings/mfd/arizona.txt | 18 ++++++++++++++
> drivers/mfd/arizona-core.c | 30 +++++++++++++++++++++++
> 2 files changed, 48 insertions(+)
Applied, thanks.
> diff --git a/Documentation/devicetree/bindings/mfd/arizona.txt b/Documentation/devicetree/bindings/mfd/arizona.txt
> index a6e2ea41..8f2e282 100644
> --- a/Documentation/devicetree/bindings/mfd/arizona.txt
> +++ b/Documentation/devicetree/bindings/mfd/arizona.txt
> @@ -85,6 +85,24 @@ Optional properties:
> present, the number of values should be less than or equal to the
> number of inputs, unspecified inputs will use the chip default.
>
> + - wlf,max-channels-clocked : The maximum number of channels to be clocked on
> + each AIF, useful for I2S systems with multiple data lines being mastered.
> + Specify one cell for each AIF to be configured, specify zero for AIFs that
> + should be handled normally.
> + If present, number of cells must be less than or equal to the number of
> + AIFs. If less than the number of AIFs, for cells that have not been
> + specified the corresponding AIFs will be treated as default setting.
> +
> + - wlf,spk-fmt : PDM speaker data format, must contain 2 cells (OUT5 and OUT6).
> + See the datasheet for values.
> + The second cell is ignored for codecs that do not have OUT6 (wm5102, wm8997,
> + wm8998, wm1814)
> +
> + - wlf,spk-mute : PDM speaker mute setting, must contain 2 cells (OUT5 and OUT6).
> + See the datasheet for values.
> + The second cell is ignored for codecs that do not have OUT6 (wm5102, wm8997,
> + wm8998, wm1814)
> +
> - DCVDD-supply, MICVDD-supply : Power supplies, only need to be specified if
> they are being externally supplied. As covered in
> Documentation/devicetree/bindings/regulator/regulator.txt
> diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c
> index b95ff2d..3687e5f 100644
> --- a/drivers/mfd/arizona-core.c
> +++ b/drivers/mfd/arizona-core.c
> @@ -760,6 +760,7 @@ static int arizona_of_get_core_pdata(struct arizona *arizona)
> struct property *prop;
> const __be32 *cur;
> u32 val;
> + u32 pdm_val[ARIZONA_MAX_PDM_SPK];
> int ret, i;
> int count = 0;
>
> @@ -816,6 +817,35 @@ static int arizona_of_get_core_pdata(struct arizona *arizona)
> count++;
> }
>
> + count = 0;
> + of_property_for_each_u32(arizona->dev->of_node,
> + "wlf,max-channels-clocked",
> + prop, cur, val) {
> + if (count == ARRAY_SIZE(pdata->max_channels_clocked))
> + break;
> +
> + pdata->max_channels_clocked[count] = val;
> + count++;
> + }
> +
> + ret = of_property_read_u32_array(arizona->dev->of_node,
> + "wlf,spk-fmt",
> + pdm_val,
> + ARRAY_SIZE(pdm_val));
> +
> + if (ret >= 0)
> + for (count = 0; count < ARRAY_SIZE(pdata->spk_fmt); ++count)
> + pdata->spk_fmt[count] = pdm_val[count];
> +
> + ret = of_property_read_u32_array(arizona->dev->of_node,
> + "wlf,spk-mute",
> + pdm_val,
> + ARRAY_SIZE(pdm_val));
> +
> + if (ret >= 0)
> + for (count = 0; count < ARRAY_SIZE(pdata->spk_mute); ++count)
> + pdata->spk_mute[count] = pdm_val[count];
> +
> return 0;
> }
>
--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH v4] mfd: arizona: Add DT options for max_channels_clocked and PDM speaker config
@ 2016-09-27 19:44 ` Lee Jones
0 siblings, 0 replies; 5+ messages in thread
From: Lee Jones @ 2016-09-27 19:44 UTC (permalink / raw)
To: Richard Fitzgerald
Cc: robh+dt-DgEjT+Ai2ygdnm+yROfE0A,
patches-yzvPICuk2AATkU/dhu1WVueM+bqZidxxQQ4Iyu8u01E,
devicetree-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA
On Tue, 13 Sep 2016, Richard Fitzgerald wrote:
> This patch adds DT settings for the max_channels_clocked, spk_fmt and
> spk_mute pdata.
>
> Signed-off-by: Richard Fitzgerald <rf-yzvPICuk2AATkU/dhu1WVueM+bqZidxxQQ4Iyu8u01E@public.gmane.org>
> ---
> Documentation/devicetree/bindings/mfd/arizona.txt | 18 ++++++++++++++
> drivers/mfd/arizona-core.c | 30 +++++++++++++++++++++++
> 2 files changed, 48 insertions(+)
Applied, thanks.
> diff --git a/Documentation/devicetree/bindings/mfd/arizona.txt b/Documentation/devicetree/bindings/mfd/arizona.txt
> index a6e2ea41..8f2e282 100644
> --- a/Documentation/devicetree/bindings/mfd/arizona.txt
> +++ b/Documentation/devicetree/bindings/mfd/arizona.txt
> @@ -85,6 +85,24 @@ Optional properties:
> present, the number of values should be less than or equal to the
> number of inputs, unspecified inputs will use the chip default.
>
> + - wlf,max-channels-clocked : The maximum number of channels to be clocked on
> + each AIF, useful for I2S systems with multiple data lines being mastered.
> + Specify one cell for each AIF to be configured, specify zero for AIFs that
> + should be handled normally.
> + If present, number of cells must be less than or equal to the number of
> + AIFs. If less than the number of AIFs, for cells that have not been
> + specified the corresponding AIFs will be treated as default setting.
> +
> + - wlf,spk-fmt : PDM speaker data format, must contain 2 cells (OUT5 and OUT6).
> + See the datasheet for values.
> + The second cell is ignored for codecs that do not have OUT6 (wm5102, wm8997,
> + wm8998, wm1814)
> +
> + - wlf,spk-mute : PDM speaker mute setting, must contain 2 cells (OUT5 and OUT6).
> + See the datasheet for values.
> + The second cell is ignored for codecs that do not have OUT6 (wm5102, wm8997,
> + wm8998, wm1814)
> +
> - DCVDD-supply, MICVDD-supply : Power supplies, only need to be specified if
> they are being externally supplied. As covered in
> Documentation/devicetree/bindings/regulator/regulator.txt
> diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c
> index b95ff2d..3687e5f 100644
> --- a/drivers/mfd/arizona-core.c
> +++ b/drivers/mfd/arizona-core.c
> @@ -760,6 +760,7 @@ static int arizona_of_get_core_pdata(struct arizona *arizona)
> struct property *prop;
> const __be32 *cur;
> u32 val;
> + u32 pdm_val[ARIZONA_MAX_PDM_SPK];
> int ret, i;
> int count = 0;
>
> @@ -816,6 +817,35 @@ static int arizona_of_get_core_pdata(struct arizona *arizona)
> count++;
> }
>
> + count = 0;
> + of_property_for_each_u32(arizona->dev->of_node,
> + "wlf,max-channels-clocked",
> + prop, cur, val) {
> + if (count == ARRAY_SIZE(pdata->max_channels_clocked))
> + break;
> +
> + pdata->max_channels_clocked[count] = val;
> + count++;
> + }
> +
> + ret = of_property_read_u32_array(arizona->dev->of_node,
> + "wlf,spk-fmt",
> + pdm_val,
> + ARRAY_SIZE(pdm_val));
> +
> + if (ret >= 0)
> + for (count = 0; count < ARRAY_SIZE(pdata->spk_fmt); ++count)
> + pdata->spk_fmt[count] = pdm_val[count];
> +
> + ret = of_property_read_u32_array(arizona->dev->of_node,
> + "wlf,spk-mute",
> + pdm_val,
> + ARRAY_SIZE(pdm_val));
> +
> + if (ret >= 0)
> + for (count = 0; count < ARRAY_SIZE(pdata->spk_mute); ++count)
> + pdata->spk_mute[count] = pdm_val[count];
> +
> return 0;
> }
>
--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2016-09-27 19:44 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-09-13 9:05 [PATCH v4] mfd: arizona: Add DT options for max_channels_clocked and PDM speaker config Richard Fitzgerald
2016-09-13 9:05 ` Richard Fitzgerald
2016-09-23 13:30 ` Rob Herring
2016-09-27 19:44 ` Lee Jones
2016-09-27 19:44 ` Lee Jones
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.