1 files changed, 48 insertions, 87 deletions

diff --git a/sound/soc/codecs/tpa6130a2.c b/sound/soc/codecs/tpa6130a2.c
index 99b70e5978a2..239e0c461068 100644
--- a/sound/soc/codecs/tpa6130a2.c
+++ b/sound/soc/codecs/tpa6130a2.c
@@ -3,7 +3,7 @@
  *
  * Copyright (C) Nokia Corporation
  *
- * Author: Peter Ujfalusi <peter.ujfalusi@nokia.com>
+ * Author: Peter Ujfalusi <peter.ujfalusi@ti.com>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -29,7 +29,6 @@
 #include <linux/slab.h>
 #include <sound/tpa6130a2-plat.h>
 #include <sound/soc.h>
-#include <sound/soc-dapm.h>
 #include <sound/tlv.h>
 
 #include "tpa6130a2.h"
@@ -42,7 +41,7 @@ struct tpa6130a2_data {
         unsigned char regs[TPA6130A2_CACHEREGNUM];
         struct regulator *supply;
         int power_gpio;
-        unsigned char power_state;
+        u8 power_state:1;
         enum tpa_model id;
 };
 
@@ -78,8 +77,10 @@ static int tpa6130a2_i2c_write(int reg, u8 value)
 
         if (data->power_state) {
                 val = i2c_smbus_write_byte_data(tpa6130a2_client, reg, value);
-                if (val < 0)
+                if (val < 0) {
                         dev_err(&tpa6130a2_client->dev, "Write failed\n");
+                        return val;
+                }
         }
 
         /* Either powered on or off, we save the context */
@@ -98,47 +99,58 @@ static u8 tpa6130a2_read(int reg)
         return data->regs[reg];
 }
 
-static void tpa6130a2_initialize(void)
+static int tpa6130a2_initialize(void)
 {
         struct tpa6130a2_data *data;
-        int i;
+        int i, ret = 0;
 
         BUG_ON(tpa6130a2_client == NULL);
         data = i2c_get_clientdata(tpa6130a2_client);
 
-        for (i = 1; i < TPA6130A2_REG_VERSION; i++)
-                tpa6130a2_i2c_write(i, data->regs[i]);
+        for (i = 1; i < TPA6130A2_REG_VERSION; i++) {
+                ret = tpa6130a2_i2c_write(i, data->regs[i]);
+                if (ret < 0)
+                        break;
+        }
+
+        return ret;
 }
 
