diff mbox series

[v1,2/5] ASoC: wm8904: Don't touch GPIO configs set to 0xFFFF

Message ID 20250206163152.423199-3-francesco@dolcini.it (mailing list archive)
State New
Headers show
Series ASoC: wm8904: Add DMIC and DRC support | expand

Commit Message

Francesco Dolcini Feb. 6, 2025, 4:31 p.m. UTC 
From: Ernest Van Hoecke <ernest.vanhoecke@toradex.com>

When updating the GPIO registers, do nothing for all fields of gpio_cfg
that are "0xFFFF".

This "do nothing" flag used to be 0 to easily check whether the gpio_cfg
field was actually set inside pdata or left empty (default).

However, 0 is a valid configuration for these registers, while 0xFFFF is
not.

With this change, users can explicitly set them to 0. Not setting
gpio_cfg in the platform data will now lead to setting all GPIO
registers to 0 instead of leaving them unset.

No one is using this platform data with this codec.

The change gets the driver ready to properly set gpio_cfg from the DT.

Datasheet: https://statics.cirrus.com/pubs/proDatasheet/WM8904_Rev4.1.pdf
Signed-off-by: Ernest Van Hoecke <ernest.vanhoecke@toradex.com>
Signed-off-by: Francesco Dolcini <francesco.dolcini@toradex.com>
---
 sound/soc/codecs/wm8904.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Charles Keepax Feb. 17, 2025, 9:57 a.m. UTC | #1 
On Thu, Feb 06, 2025 at 05:31:49PM +0100, Francesco Dolcini wrote:
> From: Ernest Van Hoecke <ernest.vanhoecke@toradex.com>
> 
> When updating the GPIO registers, do nothing for all fields of gpio_cfg
> that are "0xFFFF".
> 
> This "do nothing" flag used to be 0 to easily check whether the gpio_cfg
> field was actually set inside pdata or left empty (default).
> 
> However, 0 is a valid configuration for these registers, while 0xFFFF is
> not.
> 
> With this change, users can explicitly set them to 0. Not setting
> gpio_cfg in the platform data will now lead to setting all GPIO
> registers to 0 instead of leaving them unset.
> 
> No one is using this platform data with this codec.
> 
> The change gets the driver ready to properly set gpio_cfg from the DT.
> 
> Datasheet: https://statics.cirrus.com/pubs/proDatasheet/WM8904_Rev4.1.pdf
> Signed-off-by: Ernest Van Hoecke <ernest.vanhoecke@toradex.com>
> Signed-off-by: Francesco Dolcini <francesco.dolcini@toradex.com>
> ---

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

Thanks,
Charles
diff mbox series

Patch

diff --git a/sound/soc/codecs/wm8904.c b/sound/soc/codecs/wm8904.c
index aef82532f8cf..2082ff12d336 100644
--- a/sound/soc/codecs/wm8904.c
+++ b/sound/soc/codecs/wm8904.c
@@ -2270,7 +2270,8 @@  static int wm8904_i2c_probe(struct i2c_client *i2c)
 	/* Apply configuration from the platform data. */
 	if (wm8904->pdata) {
 		for (i = 0; i < WM8904_GPIO_REGS; i++) {
-			if (!wm8904->pdata->gpio_cfg[i])
+			/* 0xFFFF in this config means "don't touch" */
+			if (wm8904->pdata->gpio_cfg[i] == 0xffff)
 				continue;
 
 			regmap_update_bits(wm8904->regmap,