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

Commit 2f2a3462 authored by Chen-Yu Tsai's avatar Chen-Yu Tsai Committed by Mark Brown
Browse files

ASoC: sun4i-codec: Move data structures to add create_card call to quirks 



The audio codec on later Allwinner SoCs have a different layout and
audio path compared to the A10/A20. However the PCM parts are still
the same.

The different layout and audio paths mean we need a different
create_card function for different families, so they can create
DAPM endpoint widgets and routes.

This patch moves the regmap configs, quirks and of_device_id
structures to just before the probe function, so we can, among other
things, include a pointer for the create_card function. None of the
lines of code were changed.

Signed-off-by: default avatarChen-Yu Tsai <wens@csie.org>
Acked-by: default avatarMaxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent ae73b34f

sound/soc/sunxi/sun4i-codec.c

+39 −39
Original line number Diff line number Diff line
@@ -678,45 +678,6 @@ static struct snd_soc_dai_driver dummy_cpu_dai = { 
	 },

};



static const struct regmap_config sun4i_codec_regmap_config = {

	.reg_bits	= 32,

	.reg_stride	= 4,

	.val_bits	= 32,

	.max_register	= SUN4I_CODEC_ADC_RXCNT,

};



static const struct regmap_config sun7i_codec_regmap_config = {

	.reg_bits	= 32,

	.reg_stride	= 4,

	.val_bits	= 32,

	.max_register	= SUN7I_CODEC_AC_MIC_PHONE_CAL,

};



struct sun4i_codec_quirks {

	const struct regmap_config *regmap_config;

};



static const struct sun4i_codec_quirks sun4i_codec_quirks = {

	.regmap_config = &sun4i_codec_regmap_config,

};



static const struct sun4i_codec_quirks sun7i_codec_quirks = {

	.regmap_config = &sun7i_codec_regmap_config,

};



static const struct of_device_id sun4i_codec_of_match[] = {

	{

		.compatible = "allwinner,sun4i-a10-codec",

		.data = &sun4i_codec_quirks,

	},

	{

		.compatible = "allwinner,sun7i-a20-codec",

		.data = &sun7i_codec_quirks,

	},

	{}

};

MODULE_DEVICE_TABLE(of, sun4i_codec_of_match);



static struct snd_soc_dai_link *sun4i_codec_create_link(struct device *dev,

							int *num_links)

{
@@ -781,6 +742,45 @@ static struct snd_soc_card *sun4i_codec_create_card(struct device *dev) 
	return card;

};



static const struct regmap_config sun4i_codec_regmap_config = {

	.reg_bits	= 32,

	.reg_stride	= 4,

	.val_bits	= 32,

	.max_register	= SUN4I_CODEC_ADC_RXCNT,

};



static const struct regmap_config sun7i_codec_regmap_config = {

	.reg_bits	= 32,

	.reg_stride	= 4,

	.val_bits	= 32,

	.max_register	= SUN7I_CODEC_AC_MIC_PHONE_CAL,

};



struct sun4i_codec_quirks {

	const struct regmap_config *regmap_config;

};



static const struct sun4i_codec_quirks sun4i_codec_quirks = {

	.regmap_config	= &sun4i_codec_regmap_config,

};



static const struct sun4i_codec_quirks sun7i_codec_quirks = {

	.regmap_config	= &sun7i_codec_regmap_config,

};



static const struct of_device_id sun4i_codec_of_match[] = {

	{

		.compatible = "allwinner,sun4i-a10-codec",

		.data = &sun4i_codec_quirks,

	},

	{

		.compatible = "allwinner,sun7i-a20-codec",

		.data = &sun7i_codec_quirks,

	},

	{}

};

MODULE_DEVICE_TABLE(of, sun4i_codec_of_match);



static int sun4i_codec_probe(struct platform_device *pdev)

{

	struct snd_soc_card *card;