ASoC: meson: axg-tdm-formatter: rework quirks settings

The g12a tdmout requires a different signal skew offset than the axg.
With this change, the skew offset is added as a parameter of the tdm
formatters to prepare the addition of the g12a support.

Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/meson/axg-tdm-formatter.c b/sound/soc/meson/axg-tdm-formatter.c
index 43e390f9358a46da3959c36f30870135f4fd3acf..0c6cce5c577328baefe47c9fe0448b1f46c38536 100644 (file)
--- a/sound/soc/meson/axg-tdm-formatter.c
+++ b/sound/soc/meson/axg-tdm-formatter.c
@@ -68,7 +68,7 @@ EXPORT_SYMBOL_GPL(axg_tdm_formatter_set_channel_masks);
 static int axg_tdm_formatter_enable(struct axg_tdm_formatter *formatter)
 {
        struct axg_tdm_stream *ts = formatter->stream;
-       bool invert = formatter->drv->invert_sclk;
+       bool invert = formatter->drv->quirks->invert_sclk;
        int ret;
 
        /* Do nothing if the formatter is already enabled */
@@ -85,7 +85,9 @@ static int axg_tdm_formatter_enable(struct axg_tdm_formatter *formatter)
                return ret;
 
        /* Setup the stream parameter in the formatter */
-       ret = formatter->drv->ops->prepare(formatter->map, formatter->stream);
+       ret = formatter->drv->ops->prepare(formatter->map,
+                                          formatter->drv->quirks,
+                                          formatter->stream);
        if (ret)
                return ret;
 

diff --git a/sound/soc/meson/axg-tdm-formatter.h b/sound/soc/meson/axg-tdm-formatter.h
index cf947caf3cb15d023e912877f6b99d360f60692c..9ef98e955cb2744450e75006b432a2043aa13593 100644 (file)
--- a/sound/soc/meson/axg-tdm-formatter.h
+++ b/sound/soc/meson/axg-tdm-formatter.h
@@ -14,18 +14,25 @@ struct regmap;
 struct snd_soc_dapm_widget;
 struct snd_kcontrol;
 
+struct axg_tdm_formatter_hw {
+       unsigned int skew_offset;
+       bool invert_sclk;
+};
+
 struct axg_tdm_formatter_ops {
        struct axg_tdm_stream *(*get_stream)(struct snd_soc_dapm_widget *w);
        void (*enable)(struct regmap *map);
        void (*disable)(struct regmap *map);
-       int (*prepare)(struct regmap *map, struct axg_tdm_stream *ts);
+       int (*prepare)(struct regmap *map,
+                      const struct axg_tdm_formatter_hw *quirks,
+                      struct axg_tdm_stream *ts);
 };
 
 struct axg_tdm_formatter_driver {
        const struct snd_soc_component_driver *component_drv;
        const struct regmap_config *regmap_cfg;
        const struct axg_tdm_formatter_ops *ops;
-       bool invert_sclk;
+       const struct axg_tdm_formatter_hw *quirks;
 };
 
 int axg_tdm_formatter_set_channel_masks(struct regmap *map,

diff --git a/sound/soc/meson/axg-tdmin.c b/sound/soc/meson/axg-tdmin.c
index bbac44c816886f79a5aab22e01ad07d179985498..a790f925a4ef337676c74b27ad291d07349dd7ad 100644 (file)
--- a/sound/soc/meson/axg-tdmin.c
+++ b/sound/soc/meson/axg-tdmin.c
@@ -107,21 +107,22 @@ static void axg_tdmin_disable(struct regmap *map)
        regmap_update_bits(map, TDMIN_CTRL, TDMIN_CTRL_ENABLE, 0);
 }
 
-static int axg_tdmin_prepare(struct regmap *map, struct axg_tdm_stream *ts)
+static int axg_tdmin_prepare(struct regmap *map,
+                            const struct axg_tdm_formatter_hw *quirks,
+                            struct axg_tdm_stream *ts)
 {
-       unsigned int val = 0;
+       unsigned int val, skew = quirks->skew_offset;
 
        /* Set stream skew */
        switch (ts->iface->fmt & SND_SOC_DAIFMT_FORMAT_MASK) {
        case SND_SOC_DAIFMT_I2S:
        case SND_SOC_DAIFMT_DSP_A:
-               val |= TDMIN_CTRL_IN_BIT_SKEW(3);
+               skew += 1;
                break;
 
        case SND_SOC_DAIFMT_LEFT_J:
        case SND_SOC_DAIFMT_RIGHT_J:
        case SND_SOC_DAIFMT_DSP_B:
-               val = TDMIN_CTRL_IN_BIT_SKEW(2);
                break;
 
        default:
@@ -130,6 +131,8 @@ static int axg_tdmin_prepare(struct regmap *map, struct axg_tdm_stream *ts)
                return -EINVAL;
        }
 
+       val = TDMIN_CTRL_IN_BIT_SKEW(skew);
+
        /* Set stream format mode */
        switch (ts->iface->fmt & SND_SOC_DAIFMT_FORMAT_MASK) {
        case SND_SOC_DAIFMT_I2S:
@@ -204,7 +207,10 @@ static const struct axg_tdm_formatter_driver axg_tdmin_drv = {
        .component_drv  = &axg_tdmin_component_drv,
        .regmap_cfg     = &axg_tdmin_regmap_cfg,
        .ops            = &axg_tdmin_ops,
-       .invert_sclk    = false,
+       .quirks         = &(const struct axg_tdm_formatter_hw) {
+               .invert_sclk    = false,
+               .skew_offset    = 2,
+       },
 };
 
 static const struct of_device_id axg_tdmin_of_match[] = {

diff --git a/sound/soc/meson/axg-tdmout.c b/sound/soc/meson/axg-tdmout.c
index f73368ee1088fd156657ffa891c6447b3cdd7903..3984818e2a7cff0aca78e45333c1e53fa0092e3d 100644 (file)
--- a/sound/soc/meson/axg-tdmout.c
+++ b/sound/soc/meson/axg-tdmout.c
@@ -124,21 +124,22 @@ static void axg_tdmout_disable(struct regmap *map)
        regmap_update_bits(map, TDMOUT_CTRL0, TDMOUT_CTRL0_ENABLE, 0);
 }
 
-static int axg_tdmout_prepare(struct regmap *map, struct axg_tdm_stream *ts)
+static int axg_tdmout_prepare(struct regmap *map,
+                             const struct axg_tdm_formatter_hw *quirks,
+                             struct axg_tdm_stream *ts)
 {
-       unsigned int val = 0;
+       unsigned int val, skew = quirks->skew_offset;
 
        /* Set the stream skew */
        switch (ts->iface->fmt & SND_SOC_DAIFMT_FORMAT_MASK) {
        case SND_SOC_DAIFMT_I2S:
        case SND_SOC_DAIFMT_DSP_A:
-               val |= TDMOUT_CTRL0_INIT_BITNUM(1);
                break;
 
        case SND_SOC_DAIFMT_LEFT_J:
        case SND_SOC_DAIFMT_RIGHT_J:
        case SND_SOC_DAIFMT_DSP_B:
-               val |= TDMOUT_CTRL0_INIT_BITNUM(2);
+               skew += 1;
                break;
 
        default:
@@ -147,6 +148,8 @@ static int axg_tdmout_prepare(struct regmap *map, struct axg_tdm_stream *ts)
                return -EINVAL;
        }
 
+       val = TDMOUT_CTRL0_INIT_BITNUM(skew);
+
        /* Set the slot width */
        val |= TDMOUT_CTRL0_BITNUM(ts->iface->slot_width - 1);
 
@@ -234,7 +237,10 @@ static const struct axg_tdm_formatter_driver axg_tdmout_drv = {
        .component_drv  = &axg_tdmout_component_drv,
        .regmap_cfg     = &axg_tdmout_regmap_cfg,
        .ops            = &axg_tdmout_ops,
-       .invert_sclk    = true,
+       .quirks         = &(const struct axg_tdm_formatter_hw) {
+               .invert_sclk = true,
+               .skew_offset = 1,
+       },
 };
 
 static const struct of_device_id axg_tdmout_of_match[] = {