ASoC: ak4458: fix commit 21e81dfed90c

Fixes commit 21e81dfed90c ("MLK-19573-2: ASoC: ak4458: enable DSD playback")
Signed-off-by: Viorel Suman <viorel.suman@nxp.com>

diff --git a/sound/soc/codecs/ak4458.c b/sound/soc/codecs/ak4458.c
index 95f652d..ddca8a4 100644 (file)
--- a/sound/soc/codecs/ak4458.c
+++ b/sound/soc/codecs/ak4458.c
@@ -328,33 +328,29 @@ static int ak4458_hw_params(struct snd_pcm_substream *substream,
        nfs1 = params_rate(params);
        ak4458->fs = nfs1;
 
-       dsdsel0 = snd_soc_read(codec, AK4458_06_DSD1);
-       dsdsel0 &= ~AK4458_DSDSEL_MASK;
-
-       dsdsel1 = snd_soc_read(codec, AK4458_09_DSD2);
-       dsdsel1 &= ~AK4458_DSDSEL_MASK;
-
        if (is_dsd) {
                switch (dsd_bclk) {
                case 2822400:
-                       dsdsel0 |= 0;
-                       dsdsel1 |= 0;
+                       dsdsel0 = 0;
+                       dsdsel1 = 0;
                        break;
                case 5644800:
-                       dsdsel0 |= 1;
-                       dsdsel1 |= 0;
+                       dsdsel0 = 1;
+                       dsdsel1 = 0;
                        break;
                case 11289600:
-                       dsdsel0 |= 0;
-                       dsdsel1 |= 1;
+                       dsdsel0 = 0;
+                       dsdsel1 = 1;
                        break;
                default:
                        dev_err(dai->dev, "DSD512 not supported.\n");
                        return -EINVAL;
                }
 
-               snd_soc_write(codec, AK4458_06_DSD1, dsdsel0);
-               snd_soc_write(codec, AK4458_09_DSD2, dsdsel1);
+               snd_soc_component_update_bits(component, AK4458_06_DSD1,
+                                             AK4458_DSDSEL_MASK, dsdsel0);
+               snd_soc_component_update_bits(component, AK4458_09_DSD2,
+                                             AK4458_DSDSEL_MASK, dsdsel1);
        }
 
        /* Master Clock Frequency Auto Setting Mode Enable */
@@ -381,7 +377,7 @@ static int ak4458_hw_params(struct snd_pcm_substream *substream,
                case SND_SOC_DAIFMT_DSP_B:
                        format = AK4458_DIF_32BIT_MSB;
                        break;
-               case SND_SOC_DAIFMT_PDM;
+               case SND_SOC_DAIFMT_PDM:
                        format = AK4458_DIF_32BIT_MSB;
                        break;
                default:

diff --git a/sound/soc/codecs/ak4458.h b/sound/soc/codecs/ak4458.h
index 9f51756..5736845 100644 (file)
--- a/sound/soc/codecs/ak4458.h
+++ b/sound/soc/codecs/ak4458.h
@@ -84,18 +84,9 @@
 #define AK4458_ATS_SHIFT       6
 #define AK4458_ATS_MASK                GENMASK(7, 6)
 
-#endif /* _AK4458_H */
-
 #define AK4458_DSDSEL_MASK             (0x1 << 0)
 #define AK4458_DP_MASK                 (0x1 << 7)
 
 #define AK4458_DCHAIN_MASK             (0x1 << 1)
 
-extern const struct regmap_config ak4458_i2c_regmap_config;
-extern const struct regmap_config ak4458_spi_regmap_config;
-extern const struct dev_pm_ops ak4458_pm;
-
-int ak4458_probe(struct device *dev, struct regmap *regmap);
-void ak4458_remove(struct device *dev);
-
-#endif
+#endif /* _AK4458_H */