2022-12-14 12:45:50

by Lukasz Majewski

Subject: [PATCH 4/4] ASoC: wm8940: Read chip ID when wm8940 codec probing

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 sam I2C bus address.

Signed-off-by: Lukasz Majewski <[email protected]>
---
sound/soc/codecs/wm8940.c | 11 +++++++++++
sound/soc/codecs/wm8940.h | 3 +++
2 files changed, 14 insertions(+)

diff --git a/sound/soc/codecs/wm8940.c b/sound/soc/codecs/wm8940.c
index 13cb57210b4b..244998ebab4d 100644
--- a/sound/soc/codecs/wm8940.c
+++ b/sound/soc/codecs/wm8940.c
@@ -769,6 +769,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");
diff --git a/sound/soc/codecs/wm8940.h b/sound/soc/codecs/wm8940.h
index eb051ed29bb8..8fbddcaa7449 100644
--- a/sound/soc/codecs/wm8940.h
+++ b/sound/soc/codecs/wm8940.h
@@ -98,5 +98,8 @@ struct wm8940_setup_data {
/* Bit definitions */
#define WM8940_SPKMUTE BIT(6)

+/* Chip ID */
+#define WM8940_CHIP_ID 0x8940
+
#endif /* _WM8940_H */

--
2.20.1

2022-12-14 13:20:42

by Charles Keepax

Subject: Re: [PATCH 4/4] ASoC: wm8940: Read chip ID when wm8940 codec probing

On Wed, Dec 14, 2022 at 01:37:43PM +0100, Lukasz Majewski wrote:
> 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 sam I2C bus address.
>
> Signed-off-by: Lukasz Majewski <[email protected]>
> ---

Acked-by: Charles Keepax <[email protected]>

Thanks,
Charles