On 26 Jun 2010, at 16:14, Vasily Khoruzhick anarsoul@gmail.com wrote:
Some machines require some tricks to enable/disable codec, i.e. disable or enable i2s clock before enabling/disabling codec, and just configuring gpio is not enough; some machines have no reset pin (reset is performed on codec power on automatically). Fix that issue by using machine-specific callback to enable codec power.
Signed-off-by: Vasily Khoruzhick anarsoul@gmail.com
This is fine but it'd be really nice to preserve the use of GPIOs since that will cover the majority of machines - for example, by providing a default callback if none is provided and GPIOs are. This will also avoid the need to update existing machine drivers (which needs to be done otherwise).
However, I do wonder if the more complex set_power() callbacks might not just end up as regulator API consumers?
include/sound/uda1380.h | 3 +-- sound/soc/codecs/uda1380.c | 25 +++--------------------- 2 files changed, 4 insertions(+), 24 deletions(-)
diff --git a/include/sound/uda1380.h b/include/sound/uda1380.h index 381319c..d2171dc 100644 --- a/include/sound/uda1380.h +++ b/include/sound/uda1380.h @@ -12,8 +12,7 @@ #define __UDA1380_H
struct uda1380_platform_data {
- int gpio_power;
- int gpio_reset;
- void (*set_power)(int); int dac_clk;
#define UDA1380_DAC_CLK_SYSCLK 0 #define UDA1380_DAC_CLK_WSPLL 1 diff --git a/sound/soc/codecs/uda1380.c b/sound/soc/codecs/uda1380.c index 2f925a2..2b7f200 100644 --- a/sound/soc/codecs/uda1380.c +++ b/sound/soc/codecs/uda1380.c @@ -19,7 +19,6 @@ #include <linux/types.h> #include <linux/slab.h> #include <linux/errno.h> -#include <linux/gpio.h> #include <linux/delay.h> #include <linux/i2c.h> #include <linux/workqueue.h> @@ -752,22 +751,11 @@ static int uda1380_register(struct uda1380_priv *uda1380) return -EINVAL; }
- if (!pdata || !pdata->gpio_power || !pdata->gpio_reset)
- if (!pdata || !pdata->set_power) return -EINVAL;
- ret = gpio_request(pdata->gpio_power, "uda1380 power");
- if (ret)
goto err_out;- ret = gpio_request(pdata->gpio_reset, "uda1380 reset");
- if (ret)
goto err_gpio;- gpio_direction_output(pdata->gpio_power, 1);
- /* we may need to have the clock running here - pH5 */
- gpio_direction_output(pdata->gpio_reset, 1);
- udelay(5);
- gpio_set_value(pdata->gpio_reset, 0);
pdata->set_power(1);
mutex_init(&codec->mutex); INIT_LIST_HEAD(&codec->dapm_widgets);
@@ -818,11 +806,6 @@ static int uda1380_register(struct uda1380_priv *uda1380) err_dai: snd_soc_unregister_codec(codec); err_reset:
- gpio_set_value(pdata->gpio_power, 0);
- gpio_free(pdata->gpio_reset);
-err_gpio:
- gpio_free(pdata->gpio_power);
-err_out: return ret; }
@@ -834,9 +817,7 @@ static void uda1380_unregister(struct uda1380_priv *uda1380) snd_soc_unregister_dais(uda1380_dai, ARRAY_SIZE(uda1380_dai)); snd_soc_unregister_codec(&uda1380->codec);
- gpio_set_value(pdata->gpio_power, 0);
- gpio_free(pdata->gpio_reset);
- gpio_free(pdata->gpio_power);
pdata->set_power(0);
kfree(uda1380); uda1380_codec = NULL;
-- 1.7.1