* [PATCH v2 1/2] mfd: arizona: Add device tree binding to specify mono outputs @ 2015-12-14 10:19 ` Charles Keepax 0 siblings, 0 replies; 8+ messages in thread From: Charles Keepax @ 2015-12-14 10:19 UTC (permalink / raw) To: lee.jones; +Cc: devicetree, linux-kernel, patches, robh Add device tree bindings to support specifying outputs from the chip as mono outputs. Whilst we are doing it change the out_mono pdata from a bool to an int, because Sparse gets upset about using ARRAY_SIZE on bools. Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com> --- No changes since v1. Thanks, Charles drivers/mfd/arizona-core.c | 10 ++++++++++ include/linux/mfd/arizona/pdata.h | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c index b9489a0..4bb4866 100644 --- a/drivers/mfd/arizona-core.c +++ b/drivers/mfd/arizona-core.c @@ -861,6 +861,16 @@ static int arizona_of_get_core_pdata(struct arizona *arizona) count++; } + count = 0; + of_property_for_each_u32(arizona->dev->of_node, "wlf,out-mono", prop, + cur, val) { + if (count == ARRAY_SIZE(pdata->out_mono)) + break; + + pdata->out_mono[count] = !!val; + count++; + } + return 0; } diff --git a/include/linux/mfd/arizona/pdata.h b/include/linux/mfd/arizona/pdata.h index 57b45ca..64faeef 100644 --- a/include/linux/mfd/arizona/pdata.h +++ b/include/linux/mfd/arizona/pdata.h @@ -171,7 +171,7 @@ struct arizona_pdata { int inmode[ARIZONA_MAX_INPUT]; /** Mode for outputs */ - bool out_mono[ARIZONA_MAX_OUTPUT]; + int out_mono[ARIZONA_MAX_OUTPUT]; /** PDM speaker mute setting */ unsigned int spk_mute[ARIZONA_MAX_PDM_SPK]; -- 2.1.4 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v2 1/2] mfd: arizona: Add device tree binding to specify mono outputs @ 2015-12-14 10:19 ` Charles Keepax 0 siblings, 0 replies; 8+ messages in thread From: Charles Keepax @ 2015-12-14 10:19 UTC (permalink / raw) To: lee.jones; +Cc: devicetree, linux-kernel, patches, robh Add device tree bindings to support specifying outputs from the chip as mono outputs. Whilst we are doing it change the out_mono pdata from a bool to an int, because Sparse gets upset about using ARRAY_SIZE on bools. Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com> --- No changes since v1. Thanks, Charles drivers/mfd/arizona-core.c | 10 ++++++++++ include/linux/mfd/arizona/pdata.h | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c index b9489a0..4bb4866 100644 --- a/drivers/mfd/arizona-core.c +++ b/drivers/mfd/arizona-core.c @@ -861,6 +861,16 @@ static int arizona_of_get_core_pdata(struct arizona *arizona) count++; } + count = 0; + of_property_for_each_u32(arizona->dev->of_node, "wlf,out-mono", prop, + cur, val) { + if (count == ARRAY_SIZE(pdata->out_mono)) + break; + + pdata->out_mono[count] = !!val; + count++; + } + return 0; } diff --git a/include/linux/mfd/arizona/pdata.h b/include/linux/mfd/arizona/pdata.h index 57b45ca..64faeef 100644 --- a/include/linux/mfd/arizona/pdata.h +++ b/include/linux/mfd/arizona/pdata.h @@ -171,7 +171,7 @@ struct arizona_pdata { int inmode[ARIZONA_MAX_INPUT]; /** Mode for outputs */ - bool out_mono[ARIZONA_MAX_OUTPUT]; + int out_mono[ARIZONA_MAX_OUTPUT]; /** PDM speaker mute setting */ unsigned int spk_mute[ARIZONA_MAX_PDM_SPK]; -- 2.1.4 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v2 2/2] mfd: arizona: Update binding docs for selecting mono/stereo outputs @ 2015-12-14 10:19 ` Charles Keepax 0 siblings, 0 replies; 8+ messages in thread From: Charles Keepax @ 2015-12-14 10:19 UTC (permalink / raw) To: lee.jones; +Cc: devicetree, linux-kernel, patches, robh Update the device tree binding documentation to include the wlf,out-mono property that is used to specify whether each output is a mono or stereo output. Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com> --- Changes since v1: - Clarify which outputs correspond to which entry in the out-mono list. Thanks, Charles Documentation/devicetree/bindings/mfd/arizona.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Documentation/devicetree/bindings/mfd/arizona.txt b/Documentation/devicetree/bindings/mfd/arizona.txt index 2b6ccdb..069e31d 100644 --- a/Documentation/devicetree/bindings/mfd/arizona.txt +++ b/Documentation/devicetree/bindings/mfd/arizona.txt @@ -65,6 +65,12 @@ Optional properties: that have not been specified are set to 0 by default. Entries are: <IN1, IN2, IN3, IN4> (wm5102, wm5110, wm8280, wm8997) <IN1A, IN2A, IN1B, IN2B> (wm8998, wm1814) + - wlf,out-mono : A list of boolean values indicating whether each output is + mono or stereo. Position within the list indicates the output affected + (eg. First entry in the list corresponds to output 1). A non-zero value + indicates a mono output. If present, the number of values should be less + than or equal to the number of outputs, if less values are supplied the + additional outputs will be treated as stereo. - wlf,dmic-ref : DMIC reference voltage source for each input, can be selected from either MICVDD or one of the MICBIAS's, defines -- 2.1.4 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v2 2/2] mfd: arizona: Update binding docs for selecting mono/stereo outputs @ 2015-12-14 10:19 ` Charles Keepax 0 siblings, 0 replies; 8+ messages in thread From: Charles Keepax @ 2015-12-14 10:19 UTC (permalink / raw) To: lee.jones-QSEj5FYQhm4dnm+yROfE0A Cc: devicetree-u79uwXL29TY76Z2rM5mHXA, linux-kernel-u79uwXL29TY76Z2rM5mHXA, patches-yzvPICuk2AATkU/dhu1WVueM+bqZidxxQQ4Iyu8u01E, robh-DgEjT+Ai2ygdnm+yROfE0A Update the device tree binding documentation to include the wlf,out-mono property that is used to specify whether each output is a mono or stereo output. Signed-off-by: Charles Keepax <ckeepax-yzvPICuk2AATkU/dhu1WVueM+bqZidxxQQ4Iyu8u01E@public.gmane.org> --- Changes since v1: - Clarify which outputs correspond to which entry in the out-mono list. Thanks, Charles Documentation/devicetree/bindings/mfd/arizona.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Documentation/devicetree/bindings/mfd/arizona.txt b/Documentation/devicetree/bindings/mfd/arizona.txt index 2b6ccdb..069e31d 100644 --- a/Documentation/devicetree/bindings/mfd/arizona.txt +++ b/Documentation/devicetree/bindings/mfd/arizona.txt @@ -65,6 +65,12 @@ Optional properties: that have not been specified are set to 0 by default. Entries are: <IN1, IN2, IN3, IN4> (wm5102, wm5110, wm8280, wm8997) <IN1A, IN2A, IN1B, IN2B> (wm8998, wm1814) + - wlf,out-mono : A list of boolean values indicating whether each output is + mono or stereo. Position within the list indicates the output affected + (eg. First entry in the list corresponds to output 1). A non-zero value + indicates a mono output. If present, the number of values should be less + than or equal to the number of outputs, if less values are supplied the + additional outputs will be treated as stereo. - wlf,dmic-ref : DMIC reference voltage source for each input, can be selected from either MICVDD or one of the MICBIAS's, defines -- 2.1.4 -- 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 related [flat|nested] 8+ messages in thread
* Re: [PATCH v2 2/2] mfd: arizona: Update binding docs for selecting mono/stereo outputs 2015-12-14 10:19 ` Charles Keepax (?) @ 2015-12-20 3:39 ` Rob Herring -1 siblings, 0 replies; 8+ messages in thread From: Rob Herring @ 2015-12-20 3:39 UTC (permalink / raw) To: Charles Keepax; +Cc: lee.jones, devicetree, linux-kernel, patches On Mon, Dec 14, 2015 at 10:19:12AM +0000, Charles Keepax wrote: > Update the device tree binding documentation to include the wlf,out-mono > property that is used to specify whether each output is a mono or stereo > output. > > Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com> > --- > > Changes since v1: > - Clarify which outputs correspond to which entry in the out-mono list. > > Thanks, > Charles > > Documentation/devicetree/bindings/mfd/arizona.txt | 6 ++++++ > 1 file changed, 6 insertions(+) Acked-by: Rob Herring <robh@kernel.org> ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v2 2/2] mfd: arizona: Update binding docs for selecting mono/stereo outputs 2015-12-14 10:19 ` Charles Keepax (?) (?) @ 2016-01-11 7:32 ` Lee Jones -1 siblings, 0 replies; 8+ messages in thread From: Lee Jones @ 2016-01-11 7:32 UTC (permalink / raw) To: Charles Keepax; +Cc: devicetree, linux-kernel, patches, robh On Mon, 14 Dec 2015, Charles Keepax wrote: > Update the device tree binding documentation to include the wlf,out-mono > property that is used to specify whether each output is a mono or stereo > output. > > Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com> > --- > > Changes since v1: > - Clarify which outputs correspond to which entry in the out-mono list. > > Thanks, > Charles > > Documentation/devicetree/bindings/mfd/arizona.txt | 6 ++++++ > 1 file changed, 6 insertions(+) Applied, thanks. > diff --git a/Documentation/devicetree/bindings/mfd/arizona.txt b/Documentation/devicetree/bindings/mfd/arizona.txt > index 2b6ccdb..069e31d 100644 > --- a/Documentation/devicetree/bindings/mfd/arizona.txt > +++ b/Documentation/devicetree/bindings/mfd/arizona.txt > @@ -65,6 +65,12 @@ Optional properties: > that have not been specified are set to 0 by default. Entries are: > <IN1, IN2, IN3, IN4> (wm5102, wm5110, wm8280, wm8997) > <IN1A, IN2A, IN1B, IN2B> (wm8998, wm1814) > + - wlf,out-mono : A list of boolean values indicating whether each output is > + mono or stereo. Position within the list indicates the output affected > + (eg. First entry in the list corresponds to output 1). A non-zero value > + indicates a mono output. If present, the number of values should be less > + than or equal to the number of outputs, if less values are supplied the > + additional outputs will be treated as stereo. > > - wlf,dmic-ref : DMIC reference voltage source for each input, can be > selected from either MICVDD or one of the MICBIAS's, defines -- 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] 8+ messages in thread
* Re: [PATCH v2 1/2] mfd: arizona: Add device tree binding to specify mono outputs @ 2016-01-11 7:31 ` Lee Jones 0 siblings, 0 replies; 8+ messages in thread From: Lee Jones @ 2016-01-11 7:31 UTC (permalink / raw) To: Charles Keepax; +Cc: devicetree, linux-kernel, patches, robh On Mon, 14 Dec 2015, Charles Keepax wrote: > Add device tree bindings to support specifying outputs from the chip as > mono outputs. Whilst we are doing it change the out_mono pdata from a > bool to an int, because Sparse gets upset about using ARRAY_SIZE on > bools. > > Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com> > --- > > No changes since v1. > > Thanks, > Charles > > drivers/mfd/arizona-core.c | 10 ++++++++++ > include/linux/mfd/arizona/pdata.h | 2 +- > 2 files changed, 11 insertions(+), 1 deletion(-) Applied, thanks. > diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c > index b9489a0..4bb4866 100644 > --- a/drivers/mfd/arizona-core.c > +++ b/drivers/mfd/arizona-core.c > @@ -861,6 +861,16 @@ static int arizona_of_get_core_pdata(struct arizona *arizona) > count++; > } > > + count = 0; > + of_property_for_each_u32(arizona->dev->of_node, "wlf,out-mono", prop, > + cur, val) { > + if (count == ARRAY_SIZE(pdata->out_mono)) > + break; > + > + pdata->out_mono[count] = !!val; > + count++; > + } > + > return 0; > } > > diff --git a/include/linux/mfd/arizona/pdata.h b/include/linux/mfd/arizona/pdata.h > index 57b45ca..64faeef 100644 > --- a/include/linux/mfd/arizona/pdata.h > +++ b/include/linux/mfd/arizona/pdata.h > @@ -171,7 +171,7 @@ struct arizona_pdata { > int inmode[ARIZONA_MAX_INPUT]; > > /** Mode for outputs */ > - bool out_mono[ARIZONA_MAX_OUTPUT]; > + int out_mono[ARIZONA_MAX_OUTPUT]; > > /** PDM speaker mute setting */ > unsigned int spk_mute[ARIZONA_MAX_PDM_SPK]; -- 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] 8+ messages in thread
* Re: [PATCH v2 1/2] mfd: arizona: Add device tree binding to specify mono outputs @ 2016-01-11 7:31 ` Lee Jones 0 siblings, 0 replies; 8+ messages in thread From: Lee Jones @ 2016-01-11 7:31 UTC (permalink / raw) To: Charles Keepax Cc: devicetree-u79uwXL29TY76Z2rM5mHXA, linux-kernel-u79uwXL29TY76Z2rM5mHXA, patches-yzvPICuk2AATkU/dhu1WVueM+bqZidxxQQ4Iyu8u01E, robh-DgEjT+Ai2ygdnm+yROfE0A On Mon, 14 Dec 2015, Charles Keepax wrote: > Add device tree bindings to support specifying outputs from the chip as > mono outputs. Whilst we are doing it change the out_mono pdata from a > bool to an int, because Sparse gets upset about using ARRAY_SIZE on > bools. > > Signed-off-by: Charles Keepax <ckeepax-yzvPICuk2AATkU/dhu1WVueM+bqZidxxQQ4Iyu8u01E@public.gmane.org> > --- > > No changes since v1. > > Thanks, > Charles > > drivers/mfd/arizona-core.c | 10 ++++++++++ > include/linux/mfd/arizona/pdata.h | 2 +- > 2 files changed, 11 insertions(+), 1 deletion(-) Applied, thanks. > diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c > index b9489a0..4bb4866 100644 > --- a/drivers/mfd/arizona-core.c > +++ b/drivers/mfd/arizona-core.c > @@ -861,6 +861,16 @@ static int arizona_of_get_core_pdata(struct arizona *arizona) > count++; > } > > + count = 0; > + of_property_for_each_u32(arizona->dev->of_node, "wlf,out-mono", prop, > + cur, val) { > + if (count == ARRAY_SIZE(pdata->out_mono)) > + break; > + > + pdata->out_mono[count] = !!val; > + count++; > + } > + > return 0; > } > > diff --git a/include/linux/mfd/arizona/pdata.h b/include/linux/mfd/arizona/pdata.h > index 57b45ca..64faeef 100644 > --- a/include/linux/mfd/arizona/pdata.h > +++ b/include/linux/mfd/arizona/pdata.h > @@ -171,7 +171,7 @@ struct arizona_pdata { > int inmode[ARIZONA_MAX_INPUT]; > > /** Mode for outputs */ > - bool out_mono[ARIZONA_MAX_OUTPUT]; > + int out_mono[ARIZONA_MAX_OUTPUT]; > > /** PDM speaker mute setting */ > unsigned int spk_mute[ARIZONA_MAX_PDM_SPK]; -- 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] 8+ messages in thread
end of thread, other threads:[~2016-01-11 7:32 UTC | newest] Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2015-12-14 10:19 [PATCH v2 1/2] mfd: arizona: Add device tree binding to specify mono outputs Charles Keepax 2015-12-14 10:19 ` Charles Keepax 2015-12-14 10:19 ` [PATCH v2 2/2] mfd: arizona: Update binding docs for selecting mono/stereo outputs Charles Keepax 2015-12-14 10:19 ` Charles Keepax 2015-12-20 3:39 ` Rob Herring 2016-01-11 7:32 ` Lee Jones 2016-01-11 7:31 ` [PATCH v2 1/2] mfd: arizona: Add device tree binding to specify mono outputs Lee Jones 2016-01-11 7:31 ` 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.