2 files changed, 26 insertions, 2 deletions

diff --git a/include/sound/tpa6130a2-plat.h b/include/sound/tpa6130a2-plat.h
index e8c901e749d8..e29fde6b5cbe 100644
--- a/include/sound/tpa6130a2-plat.h
+++ b/include/sound/tpa6130a2-plat.h
@@ -23,7 +23,13 @@
 #ifndef TPA6130A2_PLAT_H
 #define TPA6130A2_PLAT_H
 
+enum tpa_model {
+        TPA6130A2,
+        TPA6140A2,
+};
+
 struct tpa6130a2_platform_data {
+        enum tpa_model id;
         int power_gpio;
 };
 
diff --git a/sound/soc/codecs/tpa6130a2.c b/sound/soc/codecs/tpa6130a2.c
index 8e98ccfab75c..8b27281e62a1 100644
--- a/sound/soc/codecs/tpa6130a2.c
+++ b/sound/soc/codecs/tpa6130a2.c
@@ -41,6 +41,11 @@ static const char *tpa6130a2_supply_names[TPA6130A2_NUM_SUPPLIES] = {
         "Vdd",
 };
 
+static const char *tpa6140a2_supply_names[TPA6130A2_NUM_SUPPLIES] = {
+        "HPVdd",
+        "AVdd",
+};
+
 /* This struct is used to save the context */
 struct tpa6130a2_data {
         struct mutex mutex;
@@ -420,8 +425,21 @@ static int tpa6130a2_probe(struct i2c_client *client,
                 gpio_direction_output(data->power_gpio, 0);
         }
 
-        for (i = 0; i < ARRAY_SIZE(data->supplies); i++)
-                data->supplies[i].supply = tpa6130a2_supply_names[i];
+        switch (pdata->id) {
+        case TPA6130A2:
+                for (i = 0; i < ARRAY_SIZE(data->supplies); i++)
+                        data->supplies[i].supply = tpa6130a2_supply_names[i];
+                break;
+        case TPA6140A2:
+                for (i = 0; i < ARRAY_SIZE(data->supplies); i++)
+                        data->supplies[i].supply = tpa6140a2_supply_names[i];;
+                break;
+        default:
+                dev_warn(dev, "Unknown TPA model (%d). Assuming 6130A2\n",
+                         pdata->id);
+                for (i = 0; i < ARRAY_SIZE(data->supplies); i++)
+                        data->supplies[i].supply = tpa6130a2_supply_names[i];
+        }
 
         ret = regulator_bulk_get(dev, ARRAY_SIZE(data->supplies),
                                  data->supplies);