diff options
Diffstat (limited to 'drivers/mfd')
-rw-r--r-- | drivers/mfd/twl-core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mfd/twl-core.c b/drivers/mfd/twl-core.c index 562cd4935e17..720e099e506d 100644 --- a/drivers/mfd/twl-core.c +++ b/drivers/mfd/twl-core.c | |||
@@ -109,7 +109,7 @@ | |||
109 | #endif | 109 | #endif |
110 | 110 | ||
111 | #if defined(CONFIG_TWL4030_CODEC) || defined(CONFIG_TWL4030_CODEC_MODULE) ||\ | 111 | #if defined(CONFIG_TWL4030_CODEC) || defined(CONFIG_TWL4030_CODEC_MODULE) ||\ |
112 | defined(CONFIG_SND_SOC_TWL6030) || defined(CONFIG_SND_SOC_TWL6030_MODULE) | 112 | defined(CONFIG_SND_SOC_TWL6040) || defined(CONFIG_SND_SOC_TWL6040_MODULE) |
113 | #define twl_has_codec() true | 113 | #define twl_has_codec() true |
114 | #else | 114 | #else |
115 | #define twl_has_codec() false | 115 | #define twl_has_codec() false |
@@ -708,7 +708,7 @@ add_children(struct twl4030_platform_data *pdata, unsigned long features) | |||
708 | /* Phoenix*/ | 708 | /* Phoenix*/ |
709 | if (twl_has_codec() && pdata->codec && twl_class_is_6030()) { | 709 | if (twl_has_codec() && pdata->codec && twl_class_is_6030()) { |
710 | sub_chip_id = twl_map[TWL_MODULE_AUDIO_VOICE].sid; | 710 | sub_chip_id = twl_map[TWL_MODULE_AUDIO_VOICE].sid; |
711 | child = add_child(sub_chip_id, "twl6030_codec", | 711 | child = add_child(sub_chip_id, "twl6040_codec", |
712 | pdata->codec, sizeof(*pdata->codec), | 712 | pdata->codec, sizeof(*pdata->codec), |
713 | false, 0, 0); | 713 | false, 0, 0); |
714 | if (IS_ERR(child)) | 714 | if (IS_ERR(child)) |