diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-03-01 12:38:59 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-03-01 12:38:59 +0100 |
| commit | 6679ee1870f7ccdd48e2e5c57919240b8f19a6dc (patch) | |
| tree | 225ed7efcc0bb7e3c90233576c6106538e17a275 /drivers | |
| parent | a91a4aa1ee994abeb2190a1bb2f703933609a703 (diff) | |
| parent | a0b62329bb290c10d7278809af910ed115768991 (diff) | |
| download | linux-6679ee1870f7ccdd48e2e5c57919240b8f19a6dc.tar.bz2 | |
Merge branch 'topic/asoc' into for-linus
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mfd/twl-core.c | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/drivers/mfd/twl-core.c b/drivers/mfd/twl-core.c index 2a7606534196..19a930d06241 100644 --- a/drivers/mfd/twl-core.c +++ b/drivers/mfd/twl-core.c @@ -115,7 +115,8 @@ #define twl_has_watchdog() false #endif -#if defined(CONFIG_TWL4030_CODEC) || defined(CONFIG_TWL4030_CODEC_MODULE) +#if defined(CONFIG_TWL4030_CODEC) || defined(CONFIG_TWL4030_CODEC_MODULE) ||\ + defined(CONFIG_SND_SOC_TWL6030) || defined(CONFIG_SND_SOC_TWL6030_MODULE) #define twl_has_codec() true #else #define twl_has_codec() false @@ -711,8 +712,19 @@ add_children(struct twl4030_platform_data *pdata, unsigned long features) return PTR_ERR(child); } - if (twl_has_codec() && pdata->codec) { - child = add_child(1, "twl4030_codec", + if (twl_has_codec() && pdata->codec && twl_class_is_4030()) { + sub_chip_id = twl_map[TWL_MODULE_AUDIO_VOICE].sid; + child = add_child(sub_chip_id, "twl4030_codec", + pdata->codec, sizeof(*pdata->codec), + false, 0, 0); + if (IS_ERR(child)) + return PTR_ERR(child); + } + + /* Phoenix*/ + if (twl_has_codec() && pdata->codec && twl_class_is_6030()) { + sub_chip_id = twl_map[TWL_MODULE_AUDIO_VOICE].sid; + child = add_child(sub_chip_id, "twl6030_codec", pdata->codec, sizeof(*pdata->codec), false, 0, 0); if (IS_ERR(child)) |