ASoC: tlv320aic3x: Add platform data and reset gpio handling
Subsystems (3)
PATCH 1/1 ASoC: tlv320aic3x: Add platform data and reset gpio handling
--- include/sound/tlv320aic3x.h | 17 +++++++++++++++++ sound/soc/codecs/tlv320aic3x.c | 26 ++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 0 deletions(-) create mode 100644 include/sound/tlv320aic3x.h
include/sound/tlv320aic3x.h new file +17 -0
@@ -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; +}; + +#endif
sound/soc/codecs/tlv320aic3x.c +26 -0
@@ -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,20 @@ 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: +regulator_bulk_disable (ARRAY_SIZE (aic3x->supplies), aic3x->supplies); +if (aic3x->gpio_reset >=0 ) +gpio_free (aic3x->gpio_reset); +err_gpio:kfree (aic3x);return ret; }
Signature · 1 line
1.7.0
Hi,
Quoted 99 lines · On Wednesday 05 May 2010 11:13:20 ext Jarkko Nikula wrote:
Signed-off-by Jarkko Nikula <[email protected]>--- include/sound/tlv320aic3x.h | 17 +++++++++++++++++ sound/soc/codecs/tlv320aic3x.c | 26 ++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 0 deletions(-) create mode 100644 include/sound/tlv320aic3x.hinclude/sound/tlv320aic3x.h new file +17
-0@@ -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; +}; + +#endif (quoted diff) +0
-0
b/sound/soc/codecs/tlv320aic3x.cindex b2c2794..cdcfb6b 100644sound/soc/codecs/tlv320aic3x.c +18
-0@@ -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,20 @@ static int aic3x_i2c_probe(struct i2c_client *i2c, goto err_enable; } +if (aic3x->gpio_reset >=0 ) {
sound/soc/codecs/tlv320aic3x.c static int aic3x_i2c_probe(struct i2c_client *i2c, · line 1366
Quoted 10 lines
sound/soc/codecs/tlv320aic3x.c +5
-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: +regulator_bulk_disable (ARRAY_SIZE (aic3x->supplies), aic3x->supplies);
This looks suspicious (disable after free?)
On the other hand, is there a need to disable at all in error case?
sound/soc/codecs/tlv320aic3x.c static int aic3x_i2c_probe(struct i2c_client *i2c, · line 1372
Quoted 6 lines
sound/soc/codecs/tlv320aic3x.c +3
-0+if (aic3x->gpio_reset >=0 ) +gpio_free (aic3x->gpio_reset); +err_gpio:kfree (aic3x);return ret; }
Would be better to order:
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
Péter
Quoted 8 lines · On Wed, 5 May 2010 12:35:55 +0300 Peter Ujfalusi <[email protected]>…
sound/soc/codecs/tlv320aic3x.c static int aic3x_i2c_probe(struct i2c_client *i2c, · line 1366
Quoted 4 lines
err_enable:sound/soc/codecs/tlv320aic3x.c +1
-0regulator_bulk_free (ARRAY_SIZE (aic3x->supplies), aic3x->supplies); err_get: +regulator_bulk_disable (ARRAY_SIZE (aic3x->supplies), aic3x->supplies);This looks suspicious (disable after free?)
On the other hand, is there a need to disable at all in error case?
Oops. How that went there. Thanks for noticing!
Signature · 1 line
Jarkko