-static int tpa6130a2_power(int power)
+static int tpa6130a2_power(u8 power)
 {
         struct  tpa6130a2_data *data;
         u8      val;
-        int     ret;
+        int     ret = 0;
 
         BUG_ON(tpa6130a2_client == NULL);
         data = i2c_get_clientdata(tpa6130a2_client);
 
         mutex_lock(&data->mutex);
-        if (power) {
-                /* Power on */
-                if (data->power_gpio >= 0)
-                        gpio_set_value(data->power_gpio, 1);
+        if (power == data->power_state)
+                goto exit;
 
+        if (power) {
                 ret = regulator_enable(data->supply);
                 if (ret != 0) {
                         dev_err(&tpa6130a2_client->dev,
                                 "Failed to enable supply: %d\n", ret);
                         goto exit;
                 }
+                /* Power on */
+                if (data->power_gpio >= 0)
+                        gpio_set_value(data->power_gpio, 1);
 
                 data->power_state = 1;
-                tpa6130a2_initialize();
-
-                /* Clear SWS */
-                val = tpa6130a2_read(TPA6130A2_REG_CONTROL);
-                val &= ~TPA6130A2_SWS;
-                tpa6130a2_i2c_write(TPA6130A2_REG_CONTROL, val);
+                ret = tpa6130a2_initialize();
+                if (ret < 0) {
+                        dev_err(&tpa6130a2_client->dev,
+                                "Failed to initialize chip\n");
+                        if (data->power_gpio >= 0)
+                                gpio_set_value(data->power_gpio, 0);
+                        regulator_disable(data->supply);
+                        data->power_state = 0;
+                        goto exit;
+                }
         } else {
                 /* set SWS */
                 val = tpa6130a2_read(TPA6130A2_REG_CONTROL);
@@ -284,6 +296,7 @@ static void tpa6130a2_channel_enable(u8 channel, int enable)
                 /* Enable amplifier */
                 val = tpa6130a2_read(TPA6130A2_REG_CONTROL);
                 val |= channel;
+                val &= ~TPA6130A2_SWS;
                 tpa6130a2_i2c_write(TPA6130A2_REG_CONTROL, val);
 
                 /* Unmute channel */
@@ -304,84 +317,33 @@ static void tpa6130a2_channel_enable(u8 channel, int enable)
         }
 }
 
-static int tpa6130a2_left_event(struct snd_soc_dapm_widget *w,
-                struct snd_kcontrol *kcontrol, int event)
-{
-        switch (event) {
-        case SND_SOC_DAPM_POST_PMU:
-                tpa6130a2_channel_enable(TPA6130A2_HP_EN_L, 1);
-                break;
-        case SND_SOC_DAPM_POST_PMD:
-                tpa6130a2_channel_enable(TPA6130A2_HP_EN_L, 0);
-                break;
-        }
-        return 0;
-}
-
-static int tpa6130a2_right_event(struct snd_soc_dapm_widget *w,
-                struct snd_kcontrol *kcontrol, int event)
-{
-        switch (event) {
-        case SND_SOC_DAPM_POST_PMU:
-                tpa6130a2_channel_enable(TPA6130A2_HP_EN_R, 1);
-                break;
-        case SND_SOC_DAPM_POST_PMD:
-                tpa6130a2_channel_enable(TPA6130A2_HP_EN_R, 0);
-                break;
-        }
-        return 0;
-}
-
-static int tpa6130a2_supply_event(struct snd_soc_dapm_widget *w,
-                struct snd_kcontrol *kcontrol, int event)
+int tpa6130a2_stereo_enable(struct snd_soc_codec *codec, int enable)
 {
         int ret = 0;
-
-        switch (event) {
-        case SND_SOC_DAPM_POST_PMU:
+        if (enable) {
                 ret = tpa6130a2_power(1);
-                break;
-        case SND_SOC_DAPM_POST_PMD:
+                if (ret < 0)
+                        return ret;
+                tpa6130a2_channel_enable(TPA6130A2_HP_EN_R | TPA6130A2_HP_EN_L,
+                                         1);
+        } else {
+                tpa6130a2_channel_enable(TPA6130A2_HP_EN_R | TPA6130A2_HP_EN_L,
+                                         0);
                 ret = tpa6130a2_power(0);
-                break;
         }
+
         return ret;
 }
-
-static const struct snd_soc_dapm_widget tpa6130a2_dapm_widgets[] = {
-        SND_SOC_DAPM_PGA_E("TPA6130A2 Left", SND_SOC_NOPM,
-                        0, 0, NULL, 0, tpa6130a2_left_event,
-                        SND_SOC_DAPM_POST_PMU|SND_SOC_DAPM_POST_PMD),
-        SND_SOC_DAPM_PGA_E("TPA6130A2 Right", SND_SOC_NOPM,
-                        0, 0, NULL, 0, tpa6130a2_right_event,
-                        SND_SOC_DAPM_POST_PMU|SND_SOC_DAPM_POST_PMD),
-        SND_SOC_DAPM_SUPPLY("TPA6130A2 Enable", SND_SOC_NOPM,
-                        0, 0, tpa6130a2_supply_event,
-                        SND_SOC_DAPM_POST_PMU|SND_SOC_DAPM_POST_PMD),
-        /* Outputs */
-        SND_SOC_DAPM_OUTPUT("TPA6130A2 Headphone Left"),
-        SND_SOC_DAPM_OUTPUT("TPA6130A2 Headphone Right"),
-};
-
-static const struct snd_soc_dapm_route audio_map[] = {
-        {"TPA6130A2 Headphone Left", NULL, "TPA6130A2 Left"},
-        {"TPA6130A2 Headphone Right", NULL, "TPA6130A2 Right"},
-
-        {"TPA6130A2 Headphone Left", NULL, "TPA6130A2 Enable"},
-        {"TPA6130A2 Headphone Right", NULL, "TPA6130A2 Enable"},
-};
+EXPORT_SYMBOL_GPL(tpa6130a2_stereo_enable);
 
 int tpa6130a2_add_controls(struct snd_soc_codec *codec)
 {
         struct  tpa6130a2_data *data;
 
-        BUG_ON(tpa6130a2_client == NULL);
-        data = i2c_get_clientdata(tpa6130a2_client);
-
-        snd_soc_dapm_new_controls(codec, tpa6130a2_dapm_widgets,
-                                ARRAY_SIZE(tpa6130a2_dapm_widgets));
+        if (tpa6130a2_client == NULL)
+                return -ENODEV;
 
-        snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map));
+        data = i2c_get_clientdata(tpa6130a2_client);
 
         if (data->id == TPA6140A2)
                 return snd_soc_add_controls(codec, tpa6140a2_controls,
@@ -389,7 +351,6 @@ int tpa6130a2_add_controls(struct snd_soc_codec *codec)
         else
                 return snd_soc_add_controls(codec, tpa6130a2_controls,
                                                 ARRAY_SIZE(tpa6130a2_controls));
-
 }
 EXPORT_SYMBOL_GPL(tpa6130a2_add_controls);
 
@@ -534,7 +495,7 @@ static void __exit tpa6130a2_exit(void)
         i2c_del_driver(&tpa6130a2_i2c_driver);
 }
 
-MODULE_AUTHOR("Peter Ujfalusi");
+MODULE_AUTHOR("Peter Ujfalusi <peter.ujfalusi@ti.com>");
 MODULE_DESCRIPTION("TPA6130A2 Headphone amplifier driver");
 MODULE_LICENSE("GPL");