Some codec driver can not have regmap implementation so core should not assume that codecs without control_data have implemented regmap of it's own.
This reverts commit 38cbf9598feba97de9f9b43efa9153fd7c1a2ec9.
Signed-off-by: Peter Ujfalusi peter.ujfalusi@ti.com ---
Hi Mark,
the reverted patch broke the audio on OMAP based board using twl4030, twl6040 as codec. We can not have regmap implementaion within these codec drivers since they rely on the MFD core to do the IO towards the chip.
Regards, Peter
sound/soc/soc-core.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-)
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index f219b2f..da31aa4 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1095,10 +1095,6 @@ static int soc_probe_codec(struct snd_soc_card *card, } }
- /* If the driver didn't set I/O up try regmap */ - if (!codec->control_data) - snd_soc_codec_set_cache_io(codec, 0, 0, SND_SOC_REGMAP); - if (driver->controls) snd_soc_add_codec_controls(codec, driver->controls, driver->num_controls);