[PATCH] ASoC: soc-io: Only force use regmap if the codec have it implemented

[Peter Ujfalusi <peter.ujfalusi@ti.com>]

Some codecs (like twl4030, twl6040) can not have regmap implementation
since they are accessing to the chip via MFD core drivers.

Force the use of regmap only in cases when the regmap is actually
available for the codec.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
---

Hi Mark,

the following commit:
38cbf95 ASoC: core: Try to use regmap if the driver doesn't set up any I/O

broke audio for boards using twl4030 or twl6040 as codec. These devices can not
have regmap implementation in the codec driver since they rely on their MFD core
to access to the chip.

As it is now big number of OMAP based devices have broken audio. Would it be
possible to include this fix for 3.6-rc1 already?

Regards,
Peter

 sound/soc/soc-io.c |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/sound/soc/soc-io.c b/sound/soc/soc-io.c
index 29183ef..26948be 100644
--- a/sound/soc/soc-io.c
+++ b/sound/soc/soc-io.c
@@ -117,9 +117,6 @@ int snd_soc_codec_set_cache_io(struct snd_soc_codec *codec,
 	int ret;
 
 	memset(&config, 0, sizeof(config));
-	codec->write = hw_write;
-	codec->read = hw_read;
-	codec->bulk_write_raw = snd_soc_hw_bulk_write_raw;
 
 	config.reg_bits = addr_bits;
 	config.val_bits = data_bits;
@@ -141,11 +138,11 @@ int snd_soc_codec_set_cache_io(struct snd_soc_codec *codec,
 
 	case SND_SOC_REGMAP:
 		/* Device has made its own regmap arrangements */
-		codec->using_regmap = true;
 		if (!codec->control_data)
 			codec->control_data = dev_get_regmap(codec->dev, NULL);
 
 		if (codec->control_data) {
+			codec->using_regmap = true;
 			ret = regmap_get_val_bytes(codec->control_data);
 			/* Errors are legitimate for non-integer byte
 			 * multiples */
@@ -161,6 +158,13 @@ int snd_soc_codec_set_cache_io(struct snd_soc_codec *codec,
 	if (IS_ERR(codec->control_data))
 		return PTR_ERR(codec->control_data);
 
+	/* Only override the read/write callbacks if regmap is available */
+	if (codec->control_data) {
+		codec->write = hw_write;
+		codec->read = hw_read;
+		codec->bulk_write_raw = snd_soc_hw_bulk_write_raw;
+	}
+
 	return 0;
 }
 EXPORT_SYMBOL_GPL(snd_soc_codec_set_cache_io);
-- 
1.7.8.6