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

Unverified Commit 79223bf1 authored Jan 29, 2018 by Kuninori Morimoto Committed by Mark Brown Feb 12, 2018

ASoC: rt5645/rt5677: replace codec to component



Now we can replace Codec to Component. Let's do it.

Because Intel/Mediatek platforms are using rt5645/rt5677,
we need to update these all related drivers in same time.
Otherwise compile error/warning happen

rt5645:
	xxx_codec_xxx()		->	xxx_component_xxx()
	.idle_bias_off = 1	->	.idle_bias_on = 0
	.ignore_pmdown_time = 0	->	.use_pmdown_time = 1
	-			->	.endianness = 1
	-			->	.non_legacy_dai_naming = 1

rt5677:
	xxx_codec_xxx()		->	xxx_component_xxx()
	.idle_bias_off = 1	->	.idle_bias_on = 0
	.ignore_pmdown_time = 0	->	.use_pmdown_time = 1
	-			->	.endianness = 1
	-			->	.non_legacy_dai_naming = 1

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

parent 7928b2cb

sound/soc/amd/acp-rt5645.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -71,9 +71,9 @@ static int cz_init(struct snd_soc_pcm_runtime *rtd)
	{		{
	int ret;		int ret;
	struct snd_soc_card *card;		struct snd_soc_card *card;
	struct snd_soc_codec *codec;		struct snd_soc_component *codec;

	codec = rtd->codec;		codec = rtd->codec_dai->component;
	card = rtd->card;		card = rtd->card;

	ret = snd_soc_card_jack_new(card, "Headset Jack",		ret = snd_soc_card_jack_new(card, "Headset Jack",

sound/soc/codecs/rt5645.c

+184 −186

File changed.

Preview size limit exceeded, changes collapsed.

sound/soc/codecs/rt5645.h

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -2200,10 +2200,10 @@ enum {
	RT5645_AD_MONO_R_FILTER = (0x1 << 5),		RT5645_AD_MONO_R_FILTER = (0x1 << 5),
	};		};

	int rt5645_sel_asrc_clk_src(struct snd_soc_codec *codec,		int rt5645_sel_asrc_clk_src(struct snd_soc_component *component,
	unsigned int filter_mask, unsigned int clk_src);		unsigned int filter_mask, unsigned int clk_src);

	int rt5645_set_jack_detect(struct snd_soc_codec *codec,		int rt5645_set_jack_detect(struct snd_soc_component *component,
	struct snd_soc_jack hp_jack, struct snd_soc_jack mic_jack,		struct snd_soc_jack hp_jack, struct snd_soc_jack mic_jack,
	struct snd_soc_jack *btn_jack);		struct snd_soc_jack *btn_jack);
	#endif /* __RT5645_H__ */		#endif /* __RT5645_H__ */

sound/soc/codecs/rt5677.c

+101 −104

File changed.

Preview size limit exceeded, changes collapsed.

sound/soc/codecs/rt5677.h

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -1790,7 +1790,7 @@ struct rt5677_platform_data {
	};		};

	struct rt5677_priv {		struct rt5677_priv {
	struct snd_soc_codec *codec;		struct snd_soc_component *component;
	struct rt5677_platform_data pdata;		struct rt5677_platform_data pdata;
	struct regmap regmap, regmap_physical;		struct regmap regmap, regmap_physical;
	const struct firmware fw1, fw2;		const struct firmware fw1, fw2;
	@@ -1816,7 +1816,7 @@ struct rt5677_priv {
	bool is_vref_slow;		bool is_vref_slow;
	};		};

	int rt5677_sel_asrc_clk_src(struct snd_soc_codec *codec,		int rt5677_sel_asrc_clk_src(struct snd_soc_component *component,
	unsigned int filter_mask, unsigned int clk_src);		unsigned int filter_mask, unsigned int clk_src);

	#endif /* __RT5677_H__ */		#endif /* __RT5677_H__ */