ASoC: wm8940: Read chip ID when wm8940 codec probing
authorLukasz Majewski <lukma@denx.de>
Fri, 16 Dec 2022 09:46:24 +0000 (10:46 +0100)
committerMark Brown <broonie@kernel.org>
Sun, 25 Dec 2022 23:33:30 +0000 (23:33 +0000)
The wm8940 provides the chip ID information via I2C. In this
patch this information is read and if not matching expected
value, the probe function is aborted.

This prevents from using (i.e. inserting) other wm89* modules
which use the same I2C bus address.

Signed-off-by: Lukasz Majewski <lukma@denx.de>
Acked-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20221216094624.3849278-3-lukma@denx.de
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/codecs/wm8940.c
sound/soc/codecs/wm8940.h

index 1b02d5e..8eb4782 100644 (file)
@@ -760,6 +760,17 @@ static int wm8940_probe(struct snd_soc_component *component)
        int ret;
        u16 reg;
 
+       /*
+        * Check chip ID for wm8940 - value of 0x00 offset
+        * SOFTWARE_RESET on write
+        * CHIP_ID on read
+        */
+       reg = snd_soc_component_read(component, WM8940_SOFTRESET);
+       if (reg != WM8940_CHIP_ID) {
+               dev_err(component->dev, "Wrong wm8940 chip ID: 0x%x\n", reg);
+               return -ENODEV;
+       }
+
        ret = wm8940_reset(component);
        if (ret < 0) {
                dev_err(component->dev, "Failed to issue reset\n");
index 0d4f53a..86bbf90 100644 (file)
@@ -95,5 +95,8 @@ struct wm8940_setup_data {
 #define WM8940_OPCLKDIV_3 2
 #define WM8940_OPCLKDIV_4 3
 
+/* Chip ID */
+#define WM8940_CHIP_ID 0x8940
+
 #endif /* _WM8940_H */