ASoC: rt5640: Add minimal support for RT5642

We have been using rt5640.c codec driver with RT5642 codec chip before commit
022d21f004c1 ("ASoC: rt5640: add rt5639 support"). That commits starts using
device ID reading in reset register for adding device specific controls and
routes runtime.

Now since device ID appears to be different between RT5640 and RT5642 the
driver doesn't add those controls and routes that are valid also on RT5642.

Fix this by adding a device ID found by debugging and minimal code for
supporting RT5642.

Signed-off-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
Signed-off-by: Bard Liao <bardliao@realtek.com>
Signed-off-by: Mark Brown <broonie@linaro.org>

2 files changed, 12 insertions, 6 deletions

diff --git a/sound/soc/codecs/rt5640.c b/sound/soc/codecs/rt5640.c
index 6674372be12c..79635ee42a61 100644
--- a/sound/soc/codecs/rt5640.c
+++ b/sound/soc/codecs/rt5640.c
@@ -1997,8 +1997,9 @@ static int rt5640_probe(struct snd_soc_codec *codec)
         snd_soc_update_bits(codec, RT5640_MICBIAS, 0x0030, 0x0030);
         snd_soc_update_bits(codec, RT5640_DSP_PATH2, 0xfc00, 0x0c00);
 
-        switch (snd_soc_read(codec, RT5640_RESET)) {
-        case RT5640_RESET_ID:
+        switch (snd_soc_read(codec, RT5640_RESET) & RT5640_ID_MASK) {
+        case RT5640_ID_5640:
+        case RT5640_ID_5642:
                 snd_soc_add_codec_controls(codec,
                         rt5640_specific_snd_controls,
                         ARRAY_SIZE(rt5640_specific_snd_controls));
@@ -2009,7 +2010,7 @@ static int rt5640_probe(struct snd_soc_codec *codec)
                         rt5640_specific_dapm_routes,
                         ARRAY_SIZE(rt5640_specific_dapm_routes));
                 break;
-        case RT5639_RESET_ID:
+        case RT5640_ID_5639:
                 snd_soc_dapm_new_controls(&codec->dapm,
                         rt5639_specific_dapm_widgets,
                         ARRAY_SIZE(rt5639_specific_dapm_widgets));
@@ -2149,6 +2150,7 @@ static const struct regmap_config rt5640_regmap = {
 static const struct i2c_device_id rt5640_i2c_id[] = {
         { "rt5640", 0 },
         { "rt5639", 0 },
+        { "rt5642", 0 },
         { }
 };
 MODULE_DEVICE_TABLE(i2c, rt5640_i2c_id);
diff --git a/sound/soc/codecs/rt5640.h b/sound/soc/codecs/rt5640.h
index 3b50459a83b4..ded20595e9ae 100644
--- a/sound/soc/codecs/rt5640.h
+++ b/sound/soc/codecs/rt5640.h
@@ -14,9 +14,6 @@
 
 #include <sound/rt5640.h>
 
-#define RT5639_RESET_ID                         0x0008
-#define RT5640_RESET_ID                         0x000c
-
 /* Info */
 #define RT5640_RESET                            0x00
 #define RT5640_VENDOR_ID                        0xfd
@@ -195,6 +192,13 @@
 #define RT5640_R_VOL_MASK                       (0x3f)
 #define RT5640_R_VOL_SFT                        0
 
+/* SW Reset & Device ID (0x00) */
+#define RT5640_ID_MASK                          (0x3 << 1)
+#define RT5640_ID_5639                          (0x0 << 1)
+#define RT5640_ID_5640                          (0x1 << 1)
+#define RT5640_ID_5642                          (0x3 << 1)
+
+
 /* IN1 and IN2 Control (0x0d) */
 /* IN3 and IN4 Control (0x0e) */
 #define RT5640_BST_SFT1                         12