Skip to contentSkip to conversation

ASoC: tlv320aic3x: Add platform data and reset gpio handling

PATCH In review Jarkko Nikula 4 participants 9 messages May 5, 2010 – May 6, 2010

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 ASoC: tlv320aic3x: Add platform data and reset gpio handling

---

v2:

- Removed added regulator_bulk_disable brain fart from aic3x_i2c_probe
- Added comment to gpio_reset number in aic3x_pdata

---
 include/sound/tlv320aic3x.h    |   17 +++++++++++++++++
 sound/soc/codecs/tlv320aic3x.c |   25 +++++++++++++++++++++++++
 2 files changed, 42 insertions(+), 0 deletions(-)
 create mode 100644 include/sound/tlv320aic3x.h
include/sound/tlv320aic3x.h new file +17 -0
new file mode 100644
index 0000000..b1a5f34
@@ -0,0 +1,17 @@
+/*
+ * Platform data for Texas Instruments TLV320AIC3x codec
+ *
+ * Author: Jarkko Nikula <[email protected]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+#ifndef __TLV320AIC3x_H__
+#define __TLV320AIC3x_H__
+
+struct aic3x_pdata {
+	int gpio_reset; /* < 0 if not used */
+};
+
+#endif
\ No newline at end of file
sound/soc/codecs/tlv320aic3x.c +25 -0
index b2c2794..435adf1 100644
@@ -38,6 +38,7 @@
 #include <linux/delay.h>
 #include <linux/pm.h>
 #include <linux/i2c.h>
+#include <linux/gpio.h>
 #include <linux/regulator/consumer.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
@@ -48,6 +49,7 @@
 #include <sound/soc-dapm.h>
 #include <sound/initval.h>
 #include <sound/tlv.h>
+#include <sound/tlv320aic3x.h>
 
 #include "tlv320aic3x.h"
 
