]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
ASoC: codecs: wcd939x: Add defines for major/minor version decoding
authorKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Mon, 16 Jun 2025 11:54:11 +0000 (13:54 +0200)
committerMark Brown <broonie@kernel.org>
Sun, 22 Jun 2025 23:26:41 +0000 (00:26 +0100)
Replace hard-coded register values with defines for checking major and
minor versions of device.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://patch.msgid.link/20250616-asoc-wcd93xx-enum-v1-4-a20a1b538509@linaro.org
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/codecs/wcd939x.c

index 7ec751a6cd2610dd3c4eb2bb6556e8700b62427c..64f082e474c1d404699e304743ed1ada3481effb 100644 (file)
 #define CHIPID_WCD9390                 0x0
 #define CHIPID_WCD9395                 0x5
 
+/* Version major: 1.x */
+#define CHIPID_WCD939X_VER_MAJOR_1     0x0
+/* Version minor: x.1 */
+#define CHIPID_WCD939X_VER_MINOR_1     0x3
+
 enum {
        WCD939X_VERSION_1_0 = 0,
        WCD939X_VERSION_1_1,
@@ -3449,8 +3454,8 @@ static int wcd939x_bind(struct device *dev)
        regmap_read(wcd939x->regmap, WCD939X_DIGITAL_CHIP_ID1, &id1);
        regmap_read(wcd939x->regmap, WCD939X_EAR_STATUS_REG_1, &status1);
 
-       if (id1 == 0)
-               version = ((status1 & 0x3) ? WCD939X_VERSION_1_1 : WCD939X_VERSION_1_0);
+       if (id1 == CHIPID_WCD939X_VER_MAJOR_1)
+               version = ((status1 & CHIPID_WCD939X_VER_MINOR_1) ? WCD939X_VERSION_1_1 : WCD939X_VERSION_1_0);
        else
                version = WCD939X_VERSION_2_0;