ASoC: ak4458: Add DSD support for ak4458 and ak4497

Ak4458 can't support DSD512 format, but ak4497 can, so add
a new enum variable (enum ak4458_type) in ak4458_drvdata to
distinguish these two platforms.

Ak4497 has two kinds of DSD input pin, it can be selected by
the dsd-path property from DT.

In hw_params(), bit clock is calculated according to different
DSD format (DSD64, DSD128, DSD256, DSD512), then registers
are configured.

Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
Link: https://lore.kernel.org/r/1600178220-28973-2-git-send-email-shengjiu.wang@nxp.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/ak4458.c b/sound/soc/codecs/ak4458.c
index 763e683..1010c9e 100644 (file)
--- a/sound/soc/codecs/ak4458.c
+++ b/sound/soc/codecs/ak4458.c
@@ -28,14 +28,21 @@ static const char *ak4458_supply_names[AK4458_NUM_SUPPLIES] = {
        "AVDD",
 };
 
+enum ak4458_type {
+       AK4458 = 0,
+       AK4497 = 1,
+};
+
 struct ak4458_drvdata {
        struct snd_soc_dai_driver *dai_drv;
        const struct snd_soc_component_driver *comp_drv;
+       enum ak4458_type type;
 };
 
 /* AK4458 Codec Private Data */
 struct ak4458_priv {
        struct regulator_bulk_data supplies[AK4458_NUM_SUPPLIES];
+       const struct ak4458_drvdata *drvdata;
        struct device *dev;
        struct regmap *regmap;
        struct gpio_desc *reset_gpiod;
@@ -45,6 +52,7 @@ struct ak4458_priv {
        int fmt;
        int slots;
        int slot_width;
+       u32 dsd_path;    /* For ak4497 */
 };
 
 static const struct reg_default ak4458_reg_defaults[] = {
@@ -325,12 +333,54 @@ static int ak4458_hw_params(struct snd_pcm_substream *substream,
        struct snd_soc_component *component = dai->component;
        struct ak4458_priv *ak4458 = snd_soc_component_get_drvdata(component);
        int pcm_width = max(params_physical_width(params), ak4458->slot_width);
-       int nfs1;
-       u8 format;
+       u8 format, dsdsel0, dsdsel1;
+       int nfs1, dsd_bclk;
 
        nfs1 = params_rate(params);
        ak4458->fs = nfs1;
 
+       /* calculate bit clock */
+       switch (params_format(params)) {
+       case SNDRV_PCM_FORMAT_DSD_U8:
+       case SNDRV_PCM_FORMAT_DSD_U16_LE:
+       case SNDRV_PCM_FORMAT_DSD_U16_BE:
+       case SNDRV_PCM_FORMAT_DSD_U32_LE:
+       case SNDRV_PCM_FORMAT_DSD_U32_BE:
+               dsd_bclk = nfs1 * params_physical_width(params);
+               switch (dsd_bclk) {
+               case 2822400:
+                       dsdsel0 = 0;
+                       dsdsel1 = 0;
+                       break;
+               case 5644800:
+                       dsdsel0 = 1;
+                       dsdsel1 = 0;
+                       break;
+               case 11289600:
+                       dsdsel0 = 0;
+                       dsdsel1 = 1;
+                       break;
+               case 22579200:
+                       if (ak4458->drvdata->type == AK4497) {
+                               dsdsel0 = 1;
+                               dsdsel1 = 1;
+                       } else {
+                               dev_err(dai->dev, "DSD512 not supported.\n");
+                               return -EINVAL;
+                       }
+                       break;
+               default:
+                       dev_err(dai->dev, "Unsupported dsd bclk.\n");
+                       return -EINVAL;
+               }
+
+               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);
+               break;
+       }
+
        /* Master Clock Frequency Auto Setting Mode Enable */
        snd_soc_component_update_bits(component, AK4458_00_CONTROL1, 0x80, 0x80);
 
@@ -355,6 +405,9 @@ 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:
+                       format = AK4458_DIF_32BIT_MSB;
+                       break;
                default:
                        return -EINVAL;
                }
@@ -393,6 +446,7 @@ static int ak4458_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt)
        case SND_SOC_DAIFMT_LEFT_J:
        case SND_SOC_DAIFMT_RIGHT_J:
        case SND_SOC_DAIFMT_DSP_B:
+       case SND_SOC_DAIFMT_PDM:
                ak4458->fmt = fmt & SND_SOC_DAIFMT_FORMAT_MASK;
                break;
        default:
@@ -401,6 +455,12 @@ static int ak4458_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt)
                return -EINVAL;
        }
 
