1 files changed, 6 insertions, 7 deletions

diff --git a/drivers/mfd/twl-core.c b/drivers/mfd/twl-core.c
index b8f2a4e7f6e7..a2eddc70995c 100644
--- a/drivers/mfd/twl-core.c
+++ b/drivers/mfd/twl-core.c
@@ -110,7 +110,7 @@
 #endif
 
 #if defined(CONFIG_TWL4030_CODEC) || defined(CONFIG_TWL4030_CODEC_MODULE) ||\
-        defined(CONFIG_SND_SOC_TWL6040) || defined(CONFIG_SND_SOC_TWL6040_MODULE)
+        defined(CONFIG_TWL6040_CORE) || defined(CONFIG_TWL6040_CORE_MODULE)
 #define twl_has_codec() true
 #else
 #define twl_has_codec() false
@@ -815,20 +815,19 @@ add_children(struct twl4030_platform_data *pdata, unsigned long features)
                         return PTR_ERR(child);
         }
 
-        if (twl_has_codec() && pdata->codec && twl_class_is_4030()) {
+        if (twl_has_codec() && pdata->audio && twl_class_is_4030()) {
                 sub_chip_id = twl_map[TWL_MODULE_AUDIO_VOICE].sid;
                 child = add_child(sub_chip_id, "twl4030-audio",
-                                pdata->codec, sizeof(*pdata->codec),
+                                pdata->audio, sizeof(*pdata->audio),
                                 false, 0, 0);
                 if (IS_ERR(child))
                         return PTR_ERR(child);
         }
 
-        /* Phoenix codec driver is probed directly atm */
-        if (twl_has_codec() && pdata->codec && twl_class_is_6030()) {
+        if (twl_has_codec() && pdata->audio && twl_class_is_6030()) {
                 sub_chip_id = twl_map[TWL_MODULE_AUDIO_VOICE].sid;
-                child = add_child(sub_chip_id, "twl6040-codec",
-                                pdata->codec, sizeof(*pdata->codec),
+                child = add_child(sub_chip_id, "twl6040",
+                                pdata->audio, sizeof(*pdata->audio),
                                 false, 0, 0);
                 if (IS_ERR(child))
                         return PTR_ERR(child);