@@ -65,6 +67,7 @@ struct aic3x_priv {
 	struct regulator_bulk_data supplies[AIC3X_NUM_SUPPLIES];
 	unsigned int sysclk;
 	int master;
+	int gpio_reset;
 };
 
 /*
@@ -1279,6 +1282,10 @@ static int aic3x_unregister(struct aic3x_priv *aic3x)
 	snd_soc_unregister_dai(&aic3x_dai);
 	snd_soc_unregister_codec(&aic3x->codec);
 
+	if (aic3x->gpio_reset >= 0) {
+		gpio_set_value(aic3x->gpio_reset, 0);
+		gpio_free(aic3x->gpio_reset);
+	}
 	regulator_bulk_disable(ARRAY_SIZE(aic3x->supplies), aic3x->supplies);
 	regulator_bulk_free(ARRAY_SIZE(aic3x->supplies), aic3x->supplies);
 
@@ -1303,6 +1310,7 @@ static int aic3x_i2c_probe(struct i2c_client *i2c,
 {
 	struct snd_soc_codec *codec;
 	struct aic3x_priv *aic3x;
+	struct aic3x_pdata *pdata = i2c->dev.platform_data;
 	int ret, i;
 
 	aic3x = kzalloc(sizeof(struct aic3x_priv), GFP_KERNEL);
@@ -1319,6 +1327,15 @@ static int aic3x_i2c_probe(struct i2c_client *i2c,
 
 	i2c_set_clientdata(i2c, aic3x);
 
+	aic3x->gpio_reset = -1;
+	if (pdata && pdata->gpio_reset >= 0) {
+		ret = gpio_request(pdata->gpio_reset, "tlv320aic3x reset");
+		if (ret != 0)
+			goto err_gpio;
+		aic3x->gpio_reset = pdata->gpio_reset;
+		gpio_direction_output(aic3x->gpio_reset, 0);
+	}
+
 	for (i = 0; i < ARRAY_SIZE(aic3x->supplies); i++)
 		aic3x->supplies[i].supply = aic3x_supply_names[i];
 
@@ -1336,11 +1353,19 @@ static int aic3x_i2c_probe(struct i2c_client *i2c,
 		goto err_enable;
 	}
 
+	if (aic3x->gpio_reset >= 0) {
+		udelay(1);
+		gpio_set_value(aic3x->gpio_reset, 1);
+	}
+
 	return aic3x_register(codec);
 
 err_enable:
 	regulator_bulk_free(ARRAY_SIZE(aic3x->supplies), aic3x->supplies);
 err_get:
+	if (aic3x->gpio_reset >= 0)
+		gpio_free(aic3x->gpio_reset);
+err_gpio:
 	kfree(aic3x);
 	return ret;
 }
Signature · 1 line
1.7.0
Acked-by on v2 1/1
#1 lore raw
Quoted 1 line · Jarkko Nikula

but...

sound/soc/codecs/tlv320aic3x.c static int aic3x_unregister(struct aic3x_priv *aic3x) · line 1288

Quoted 4 lines
sound/soc/codecs/tlv320aic3x.c +4 -0
+	if (aic3x->gpio_reset >= 0) {
+		gpio_set_value(aic3x->gpio_reset, 0);
+		gpio_free(aic3x->gpio_reset);
+	}

There is gpio_is_valid().

Acked-by Reviewed-by on v2 1/1
#2 lore raw
In reply to Jarkko Nikula
Quoted 8 lines · On Wednesday 05 May 2010 13:02:03 ext Jarkko Nikula wrote:

---

v2:

- Removed added regulator_bulk_disable brain fart from aic3x_i2c_probe
- Added comment to gpio_reset number in aic3x_pdata

Would have been nice to have a commit message for this just in case. Something like this would do:
Handle the reset GPIO within the codec driver in order to follow the startup protocol for the tlv320aic3x codecs.

Can you Liam add this message (if Jarkko agrees)?

I can give my:

Or

Whichever you feel appropriate in case of the tlv320aic3x codec driver.

Signature · 1 line
Péter
#3 lore raw
Quoted 10 lines · Peter Ujfalusi
Quoted 8 lines · On Wednesday 05 May 2010 13:02:03 ext Jarkko Nikula wrote:

---

v2:

- Removed added regulator_bulk_disable brain fart from aic3x_i2c_probe
- Added comment to gpio_reset number in aic3x_pdata

Quoted 6 lines

Would have been nice to have a commit message for this just in case. Something like this would do:
Handle the reset GPIO within the codec driver in order to follow the startup protocol for the tlv320aic3x codecs.

Can you Liam add this message (if Jarkko agrees)?

I can add a message if required.

Thanks

Liam

Signature · 3 lines
Freelance Developer, SlimLogic Ltd
ASoC and Voltage Regulator Maintainer.
http://www.slimlogic.co.uk
#4 lore raw
Quoted 2 lines · On Thursday 06 May 2010 11:17:55 ext Liam Girdwood wrote:

I can add a message if required.

I think it is always a good idea to explain what, and why the change. In this case the change is not that obvious.

Also all machines, which are using the tlv320aic3x should be aware, that if they do not have the reset GPIO (which they _should_), than they have to set the gpio_reset to -1, unless they want to request gpio0 in the tlv320aic3x driver for fun ;)

Quoted 4 lines

Thanks

Liam

Signature · 5 lines
Péter
_______________________________________________
Alsa-devel mailing list
[email protected]
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
#5 lore raw
Quoted 4 lines · Peter Ujfalusi

Also all machines, which are using the tlv320aic3x should be aware, that if they do not have the reset GPIO (which they _should_), than they have to set the gpio_reset to -1, unless they want to request gpio0 in the tlv320aic3x driver for fun ;)

This should be relatively safe here since the platform data was added at the same time - it's not changing the semantics underneath existing code.

#6 lore raw
Quoted 9 lines · On Thursday 06 May 2010 12:52:13 ext Mark Brown wrote:
Quoted 4 lines · Peter Ujfalusi

Also all machines, which are using the tlv320aic3x should be aware, that if they do not have the reset GPIO (which they _should_), than they have to set the gpio_reset to -1, unless they want to request gpio0 in the tlv320aic3x driver for fun ;)

This should be relatively safe here since the platform data was added at the same time - it's not changing the semantics underneath existing code.

Yes, it is actually _safe_

Signature · 1 line
Péter
#7 lore raw
In reply to Peter Ujfalusi
Quoted 10 lines · On Thu, 6 May 2010 11:09:34 +0300 Peter Ujfalusi <[email protected]>…
Quoted 8 lines · On Wednesday 05 May 2010 13:02:03 ext Jarkko Nikula wrote:

---

v2:

- Removed added regulator_bulk_disable brain fart from aic3x_i2c_probe
- Added comment to gpio_reset number in aic3x_pdata

Quoted 7 lines

Would have been nice to have a commit message for this just in case. Something like this would do:
Handle the reset GPIO within the codec driver in order to follow the startup protocol for the tlv320aic3x codecs.

Can you Liam add this message (if Jarkko agrees)?

Yeah, Peter is right. Even this reset 'protocol' is business as usual, reset is released after voltages are stabilized, this is kind of fix to patch adding regulator support so the commit message is nice be there.

Signature · 1 line
Jarkko
#8 lore raw
In reply to Jarkko Nikula
Quoted 6 lines · Jarkko Nikula

---

v2:

Quoted 8 lines

- Removed added regulator_bulk_disable brain fart from aic3x_i2c_probe
- Added comment to gpio_reset number in aic3x_pdata

---
 include/sound/tlv320aic3x.h    |   17 +++++++++++++++++
 sound/soc/codecs/tlv320aic3x.c |   25 +++++++++++++++++++++++++
 2 files changed, 42 insertions(+), 0 deletions(-)
 create mode 100644 include/sound/tlv320aic3x.h

Applied with commit message.

Thanks

Liam

Signature · 3 lines
Freelance Developer, SlimLogic Ltd
ASoC and Voltage Regulator Maintainer.
http://www.slimlogic.co.uk