+       /* DSD mode */
+       snd_soc_component_update_bits(component, AK4458_02_CONTROL3,
+                                     AK4458_DP_MASK,
+                                     ak4458->fmt == SND_SOC_DAIFMT_PDM ?
+                                     AK4458_DP_MASK : 0);
+
        ak4458_rstn_control(component, 0);
        ak4458_rstn_control(component, 1);
 
@@ -472,7 +532,10 @@ static int ak4458_set_tdm_slot(struct snd_soc_dai *dai, unsigned int tx_mask,
 
 #define AK4458_FORMATS (SNDRV_PCM_FMTBIT_S16_LE |\
                         SNDRV_PCM_FMTBIT_S24_LE |\
-                        SNDRV_PCM_FMTBIT_S32_LE)
+                        SNDRV_PCM_FMTBIT_S32_LE |\
+                        SNDRV_PCM_FMTBIT_DSD_U8 |\
+                        SNDRV_PCM_FMTBIT_DSD_U16_LE |\
+                        SNDRV_PCM_FMTBIT_DSD_U32_LE)
 
 static const unsigned int ak4458_rates[] = {
        8000, 11025,  16000, 22050,
@@ -564,6 +627,13 @@ static int ak4458_init(struct snd_soc_component *component)
        if (ret < 0)
                return ret;
 
+       if (ak4458->drvdata->type == AK4497) {
+               ret = snd_soc_component_update_bits(component, AK4458_09_DSD2,
+                                                   0x4, (ak4458->dsd_path << 2));
+               if (ret < 0)
+                       return ret;
+       }
+
        return ak4458_rstn_control(component, 1);
 }
 
@@ -668,11 +738,13 @@ static const struct regmap_config ak4458_regmap = {
 static const struct ak4458_drvdata ak4458_drvdata = {
        .dai_drv = &ak4458_dai,
        .comp_drv = &soc_codec_dev_ak4458,
+       .type = AK4458,
 };
 
 static const struct ak4458_drvdata ak4497_drvdata = {
        .dai_drv = &ak4497_dai,
        .comp_drv = &soc_codec_dev_ak4497,
+       .type = AK4497,
 };
 
 static const struct dev_pm_ops ak4458_pm = {
@@ -684,7 +756,6 @@ static const struct dev_pm_ops ak4458_pm = {
 static int ak4458_i2c_probe(struct i2c_client *i2c)
 {
        struct ak4458_priv *ak4458;
-       const struct ak4458_drvdata *drvdata;
        int ret, i;
 
        ak4458 = devm_kzalloc(&i2c->dev, sizeof(*ak4458), GFP_KERNEL);
@@ -698,7 +769,7 @@ static int ak4458_i2c_probe(struct i2c_client *i2c)
        i2c_set_clientdata(i2c, ak4458);
        ak4458->dev = &i2c->dev;
 
-       drvdata = of_device_get_match_data(&i2c->dev);
+       ak4458->drvdata = of_device_get_match_data(&i2c->dev);
 
        ak4458->reset_gpiod = devm_gpiod_get_optional(ak4458->dev, "reset",
                                                      GPIOD_OUT_LOW);
@@ -710,6 +781,9 @@ static int ak4458_i2c_probe(struct i2c_client *i2c)
        if (IS_ERR(ak4458->mute_gpiod))
                return PTR_ERR(ak4458->mute_gpiod);
 
+       /* Optional property for ak4497 */
+       of_property_read_u32(i2c->dev.of_node, "dsd-path", &ak4458->dsd_path);
+
        for (i = 0; i < ARRAY_SIZE(ak4458->supplies); i++)
                ak4458->supplies[i].supply = ak4458_supply_names[i];
 
@@ -720,8 +794,9 @@ static int ak4458_i2c_probe(struct i2c_client *i2c)
                return ret;
        }
 
-       ret = devm_snd_soc_register_component(ak4458->dev, drvdata->comp_drv,
-                                             drvdata->dai_drv, 1);
+       ret = devm_snd_soc_register_component(ak4458->dev,
+                                             ak4458->drvdata->comp_drv,
+                                             ak4458->drvdata->dai_drv, 1);
        if (ret < 0) {
                dev_err(ak4458->dev, "Failed to register CODEC: %d\n", ret);
                return ret;

diff --git a/sound/soc/codecs/ak4458.h b/sound/soc/codecs/ak4458.h
index f906215..9548c5d 100644 (file)
--- a/sound/soc/codecs/ak4458.h
+++ b/sound/soc/codecs/ak4458.h
@@ -83,4 +83,7 @@
 #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)
+
+#endif