Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fe2d1dda authored by Jerome Brunet's avatar Jerome Brunet Committed by Greg Kroah-Hartman
Browse files

ASoC: meson: g12a: extract codec-to-codec utils 



[ Upstream commit 9c29fd9bdf92900dc0cc5c2d8f58951a7bdc0f41 ]

The hdmi routing mechanism used on g12a hdmi is also used:
* other Amlogic SoC types
* for the internal DAC path

Each of these codec glues are slightly different but the idea
behind it remains the same. This change extract some helper functions
from the g12a-tohdmitx driver to make them available for other Amlogic
codecs.

Signed-off-by: default avatarJerome Brunet <jbrunet@baylibre.com>
Link: https://lore.kernel.org/r/20200213155159.3235792-3-jbrunet@baylibre.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Stable-dep-of: 1e001206804b ("ASoC: meson: g12a-tohdmitx: Validate written enum values")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 93d80aad

sound/soc/meson/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -85,9 +85,13 @@ config SND_MESON_AXG_PDM 
	  Select Y or M to add support for PDM input embedded

	  in the Amlogic AXG SoC family



config SND_MESON_CODEC_GLUE

	tristate



config SND_MESON_G12A_TOHDMITX

	tristate "Amlogic G12A To HDMI TX Control Support"

	select REGMAP_MMIO

	select SND_MESON_CODEC_GLUE

	imply SND_SOC_HDMI_CODEC

	help

	  Select Y or M to add support for HDMI audio on the g12a SoC

sound/soc/meson/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ snd-soc-meson-axg-sound-card-objs := axg-card.o 
snd-soc-meson-axg-spdifin-objs := axg-spdifin.o

snd-soc-meson-axg-spdifout-objs := axg-spdifout.o

snd-soc-meson-axg-pdm-objs := axg-pdm.o

snd-soc-meson-codec-glue-objs := meson-codec-glue.o

snd-soc-meson-g12a-tohdmitx-objs := g12a-tohdmitx.o



obj-$(CONFIG_SND_MESON_AXG_FIFO) += snd-soc-meson-axg-fifo.o
@@ -24,4 +25,5 @@ obj-$(CONFIG_SND_MESON_AXG_SOUND_CARD) += snd-soc-meson-axg-sound-card.o 
obj-$(CONFIG_SND_MESON_AXG_SPDIFIN) += snd-soc-meson-axg-spdifin.o

obj-$(CONFIG_SND_MESON_AXG_SPDIFOUT) += snd-soc-meson-axg-spdifout.o

obj-$(CONFIG_SND_MESON_AXG_PDM) += snd-soc-meson-axg-pdm.o

obj-$(CONFIG_SND_MESON_CODEC_GLUE) += snd-soc-meson-codec-glue.o

obj-$(CONFIG_SND_MESON_G12A_TOHDMITX) += snd-soc-meson-g12a-tohdmitx.o

sound/soc/meson/g12a-tohdmitx.c

+43 −176
Original line number Diff line number Diff line
@@ -12,95 +12,28 @@ 
#include <sound/soc-dai.h>



#include <dt-bindings/sound/meson-g12a-tohdmitx.h>

#include "meson-codec-glue.h"



#define G12A_TOHDMITX_DRV_NAME "g12a-tohdmitx"



#define TOHDMITX_CTRL0			0x0

#define  CTRL0_ENABLE_SHIFT		31

#define  CTRL0_I2S_DAT_SEL		GENMASK(13, 12)

#define  CTRL0_I2S_DAT_SEL_SHIFT	12

#define  CTRL0_I2S_DAT_SEL		(0x3 << CTRL0_I2S_DAT_SEL_SHIFT)

#define  CTRL0_I2S_LRCLK_SEL		GENMASK(9, 8)

#define  CTRL0_I2S_BLK_CAP_INV		BIT(7)

#define  CTRL0_I2S_BCLK_O_INV		BIT(6)

#define  CTRL0_I2S_BCLK_SEL		GENMASK(5, 4)

#define  CTRL0_SPDIF_CLK_CAP_INV	BIT(3)

#define  CTRL0_SPDIF_CLK_O_INV		BIT(2)

#define  CTRL0_SPDIF_SEL		BIT(1)

#define  CTRL0_SPDIF_SEL_SHIFT		1

