Unverified Commit 20196e0e authored by Mark Brown's avatar Mark Brown
Browse files

Merge series "ASoC: meson: tdm fixes" from Jerome Brunet <jbrunet@baylibre.com>: 

This patcheset is collection of fixes for the TDM input and output the
axg audio architecture. Its fixes:
 - slave mode format setting
 - g12 and sm1 skew offset
 - tdm clock inversion
 - standard daifmt props names which don't require a specific prefix

Jerome Brunet (4):
  ASoC: meson: axg-tdm-interface: fix link fmt setup
  ASoC: meson: axg-tdmin: fix g12a skew
  ASoC: meson: axg-tdm-formatters: fix sclk inversion
  ASoC: meson: cards: remove DT_PREFIX for standard daifmt properties

 sound/soc/meson/axg-tdm-formatter.c | 11 ++++++-----
 sound/soc/meson/axg-tdm-formatter.h |  1 -
 sound/soc/meson/axg-tdm-interface.c | 26 +++++++++++++++++---------
 sound/soc/meson/axg-tdmin.c         | 16 +++++++++++++++-
 sound/soc/meson/axg-tdmout.c        |  3 ---
 sound/soc/meson/meson-card-utils.c  |  2 +-
 6 files changed, 39 insertions(+), 20 deletions(-)

--
2.25.4
parents 5c74c9d3 0d3f01dc

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

+6 −5
Original line number Diff line number Diff line
@@ -70,7 +70,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->quirks->invert_sclk;

	bool invert;

	int ret;



	/* Do nothing if the formatter is already enabled */
@@ -96,11 +96,12 @@ static int axg_tdm_formatter_enable(struct axg_tdm_formatter *formatter) 
		return ret;



	/*

	 * If sclk is inverted, invert it back and provide the inversion

	 * required by the formatter

	 * If sclk is inverted, it means the bit should latched on the

	 * rising edge which is what our HW expects. If not, we need to

	 * invert it before the formatter.

	 */

	invert ^= axg_tdm_sclk_invert(ts->iface->fmt);

	ret = clk_set_phase(formatter->sclk, invert ? 180 : 0);

	invert = axg_tdm_sclk_invert(ts->iface->fmt);

	ret = clk_set_phase(formatter->sclk, invert ? 0 : 180);

	if (ret)

		return ret;

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

+0 −1
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ struct snd_kcontrol; 


struct axg_tdm_formatter_hw {

	unsigned int skew_offset;

	bool invert_sclk;

};



struct axg_tdm_formatter_ops {

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

+17 −9
Original line number Diff line number Diff line
@@ -119,17 +119,24 @@ static int axg_tdm_iface_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) 
{

	struct axg_tdm_iface *iface = snd_soc_dai_get_drvdata(dai);



	/* These modes are not supported */

	if (fmt & (SND_SOC_DAIFMT_CBS_CFM | SND_SOC_DAIFMT_CBM_CFS)) {

		dev_err(dai->dev, "only CBS_CFS and CBM_CFM are supported\n");

		return -EINVAL;

	}



	/* If the TDM interface is the clock master, it requires mclk */

	if (!iface->mclk && (fmt & SND_SOC_DAIFMT_CBS_CFS)) {

	switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {

	case SND_SOC_DAIFMT_CBS_CFS:

		if (!iface->mclk) {

			dev_err(dai->dev, "cpu clock master: mclk missing\n");

			return -ENODEV;

		}

		break;



	case SND_SOC_DAIFMT_CBM_CFM:

		break;



	case SND_SOC_DAIFMT_CBS_CFM:

	case SND_SOC_DAIFMT_CBM_CFS:

		dev_err(dai->dev, "only CBS_CFS and CBM_CFM are supported\n");

		/* Fall-through */

	default:

		return -EINVAL;

	}



	iface->fmt = fmt;

	return 0;
@@ -319,7 +326,8 @@ static int axg_tdm_iface_hw_params(struct snd_pcm_substream *substream, 
	if (ret)

		return ret;



	if (iface->fmt & SND_SOC_DAIFMT_CBS_CFS) {

	if ((iface->fmt & SND_SOC_DAIFMT_MASTER_MASK) ==

	    SND_SOC_DAIFMT_CBS_CFS) {

		ret = axg_tdm_iface_set_sclk(dai, params);

		if (ret)

			return ret;

sound/soc/meson/axg-tdmin.c

+15 −1
Original line number Diff line number Diff line
@@ -228,15 +228,29 @@ static const struct axg_tdm_formatter_driver axg_tdmin_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 axg_tdm_formatter_driver g12a_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) {

		.skew_offset	= 3,

	},

};



static const struct of_device_id axg_tdmin_of_match[] = {

	{

		.compatible = "amlogic,axg-tdmin",

		.data = &axg_tdmin_drv,

	}, {

		.compatible = "amlogic,g12a-tdmin",

		.data = &g12a_tdmin_drv,

	}, {

		.compatible = "amlogic,sm1-tdmin",

		.data = &g12a_tdmin_drv,

	}, {}

};

MODULE_DEVICE_TABLE(of, axg_tdmin_of_match);

sound/soc/meson/axg-tdmout.c

+0 −3
Original line number Diff line number Diff line
@@ -238,7 +238,6 @@ static const struct axg_tdm_formatter_driver axg_tdmout_drv = { 
	.regmap_cfg	= &axg_tdmout_regmap_cfg,

	.ops		= &axg_tdmout_ops,

	.quirks		= &(const struct axg_tdm_formatter_hw) {

		.invert_sclk = true,

		.skew_offset = 1,

	},

};
@@ -248,7 +247,6 @@ static const struct axg_tdm_formatter_driver g12a_tdmout_drv = { 
	.regmap_cfg	= &axg_tdmout_regmap_cfg,

	.ops		= &axg_tdmout_ops,

	.quirks		= &(const struct axg_tdm_formatter_hw) {

		.invert_sclk = true,

		.skew_offset = 2,

	},

};
@@ -309,7 +307,6 @@ static const struct axg_tdm_formatter_driver sm1_tdmout_drv = { 
	.regmap_cfg	= &axg_tdmout_regmap_cfg,

	.ops		= &axg_tdmout_ops,

	.quirks		= &(const struct axg_tdm_formatter_hw) {

		.invert_sclk = true,

		.skew_offset = 2,

	},

};