Merge branch 'for-5.13' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie...

[linux-block.git] / sound / soc / codecs / cs35l33.c

diff --git a/sound/soc/codecs/cs35l33.c b/sound/soc/codecs/cs35l33.c
index e8f3dcfd144dadb61b3ebcdbc69adc677ce7f47e..2a6f5e46d031290e75d3e41597c691ef86b929aa 100644 (file)
--- a/sound/soc/codecs/cs35l33.c
+++ b/sound/soc/codecs/cs35l33.c
@@ -34,6 +34,7 @@
 #include <linux/of_irq.h>
 
 #include "cs35l33.h"
+#include "cirrus_legacy.h"
 
 #define CS35L33_BOOT_DELAY     50
 
@@ -1190,12 +1191,12 @@ static int cs35l33_i2c_probe(struct i2c_client *i2c_client,
        regcache_cache_only(cs35l33->regmap, false);
 
        /* initialize codec */
-       ret = regmap_read(cs35l33->regmap, CS35L33_DEVID_AB, &reg);
-       devid = (reg & 0xFF) << 12;
-       ret = regmap_read(cs35l33->regmap, CS35L33_DEVID_CD, &reg);
-       devid |= (reg & 0xFF) << 4;
-       ret = regmap_read(cs35l33->regmap, CS35L33_DEVID_E, &reg);
-       devid |= (reg & 0xF0) >> 4;
+       devid = cirrus_read_device_id(cs35l33->regmap, CS35L33_DEVID_AB);
+       if (devid < 0) {
+               ret = devid;
+               dev_err(&i2c_client->dev, "Failed to read device ID: %d\n", ret);
+               goto err_enable;
+       }
 
        if (devid != CS35L33_CHIP_ID) {
                dev_err(&i2c_client->dev,
@@ -1243,6 +1244,8 @@ static int cs35l33_i2c_probe(struct i2c_client *i2c_client,
        return 0;
 
 err_enable:
+       gpiod_set_value_cansleep(cs35l33->reset_gpio, 0);
+
        regulator_bulk_disable(cs35l33->num_core_supplies,
                               cs35l33->core_supplies);