#define  CTRL0_SPDIF_SEL		(0x1 << CTRL0_SPDIF_SEL_SHIFT)

#define  CTRL0_SPDIF_CLK_SEL		BIT(0)



struct g12a_tohdmitx_input {

	struct snd_soc_pcm_stream params;

	unsigned int fmt;

};



static struct snd_soc_dapm_widget *

g12a_tohdmitx_get_input(struct snd_soc_dapm_widget *w)

{

	struct snd_soc_dapm_path *p = NULL;

	struct snd_soc_dapm_widget *in;



	snd_soc_dapm_widget_for_each_source_path(w, p) {

		if (!p->connect)

			continue;



		/* Check that we still are in the same component */

		if (snd_soc_dapm_to_component(w->dapm) !=

		    snd_soc_dapm_to_component(p->source->dapm))

			continue;



		if (p->source->id == snd_soc_dapm_dai_in)

			return p->source;



		in = g12a_tohdmitx_get_input(p->source);

		if (in)

			return in;

	}



	return NULL;

}



static struct g12a_tohdmitx_input *

g12a_tohdmitx_get_input_data(struct snd_soc_dapm_widget *w)

{

	struct snd_soc_dapm_widget *in =

		g12a_tohdmitx_get_input(w);

	struct snd_soc_dai *dai;



	if (WARN_ON(!in))

		return NULL;



	dai = in->priv;



	return dai->playback_dma_data;

}



static const char * const g12a_tohdmitx_i2s_mux_texts[] = {

	"I2S A", "I2S B", "I2S C",

};



static SOC_ENUM_SINGLE_EXT_DECL(g12a_tohdmitx_i2s_mux_enum,

				g12a_tohdmitx_i2s_mux_texts);



static int g12a_tohdmitx_get_input_val(struct snd_soc_component *component,

				       unsigned int mask)

{

	unsigned int val;



	snd_soc_component_read(component, TOHDMITX_CTRL0, &val);

	return (val & mask) >> __ffs(mask);

}



static int g12a_tohdmitx_i2s_mux_get_enum(struct snd_kcontrol *kcontrol,

					  struct snd_ctl_elem_value *ucontrol)

{

	struct snd_soc_component *component =

		snd_soc_dapm_kcontrol_component(kcontrol);



	ucontrol->value.enumerated.item[0] =

		g12a_tohdmitx_get_input_val(component, CTRL0_I2S_DAT_SEL);



	return 0;

}



static int g12a_tohdmitx_i2s_mux_put_enum(struct snd_kcontrol *kcontrol,

				   struct snd_ctl_elem_value *ucontrol)

