Optimize the way how tlv320dac33 is powered uppon module and
soc initialization.
Also read the DAC33 ID registers, and update the reg_cache
to reflect it.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@nokia.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
dac33_read_reg_cache(codec, DAC33_LINER_TO_RLO_VOL));
}
dac33_read_reg_cache(codec, DAC33_LINER_TO_RLO_VOL));
}
+static inline void dac33_read_id(struct snd_soc_codec *codec)
+{
+ u8 reg;
+
+ dac33_read(codec, DAC33_DEVICE_ID_MSB, ®);
+ dac33_read(codec, DAC33_DEVICE_ID_LSB, ®);
+ dac33_read(codec, DAC33_DEVICE_REV_ID, ®);
+}
+
static inline void dac33_soft_power(struct snd_soc_codec *codec, int power)
{
u8 reg;
static inline void dac33_soft_power(struct snd_soc_codec *codec, int power)
{
u8 reg;
socdev->card->codec = codec;
dac33 = snd_soc_codec_get_drvdata(codec);
socdev->card->codec = codec;
dac33 = snd_soc_codec_get_drvdata(codec);
- /* Power up the codec */
- dac33_hard_power(codec, 1);
-
/* register pcms */
ret = snd_soc_new_pcms(socdev, SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1);
if (ret < 0) {
/* register pcms */
ret = snd_soc_new_pcms(socdev, SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1);
if (ret < 0) {
/* power on device */
dac33_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
/* power on device */
dac33_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
- /* Bias level configuration has enabled regulator an extra time */
- regulator_bulk_disable(ARRAY_SIZE(dac33->supplies), dac33->supplies);
-
goto error_gpio;
}
gpio_direction_output(dac33->power_gpio, 0);
goto error_gpio;
}
gpio_direction_output(dac33->power_gpio, 0);
- } else {
- dac33->chip_power = 1;
}
/* Check if the IRQ number is valid and request it */
}
/* Check if the IRQ number is valid and request it */
- ret = regulator_bulk_enable(ARRAY_SIZE(dac33->supplies),
- dac33->supplies);
+ /* Read the tlv320dac33 ID registers */
+ ret = dac33_hard_power(codec, 1);
- dev_err(codec->dev, "Failed to enable supplies: %d\n", ret);
- goto err_enable;
+ dev_err(codec->dev, "Failed to power up codec: %d\n", ret);
+ goto error_codec;
+ dac33_read_id(codec);
+ dac33_hard_power(codec, 0);
ret = snd_soc_register_codec(codec);
if (ret != 0) {
ret = snd_soc_register_codec(codec);
if (ret != 0) {
- /* Shut down the codec for now */
- dac33_hard_power(codec, 0);
-
- regulator_bulk_disable(ARRAY_SIZE(dac33->supplies), dac33->supplies);
-err_enable:
regulator_bulk_free(ARRAY_SIZE(dac33->supplies), dac33->supplies);
err_get:
if (dac33->irq >= 0) {
regulator_bulk_free(ARRAY_SIZE(dac33->supplies), dac33->supplies);
err_get:
if (dac33->irq >= 0) {
struct tlv320dac33_priv *dac33;
dac33 = i2c_get_clientdata(client);
struct tlv320dac33_priv *dac33;
dac33 = i2c_get_clientdata(client);
- dac33_hard_power(&dac33->codec, 0);
+
+ if (unlikely(dac33->chip_power))
+ dac33_hard_power(&dac33->codec, 0);
if (dac33->power_gpio >= 0)
gpio_free(dac33->power_gpio);
if (dac33->irq >= 0)
free_irq(dac33->irq, &dac33->codec);
if (dac33->power_gpio >= 0)
gpio_free(dac33->power_gpio);
if (dac33->irq >= 0)
free_irq(dac33->irq, &dac33->codec);
- regulator_bulk_disable(ARRAY_SIZE(dac33->supplies), dac33->supplies);
regulator_bulk_free(ARRAY_SIZE(dac33->supplies), dac33->supplies);
destroy_workqueue(dac33->dac33_wq);
regulator_bulk_free(ARRAY_SIZE(dac33->supplies), dac33->supplies);
destroy_workqueue(dac33->dac33_wq);