ASoC: Convert WM8580 to table based DAPM and control init (f235c649) · Commits · e / devices / android_kernel_teracube_2e

sound/soc/codecs/wm8580.c

+8 −16

Original line number	Diff line number	Diff line
		@@ -272,7 +272,7 @@ SND_SOC_DAPM_INPUT("AINL"),
		SND_SOC_DAPM_INPUT("AINR"),
		};

		static const struct snd_soc_dapm_route audio_map[] = {
		static const struct snd_soc_dapm_route wm8580_dapm_routes[] = {
		{ "VOUT1L", NULL, "DAC1" },
		{ "VOUT1R", NULL, "DAC1" },

		@@ -286,17 +286,6 @@ static const struct snd_soc_dapm_route audio_map[] = {
		{ "ADC", NULL, "AINR" },
		};

		static int wm8580_add_widgets(struct snd_soc_codec *codec)
		{
		struct snd_soc_dapm_context *dapm = &codec->dapm;

		snd_soc_dapm_new_controls(dapm, wm8580_dapm_widgets,
		ARRAY_SIZE(wm8580_dapm_widgets));
		snd_soc_dapm_add_routes(dapm, audio_map, ARRAY_SIZE(audio_map));

		return 0;
		}

		/* PLL divisors */
		struct _pll_div {
		u32 prescale:1;
		@@ -856,10 +845,6 @@ static int wm8580_probe(struct snd_soc_codec *codec)

		wm8580_set_bias_level(codec, SND_SOC_BIAS_STANDBY);

		snd_soc_add_controls(codec, wm8580_snd_controls,
		ARRAY_SIZE(wm8580_snd_controls));
		wm8580_add_widgets(codec);

		return 0;

		err_regulator_enable:
		@@ -889,6 +874,13 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8580 = {
		.reg_cache_size = ARRAY_SIZE(wm8580_reg),
		.reg_word_size = sizeof(u16),
		.reg_cache_default = wm8580_reg,

		.controls = wm8580_snd_controls,
		.num_controls = ARRAY_SIZE(wm8580_snd_controls),
		.dapm_widgets = wm8580_dapm_widgets,
		.num_dapm_widgets = ARRAY_SIZE(wm8580_dapm_widgets),
		.dapm_routes = wm8580_dapm_routes,
		.num_dapm_routes = ARRAY_SIZE(wm8580_dapm_routes),
		};

		static const struct of_device_id wm8580_of_match[] = {