Unverified Commit f01bc67f authored by Jerome Brunet's avatar Jerome Brunet Committed by Mark Brown
Browse files

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: default avatarJerome Brunet <jbrunet@baylibre.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent fcced66f

sound/soc/meson/axg-tdm-formatter.c

+4 −2
Original line number Diff line number Diff line
@@ -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;

sound/soc/meson/axg-tdm-formatter.h

+9 −2
Original line number Diff line number Diff line
@@ -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,

sound/soc/meson/axg-tdmin.c

+11 −5
Original line number Diff line number Diff line
@@ -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,

	.quirks		= &(const struct axg_tdm_formatter_hw) {

		.invert_sclk	= false,

		.skew_offset	= 2,

	},

};



static const struct of_device_id axg_tdmin_of_match[] = {

sound/soc/meson/axg-tdmout.c

+11 −5
Original line number Diff line number Diff line
@@ -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,

	.quirks		= &(const struct axg_tdm_formatter_hw) {

		.invert_sclk = true,

		.skew_offset = 1,

	},

};



static const struct of_device_id axg_tdmout_of_match[] = {