From 38cbf9598feba97de9f9b43efa9153fd7c1a2ec9 Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Fri, 22 Jun 2012 13:04:02 +0100 Subject: [PATCH] ASoC: core: Try to use regmap if the driver doesn't set up any I/O Since most new drivers are expected to use regmap and since frequently the only thing we need to do in the CODEC probe function is configure the I/O try to initialise the register I/O using regmap if the driver hasn't done so after probe(). Signed-off-by: Mark Brown Acked-by: Liam Girdwood --- sound/soc/soc-core.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index fe16135..64b464c 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1095,6 +1095,10 @@ 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); -- 2.7.4