[PATCH v2 1/4] dt-bindings: sound: wm8994: document wlf,spkmode-pu property

[PATCH v2 1/4] dt-bindings: sound: wm8994: document wlf,spkmode-pu property

[Anthony Brandon]

Add the wlf,spkmode-pu property to control the Speaker Mode pull-up from
the device tree.

Signed-off-by: Anthony Brandon <anthony@amarulasolutions.com>
---
 Documentation/devicetree/bindings/sound/wm8994.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Documentation/devicetree/bindings/sound/wm8994.txt b/Documentation/devicetree/bindings/sound/wm8994.txt
index 4a9dead..b74a221 100644
--- a/Documentation/devicetree/bindings/sound/wm8994.txt
+++ b/Documentation/devicetree/bindings/sound/wm8994.txt
@@ -57,6 +57,9 @@ Optional properties:
 
   - wlf,ldoena-always-driven : If present LDOENA is always driven.
 
+  - wlf,spkmode-pu : If present enable the internal pull-up resistor on
+    the SPKMODE pin.
+
 Example:
 
 wm8994: codec@1a {
-- 
2.7.4

[PATCH v2 2/4] mfd: wm8994: Allow to configure Speaker Mode Pullup from dts

[Anthony Brandon]

From: Alberto Panizzo <alberto@amarulasolutions.com>

Configuring Speaker Mode Pullup was already supported in pdata, but not
in the dts.

Signed-off-by: Alberto Panizzo <alberto@amarulasolutions.com>
Signed-off-by: Anthony Brandon <anthony@amarulasolutions.com>
---
 drivers/mfd/wm8994-core.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/mfd/wm8994-core.c b/drivers/mfd/wm8994-core.c
index a944841..fa4b1b7 100644
--- a/drivers/mfd/wm8994-core.c
+++ b/drivers/mfd/wm8994-core.c
@@ -302,6 +302,8 @@ static int wm8994_set_pdata_from_of(struct wm8994 *wm8994)
 	if (of_find_property(np, "wlf,ldoena-always-driven", NULL))
 		pdata->lineout2fb = true;
 
+	pdata->spkmode_pu = of_property_read_bool(np, "wlf,spkmode-pu");
+
 	pdata->ldo[0].enable = of_get_named_gpio(np, "wlf,ldo1ena", 0);
 	if (pdata->ldo[0].enable < 0)
 		pdata->ldo[0].enable = 0;
-- 
2.7.4

[PATCH v2 3/4] dt-bindings: sound: wm8994: document wlf,csnaddr-pd property

[Anthony Brandon]

Add the wlf,csnaddr-pd property to allow the CS/Addr pull-down to be
controlled from the device tree.

Signed-off-by: Anthony Brandon <anthony@amarulasolutions.com>
---
 Documentation/devicetree/bindings/sound/wm8994.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Documentation/devicetree/bindings/sound/wm8994.txt b/Documentation/devicetree/bindings/sound/wm8994.txt
index b74a221..0795931 100644
--- a/Documentation/devicetree/bindings/sound/wm8994.txt
+++ b/Documentation/devicetree/bindings/sound/wm8994.txt
@@ -60,6 +60,9 @@ Optional properties:
   - wlf,spkmode-pu : If present enable the internal pull-up resistor on
     the SPKMODE pin.
 
+  - wlf,csnaddr-pd : If present enable the internal pull-down resistor on
+    the CS/ADDR pin.
+
 Example:
 
 wm8994: codec@1a {
-- 
2.7.4

[PATCH v2 4/4] mfd: wm8994: Allow to configure CS/ADDR Pulldown from dts

[Anthony Brandon]

From: Alberto Panizzo <alberto@amarulasolutions.com>

For designs where CS/ADDR pin is floating, it is useful to
allow dts to define whether to keep internal pull down or not.

Signed-off-by: Alberto Panizzo <alberto@amarulasolutions.com>
Signed-off-by: Anthony Brandon <anthony@amarulasolutions.com>
---
 drivers/mfd/wm8994-core.c        | 4 ++++
 include/linux/mfd/wm8994/pdata.h | 6 ++++++
 2 files changed, 10 insertions(+)

diff --git a/drivers/mfd/wm8994-core.c b/drivers/mfd/wm8994-core.c
index fa4b1b7..22bd652 100644
--- a/drivers/mfd/wm8994-core.c
+++ b/drivers/mfd/wm8994-core.c
@@ -304,6 +304,8 @@ static int wm8994_set_pdata_from_of(struct wm8994 *wm8994)
 
 	pdata->spkmode_pu = of_property_read_bool(np, "wlf,spkmode-pu");
 
+	pdata->csnaddr_pd = of_property_read_bool(np, "wlf,csnaddr-pd");
+
 	pdata->ldo[0].enable = of_get_named_gpio(np, "wlf,ldo1ena", 0);
 	if (pdata->ldo[0].enable < 0)
 		pdata->ldo[0].enable = 0;
@@ -562,6 +564,8 @@ static int wm8994_device_init(struct wm8994 *wm8994, int irq)
 
 	if (pdata->spkmode_pu)
 		pulls |= WM8994_SPKMODE_PU;
+	if (pdata->csnaddr_pd)
+		pulls |= WM8994_CSNADDR_PD;
 
 	/* Disable unneeded pulls */
 	wm8994_set_bits(wm8994, WM8994_PULL_CONTROL_2,
diff --git a/include/linux/mfd/wm8994/pdata.h b/include/linux/mfd/wm8994/pdata.h
index 90c6052..b19c370 100644
--- a/include/linux/mfd/wm8994/pdata.h
+++ b/include/linux/mfd/wm8994/pdata.h
@@ -222,6 +222,12 @@ struct wm8994_pdata {
 	 */
 	bool spkmode_pu;
 
+	/*
+	 * CS/ADDR must be pulled internally by the device on this
+	 * system.
+	 */
+	bool csnaddr_pd;
+
 	/**
 	 * Maximum number of channels clocks will be generated for,
 	 * useful for systems where and I2S bus with multiple data
-- 
2.7.4

Re: [PATCH v2 1/4] dt-bindings: sound: wm8994: document wlf,spkmode-pu property

[Charles Keepax]

On Mon, Jul 09, 2018 at 07:46:43PM +0200, Anthony Brandon wrote:
> Add the wlf,spkmode-pu property to control the Speaker Mode pull-up from
> the device tree.
> 
> Signed-off-by: Anthony Brandon <anthony@amarulasolutions.com>
> ---

Acked-by: Charles Keepax <ckeepax@opensource.cirrus.com>

Thanks,
Charles

Re: [PATCH v2 2/4] mfd: wm8994: Allow to configure Speaker Mode Pullup from dts

[Charles Keepax]

On Mon, Jul 09, 2018 at 07:46:44PM +0200, Anthony Brandon wrote:
> From: Alberto Panizzo <alberto@amarulasolutions.com>
> 
> Configuring Speaker Mode Pullup was already supported in pdata, but not
> in the dts.
> 
> Signed-off-by: Alberto Panizzo <alberto@amarulasolutions.com>
> Signed-off-by: Anthony Brandon <anthony@amarulasolutions.com>
> ---

Acked-by: Charles Keepax <ckeepax@opensource.cirrus.com>

Thanks,
Charles

Re: [PATCH v2 3/4] dt-bindings: sound: wm8994: document wlf,csnaddr-pd property

[Charles Keepax]

On Mon, Jul 09, 2018 at 07:46:45PM +0200, Anthony Brandon wrote:
> Add the wlf,csnaddr-pd property to allow the CS/Addr pull-down to be
> controlled from the device tree.
> 
> Signed-off-by: Anthony Brandon <anthony@amarulasolutions.com>
> ---

Acked-by: Charles Keepax <ckeepax@opensource.cirrus.com>

Thanks,
Charles

Re: [PATCH v2 4/4] mfd: wm8994: Allow to configure CS/ADDR Pulldown from dts

[Charles Keepax]

On Mon, Jul 09, 2018 at 07:46:46PM +0200, Anthony Brandon wrote:
> From: Alberto Panizzo <alberto@amarulasolutions.com>
> 
> For designs where CS/ADDR pin is floating, it is useful to
> allow dts to define whether to keep internal pull down or not.
> 
> Signed-off-by: Alberto Panizzo <alberto@amarulasolutions.com>
> Signed-off-by: Anthony Brandon <anthony@amarulasolutions.com>
> ---

Acked-by: Charles Keepax <ckeepax@opensource.cirrus.com>

Thanks,
Charles

Re: [PATCH v2 1/4] dt-bindings: sound: wm8994: document wlf,spkmode-pu property

[Rob Herring]

On Mon, Jul 09, 2018 at 07:46:43PM +0200, Anthony Brandon wrote:
> Add the wlf,spkmode-pu property to control the Speaker Mode pull-up from
> the device tree.
> 
> Signed-off-by: Anthony Brandon <anthony@amarulasolutions.com>
> ---
>  Documentation/devicetree/bindings/sound/wm8994.txt | 3 +++
>  1 file changed, 3 insertions(+)

Reviewed-by: Rob Herring <robh@kernel.org>

Re: [PATCH v2 3/4] dt-bindings: sound: wm8994: document wlf,csnaddr-pd property

[Rob Herring]

On Mon, Jul 09, 2018 at 07:46:45PM +0200, Anthony Brandon wrote:
> Add the wlf,csnaddr-pd property to allow the CS/Addr pull-down to be
> controlled from the device tree.
> 
> Signed-off-by: Anthony Brandon <anthony@amarulasolutions.com>
> ---
>  Documentation/devicetree/bindings/sound/wm8994.txt | 3 +++
>  1 file changed, 3 insertions(+)

Reviewed-by: Rob Herring <robh@kernel.org>

Re: [PATCH v2 2/4] mfd: wm8994: Allow to configure Speaker Mode Pullup from dts

[Lee Jones]

On Mon, 09 Jul 2018, Anthony Brandon wrote:

> From: Alberto Panizzo <alberto@amarulasolutions.com>
> 
> Configuring Speaker Mode Pullup was already supported in pdata, but not
> in the dts.
> 
> Signed-off-by: Alberto Panizzo <alberto@amarulasolutions.com>
> Signed-off-by: Anthony Brandon <anthony@amarulasolutions.com>
> ---
>  drivers/mfd/wm8994-core.c | 2 ++
>  1 file changed, 2 insertions(+)

Applied, thanks.

-- 
Lee Jones [李琼斯]
Linaro Services Technical Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

Re: [PATCH v2 4/4] mfd: wm8994: Allow to configure CS/ADDR Pulldown from dts

[Lee Jones]

On Mon, 09 Jul 2018, Anthony Brandon wrote:

> From: Alberto Panizzo <alberto@amarulasolutions.com>
> 
> For designs where CS/ADDR pin is floating, it is useful to
> allow dts to define whether to keep internal pull down or not.
> 
> Signed-off-by: Alberto Panizzo <alberto@amarulasolutions.com>
> Signed-off-by: Anthony Brandon <anthony@amarulasolutions.com>
> ---
>  drivers/mfd/wm8994-core.c        | 4 ++++
>  include/linux/mfd/wm8994/pdata.h | 6 ++++++
>  2 files changed, 10 insertions(+)

Applied, thanks.

-- 
Lee Jones [李琼斯]
Linaro Services Technical Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

Re: [PATCH v2 1/4] dt-bindings: sound: wm8994: document wlf,spkmode-pu property

[Anthony Brandon]

Hi,

Is there anything more I can do to get this (and patch 3/4) applied?
Or just wait a bit longer?
I'm asking because I noticed that changes 2 and 4 have been applied but
these have not.

Regards,
Anthony

On Wed, Jul 11, 2018 at 01:13:46PM -0600, Rob Herring wrote:
> On Mon, Jul 09, 2018 at 07:46:43PM +0200, Anthony Brandon wrote:
> > Add the wlf,spkmode-pu property to control the Speaker Mode pull-up from
> > the device tree.
> > 
> > Signed-off-by: Anthony Brandon <anthony@amarulasolutions.com>
> > ---
> >  Documentation/devicetree/bindings/sound/wm8994.txt | 3 +++
> >  1 file changed, 3 insertions(+)
> 
> Reviewed-by: Rob Herring <robh@kernel.org>

Re: [PATCH v2 1/4] dt-bindings: sound: wm8994: document wlf,spkmode-pu property

[Rob Herring]

On Mon, Jul 16, 2018 at 9:43 AM Anthony Brandon
<anthony@amarulasolutions.com> wrote:
>
> Hi,
>
> Is there anything more I can do to get this (and patch 3/4) applied?
> Or just wait a bit longer?
> I'm asking because I noticed that changes 2 and 4 have been applied but
> these have not.

That's probably because you didn't CC Mark and alsa ML on these.
Normally a series goes in together.

Anyways, I can apply them if there's no other changes to this file for 4.19.

Rob

Re: [PATCH v2 1/4] dt-bindings: sound: wm8994: document wlf,spkmode-pu property

[Anthony Brandon]

On Mon, Jul 16, 2018 at 10:27:31AM -0600, Rob Herring wrote:
> On Mon, Jul 16, 2018 at 9:43 AM Anthony Brandon
> <anthony@amarulasolutions.com> wrote:
> >
> > Hi,
> >
> > Is there anything more I can do to get this (and patch 3/4) applied?
> > Or just wait a bit longer?
> > I'm asking because I noticed that changes 2 and 4 have been applied but
> > these have not.
> 
> That's probably because you didn't CC Mark and alsa ML on these.
> Normally a series goes in together.
> 
> Anyways, I can apply them if there's no other changes to this file for 4.19.
> 
> Rob

Thanks, I understand. I'll keep that in mind for next time.

Regards,
Anthony