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

Unverified Commit f4ee2717 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: wm8962: replace codec to component 



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

Note:
	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: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 7928b2cb

sound/soc/codecs/wm8962.c

+198 −199

File changed.

Preview size limit exceeded, changes collapsed.

sound/soc/codecs/wm8962.h

+1 −1
Original line number Diff line number Diff line
@@ -3779,6 +3779,6 @@ 
#define WM8962_VSS_ENA_SHIFT                         0  /* VSS_ENA */

#define WM8962_VSS_ENA_WIDTH                         1  /* VSS_ENA */



int wm8962_mic_detect(struct snd_soc_codec *codec, struct snd_soc_jack *jack);

int wm8962_mic_detect(struct snd_soc_component *component, struct snd_soc_jack *jack);



#endif

sound/soc/samsung/tobermory.c

+3 −3
Original line number Diff line number Diff line
@@ -179,12 +179,12 @@ static struct snd_soc_jack_pin tobermory_headset_pins[] = { 
static int tobermory_late_probe(struct snd_soc_card *card)

{

	struct snd_soc_pcm_runtime *rtd;

	struct snd_soc_codec *codec;

	struct snd_soc_component *component;

	struct snd_soc_dai *codec_dai;

	int ret;



	rtd = snd_soc_get_pcm_runtime(card, card->dai_link[0].name);

	codec = rtd->codec;

	component = rtd->codec_dai->component;

	codec_dai = rtd->codec_dai;



	ret = snd_soc_dai_set_sysclk(codec_dai, WM8962_SYSCLK_MCLK,
@@ -199,7 +199,7 @@ static int tobermory_late_probe(struct snd_soc_card *card) 
	if (ret)

		return ret;



	wm8962_mic_detect(codec, &tobermory_headset);

	wm8962_mic_detect(component, &tobermory_headset);



	return 0;

}