{
@@ -109,15 +42,21 @@ static int g12a_tohdmitx_i2s_mux_put_enum(struct snd_kcontrol *kcontrol, 
	struct snd_soc_dapm_context *dapm =

		snd_soc_dapm_kcontrol_dapm(kcontrol);

	struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;

	unsigned int mux = ucontrol->value.enumerated.item[0];

	unsigned int val = g12a_tohdmitx_get_input_val(component,

						       CTRL0_I2S_DAT_SEL);

	unsigned int mux, changed;



	mux = snd_soc_enum_item_to_val(e, ucontrol->value.enumerated.item[0]);

	changed = snd_soc_component_test_bits(component, e->reg,

					      CTRL0_I2S_DAT_SEL,

					      FIELD_PREP(CTRL0_I2S_DAT_SEL,

							 mux));



	if (!changed)

		return 0;



	/* Force disconnect of the mux while updating */

	if (val != mux)

	snd_soc_dapm_mux_update_power(dapm, kcontrol, 0, NULL, NULL);



	snd_soc_component_update_bits(component, TOHDMITX_CTRL0,

	snd_soc_component_update_bits(component, e->reg,

				      CTRL0_I2S_DAT_SEL |

				      CTRL0_I2S_LRCLK_SEL |

				      CTRL0_I2S_BCLK_SEL,
@@ -130,30 +69,19 @@ static int g12a_tohdmitx_i2s_mux_put_enum(struct snd_kcontrol *kcontrol, 
	return 1;

}



static SOC_ENUM_SINGLE_DECL(g12a_tohdmitx_i2s_mux_enum, TOHDMITX_CTRL0,

			    CTRL0_I2S_DAT_SEL_SHIFT,

			    g12a_tohdmitx_i2s_mux_texts);



static const struct snd_kcontrol_new g12a_tohdmitx_i2s_mux =

	SOC_DAPM_ENUM_EXT("I2S Source", g12a_tohdmitx_i2s_mux_enum,

			  g12a_tohdmitx_i2s_mux_get_enum,

			  snd_soc_dapm_get_enum_double,

			  g12a_tohdmitx_i2s_mux_put_enum);



static const char * const g12a_tohdmitx_spdif_mux_texts[] = {

	"SPDIF A", "SPDIF B",

};



static SOC_ENUM_SINGLE_EXT_DECL(g12a_tohdmitx_spdif_mux_enum,

				g12a_tohdmitx_spdif_mux_texts);



static int g12a_tohdmitx_spdif_mux_get_enum(struct snd_kcontrol *kcontrol,

					    struct snd_ctl_elem_value *ucontrol)

{

	struct snd_soc_component *component =

		snd_soc_dapm_kcontrol_component(kcontrol);



	ucontrol->value.enumerated.item[0] =

		g12a_tohdmitx_get_input_val(component, CTRL0_SPDIF_SEL);



	return 0;

}



static int g12a_tohdmitx_spdif_mux_put_enum(struct snd_kcontrol *kcontrol,

					    struct snd_ctl_elem_value *ucontrol)

{
@@ -162,12 +90,17 @@ static int g12a_tohdmitx_spdif_mux_put_enum(struct snd_kcontrol *kcontrol, 
	struct snd_soc_dapm_context *dapm =

		snd_soc_dapm_kcontrol_dapm(kcontrol);

	struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;

	unsigned int mux = ucontrol->value.enumerated.item[0];

	unsigned int val = g12a_tohdmitx_get_input_val(component,

						       CTRL0_SPDIF_SEL);

	unsigned int mux, changed;



	mux = snd_soc_enum_item_to_val(e, ucontrol->value.enumerated.item[0]);

	changed = snd_soc_component_test_bits(component, TOHDMITX_CTRL0,

					      CTRL0_SPDIF_SEL,

					      FIELD_PREP(CTRL0_SPDIF_SEL, mux));



	if (!changed)

		return 0;



	/* Force disconnect of the mux while updating */

	if (val != mux)

	snd_soc_dapm_mux_update_power(dapm, kcontrol, 0, NULL, NULL);



	snd_soc_component_update_bits(component, TOHDMITX_CTRL0,
@@ -181,9 +114,13 @@ static int g12a_tohdmitx_spdif_mux_put_enum(struct snd_kcontrol *kcontrol, 
	return 0;

}



static SOC_ENUM_SINGLE_DECL(g12a_tohdmitx_spdif_mux_enum, TOHDMITX_CTRL0,

			    CTRL0_SPDIF_SEL_SHIFT,

			    g12a_tohdmitx_spdif_mux_texts);



static const struct snd_kcontrol_new g12a_tohdmitx_spdif_mux =

	SOC_DAPM_ENUM_EXT("SPDIF Source", g12a_tohdmitx_spdif_mux_enum,

			  g12a_tohdmitx_spdif_mux_get_enum,

			  snd_soc_dapm_get_enum_double,

			  g12a_tohdmitx_spdif_mux_put_enum);



static const struct snd_kcontrol_new g12a_tohdmitx_out_enable =
@@ -201,83 +138,13 @@ static const struct snd_soc_dapm_widget g12a_tohdmitx_widgets[] = { 
			    &g12a_tohdmitx_out_enable),

};



static int g12a_tohdmitx_input_probe(struct snd_soc_dai *dai)

{

	struct g12a_tohdmitx_input *data;



	data = kzalloc(sizeof(*data), GFP_KERNEL);

	if (!data)

		return -ENOMEM;



	dai->playback_dma_data = data;

	return 0;

}



static int g12a_tohdmitx_input_remove(struct snd_soc_dai *dai)

{

	kfree(dai->playback_dma_data);

	return 0;

}



static int g12a_tohdmitx_input_hw_params(struct snd_pcm_substream *substream,

					 struct snd_pcm_hw_params *params,

					 struct snd_soc_dai *dai)

{

	struct g12a_tohdmitx_input *data = dai->playback_dma_data;



	data->params.rates = snd_pcm_rate_to_rate_bit(params_rate(params));

	data->params.rate_min = params_rate(params);

	data->params.rate_max = params_rate(params);

	data->params.formats = 1 << params_format(params);

	data->params.channels_min = params_channels(params);

	data->params.channels_max = params_channels(params);

	data->params.sig_bits = dai->driver->playback.sig_bits;



	return 0;

}





static int g12a_tohdmitx_input_set_fmt(struct snd_soc_dai *dai,

				       unsigned int fmt)

{

	struct g12a_tohdmitx_input *data = dai->playback_dma_data;



	/* Save the source stream format for the downstream link */

	data->fmt = fmt;

	return 0;

}



static int g12a_tohdmitx_output_startup(struct snd_pcm_substream *substream,

					struct snd_soc_dai *dai)

{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct g12a_tohdmitx_input *in_data =

		g12a_tohdmitx_get_input_data(dai->capture_widget);



	if (!in_data)

		return -ENODEV;



	if (WARN_ON(!rtd->dai_link->params)) {

		dev_warn(dai->dev, "codec2codec link expected\n");

		return -EINVAL;

	}



	/* Replace link params with the input params */

	rtd->dai_link->params = &in_data->params;



	if (!in_data->fmt)

		return 0;



	return snd_soc_runtime_set_dai_fmt(rtd, in_data->fmt);

}



static const struct snd_soc_dai_ops g12a_tohdmitx_input_ops = {

	.hw_params	= g12a_tohdmitx_input_hw_params,

	.set_fmt	= g12a_tohdmitx_input_set_fmt,

	.hw_params	= meson_codec_glue_input_hw_params,

	.set_fmt	= meson_codec_glue_input_set_fmt,

};



static const struct snd_soc_dai_ops g12a_tohdmitx_output_ops = {

	.startup	= g12a_tohdmitx_output_startup,

	.startup	= meson_codec_glue_output_startup,

};



#define TOHDMITX_SPDIF_FORMATS					\
@@ -304,8 +171,8 @@ static const struct snd_soc_dai_ops g12a_tohdmitx_output_ops = { 
	.id = (xid),							\

	.playback = TOHDMITX_STREAM(xname, "Playback", xfmt, xchmax),	\

	.ops = &g12a_tohdmitx_input_ops,				\

	.probe = g12a_tohdmitx_input_probe,				\

	.remove = g12a_tohdmitx_input_remove,				\

	.probe = meson_codec_glue_input_dai_probe,			\

	.remove = meson_codec_glue_input_dai_remove,			\

}



#define TOHDMITX_OUT(xname, xid, xfmt, xchmax) {			\

sound/soc/meson/meson-codec-glue.c

0 → 100644
+149 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

//

// Copyright (c) 2019 BayLibre, SAS.

// Author: Jerome Brunet <jbrunet@baylibre.com>



#include <linux/module.h>

#include <sound/pcm_params.h>

#include <sound/soc.h>

#include <sound/soc-dai.h>



#include "meson-codec-glue.h"



static struct snd_soc_dapm_widget *

meson_codec_glue_get_input(struct snd_soc_dapm_widget *w)

{

	struct snd_soc_dapm_path *p = NULL;

	struct snd_soc_dapm_widget *in;



	snd_soc_dapm_widget_for_each_source_path(w, p) {

		if (!p->connect)

			continue;



		/* Check that we still are in the same component */

		if (snd_soc_dapm_to_component(w->dapm) !=

		    snd_soc_dapm_to_component(p->source->dapm))

			continue;



		if (p->source->id == snd_soc_dapm_dai_in)

			return p->source;



		in = meson_codec_glue_get_input(p->source);

		if (in)

			return in;

	}



	return NULL;

}



static void meson_codec_glue_input_set_data(struct snd_soc_dai *dai,

					    struct meson_codec_glue_input *data)

{

	dai->playback_dma_data = data;

}



struct meson_codec_glue_input *

meson_codec_glue_input_get_data(struct snd_soc_dai *dai)

{

	return dai->playback_dma_data;

}

EXPORT_SYMBOL_GPL(meson_codec_glue_input_get_data);



static struct meson_codec_glue_input *

meson_codec_glue_output_get_input_data(struct snd_soc_dapm_widget *w)

{

	struct snd_soc_dapm_widget *in =

		meson_codec_glue_get_input(w);

	struct snd_soc_dai *dai;



	if (WARN_ON(!in))

		return NULL;



	dai = in->priv;



	return meson_codec_glue_input_get_data(dai);

}



int meson_codec_glue_input_hw_params(struct snd_pcm_substream *substream,

				     struct snd_pcm_hw_params *params,

				     struct snd_soc_dai *dai)

{

	struct meson_codec_glue_input *data =

		meson_codec_glue_input_get_data(dai);



	data->params.rates = snd_pcm_rate_to_rate_bit(params_rate(params));

	data->params.rate_min = params_rate(params);

	data->params.rate_max = params_rate(params);

	data->params.formats = 1 << params_format(params);

	data->params.channels_min = params_channels(params);

	data->params.channels_max = params_channels(params);

	data->params.sig_bits = dai->driver->playback.sig_bits;



	return 0;

}

EXPORT_SYMBOL_GPL(meson_codec_glue_input_hw_params);



int meson_codec_glue_input_set_fmt(struct snd_soc_dai *dai,

				   unsigned int fmt)

{

	struct meson_codec_glue_input *data =

		meson_codec_glue_input_get_data(dai);



	/* Save the source stream format for the downstream link */

	data->fmt = fmt;

	return 0;

}

EXPORT_SYMBOL_GPL(meson_codec_glue_input_set_fmt);



int meson_codec_glue_output_startup(struct snd_pcm_substream *substream,

				    struct snd_soc_dai *dai)

{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct meson_codec_glue_input *in_data =

		meson_codec_glue_output_get_input_data(dai->capture_widget);



	if (!in_data)

		return -ENODEV;



	if (WARN_ON(!rtd->dai_link->params)) {

		dev_warn(dai->dev, "codec2codec link expected\n");

		return -EINVAL;

	}



	/* Replace link params with the input params */

	rtd->dai_link->params = &in_data->params;



	if (!in_data->fmt)

		return 0;



	return snd_soc_runtime_set_dai_fmt(rtd, in_data->fmt);

}

EXPORT_SYMBOL_GPL(meson_codec_glue_output_startup);



int meson_codec_glue_input_dai_probe(struct snd_soc_dai *dai)

{

	struct meson_codec_glue_input *data;



	data = kzalloc(sizeof(*data), GFP_KERNEL);

	if (!data)

		return -ENOMEM;



	meson_codec_glue_input_set_data(dai, data);

	return 0;

}

EXPORT_SYMBOL_GPL(meson_codec_glue_input_dai_probe);



int meson_codec_glue_input_dai_remove(struct snd_soc_dai *dai)

{

	struct meson_codec_glue_input *data =

		meson_codec_glue_input_get_data(dai);



	kfree(data);

	return 0;

}

EXPORT_SYMBOL_GPL(meson_codec_glue_input_dai_remove);



MODULE_AUTHOR("Jerome Brunet <jbrunet@baylibre.com>");

MODULE_DESCRIPTION("Amlogic Codec Glue Helpers");

MODULE_LICENSE("GPL v2");

sound/soc/meson/meson-codec-glue.h

0 → 100644
+32 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0

 *

 * Copyright (c) 2018 Baylibre SAS.

 * Author: Jerome Brunet <jbrunet@baylibre.com>

 */



#ifndef _MESON_CODEC_GLUE_H

#define _MESON_CODEC_GLUE_H



#include <sound/soc.h>



struct meson_codec_glue_input {

	struct snd_soc_pcm_stream params;

	unsigned int fmt;

};



/* Input helpers */

struct meson_codec_glue_input *

meson_codec_glue_input_get_data(struct snd_soc_dai *dai);

int meson_codec_glue_input_hw_params(struct snd_pcm_substream *substream,

				     struct snd_pcm_hw_params *params,

				     struct snd_soc_dai *dai);

int meson_codec_glue_input_set_fmt(struct snd_soc_dai *dai,

				   unsigned int fmt);

int meson_codec_glue_input_dai_probe(struct snd_soc_dai *dai);

int meson_codec_glue_input_dai_remove(struct snd_soc_dai *dai);



/* Output helpers */

int meson_codec_glue_output_startup(struct snd_pcm_substream *substream,

				    struct snd_soc_dai *dai);



#endif /* _MESON_CODEC_GLUE_H */