diff for duplicates of <20110704172856.GF28726@opensource.wolfsonmicro.com> diff --git a/a/1.txt b/N1/1.txt index 352bba5..b59480f 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -7,88 +7,3 @@ On Mon, Jul 04, 2011 at 11:46:30AM +0200, Nicolas Ferre wrote: It's pretty trivial - try the below (Liam, are you OK with this if it tests OK?): - ->From 1dd054eb530641dadbf71525ee517c847f19e161 Mon Sep 17 00:00:00 2001 -From: Mark Brown <broonie@opensource.wolfsonmicro.com> -Date: Mon, 4 Jul 2011 10:27:51 -0700 -Subject: [PATCH] ASoC: Manage WM8731 ACTIVE bit as a supply widget - -Now we have supply widgets there's no need to open code the handling of -the ACTIVE bit. - -Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> ---- - sound/soc/codecs/wm8731.c | 29 +++-------------------------- - 1 files changed, 3 insertions(+), 26 deletions(-) - -diff --git a/sound/soc/codecs/wm8731.c b/sound/soc/codecs/wm8731.c -index 2dc964b..59d9e59 100644 ---- a/sound/soc/codecs/wm8731.c -+++ b/sound/soc/codecs/wm8731.c -@@ -175,6 +175,7 @@ static const struct snd_kcontrol_new wm8731_input_mux_controls = - SOC_DAPM_ENUM("Input Select", wm8731_insel_enum); - - static const struct snd_soc_dapm_widget wm8731_dapm_widgets[] = { -+SND_SOC_DAPM_SUPPLY("Active",WM8731_ACTIVE, 0, 0, NULL, 0), - SND_SOC_DAPM_SUPPLY("OSC", WM8731_PWR, 5, 1, NULL, 0), - SND_SOC_DAPM_MIXER("Output Mixer", WM8731_PWR, 4, 1, - &wm8731_output_mixer_controls[0], -@@ -204,6 +205,8 @@ static int wm8731_check_osc(struct snd_soc_dapm_widget *source, - static const struct snd_soc_dapm_route wm8731_intercon[] = { - {"DAC", NULL, "OSC", wm8731_check_osc}, - {"ADC", NULL, "OSC", wm8731_check_osc}, -+ {"DAC", NULL, "ACTIVE"}, -+ {"ADC", NULL, "ACTIVE"}, - - /* output mixer */ - {"Output Mixer", "Line Bypass Switch", "Line Input"}, -@@ -315,29 +318,6 @@ static int wm8731_hw_params(struct snd_pcm_substream *substream, - return 0; - } - --static int wm8731_pcm_prepare(struct snd_pcm_substream *substream, -- struct snd_soc_dai *dai) --{ -- struct snd_soc_codec *codec = dai->codec; -- -- /* set active */ -- snd_soc_write(codec, WM8731_ACTIVE, 0x0001); -- -- return 0; --} -- --static void wm8731_shutdown(struct snd_pcm_substream *substream, -- struct snd_soc_dai *dai) --{ -- struct snd_soc_codec *codec = dai->codec; -- -- /* deactivate */ -- if (!codec->active) { -- udelay(50); -- snd_soc_write(codec, WM8731_ACTIVE, 0x0); -- } --} -- - static int wm8731_mute(struct snd_soc_dai *dai, int mute) - { - struct snd_soc_codec *codec = dai->codec; -@@ -480,7 +460,6 @@ static int wm8731_set_bias_level(struct snd_soc_codec *codec, - snd_soc_write(codec, WM8731_PWR, reg | 0x0040); - break; - case SND_SOC_BIAS_OFF: -- snd_soc_write(codec, WM8731_ACTIVE, 0x0); - snd_soc_write(codec, WM8731_PWR, 0xffff); - regulator_bulk_disable(ARRAY_SIZE(wm8731->supplies), - wm8731->supplies); -@@ -496,9 +475,7 @@ static int wm8731_set_bias_level(struct snd_soc_codec *codec, - SNDRV_PCM_FMTBIT_S24_LE) - - static struct snd_soc_dai_ops wm8731_dai_ops = { -- .prepare = wm8731_pcm_prepare, - .hw_params = wm8731_hw_params, -- .shutdown = wm8731_shutdown, - .digital_mute = wm8731_mute, - .set_sysclk = wm8731_set_dai_sysclk, - .set_fmt = wm8731_set_dai_fmt, --- -1.7.5.4 diff --git a/a/content_digest b/N1/content_digest index 7bd3fdd..53907ce 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,14 +2,10 @@ "ref\01309517034-26110-1-git-send-email-nicolas.ferre@atmel.com\0" "ref\020110701161506.GC23784@opensource.wolfsonmicro.com\0" "ref\04E118BF6.6010205@atmel.com\0" - "From\0Mark Brown <broonie@opensource.wolfsonmicro.com>\0" - "Subject\0Re: [PATCH] ASoC: wm8731: set the ACTIVE bit if bias ON entered\0" + "From\0broonie@opensource.wolfsonmicro.com (Mark Brown)\0" + "Subject\0[PATCH] ASoC: wm8731: set the ACTIVE bit if bias ON entered\0" "Date\0Mon, 4 Jul 2011 10:29:00 -0700\0" - "To\0Nicolas Ferre <nicolas.ferre@atmel.com>\0" - "Cc\0alsa-devel@alsa-project.org" - lrg@ti.com - linux-arm-kernel@lists.infradead.org - " linux-kernel@vger.kernel.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On Mon, Jul 04, 2011 at 11:46:30AM +0200, Nicolas Ferre wrote:\n" @@ -20,91 +16,6 @@ "> if you want...\n" "\n" "It's pretty trivial - try the below (Liam, are you OK with this if it\n" - "tests OK?):\n" - "\n" - ">From 1dd054eb530641dadbf71525ee517c847f19e161 Mon Sep 17 00:00:00 2001\n" - "From: Mark Brown <broonie@opensource.wolfsonmicro.com>\n" - "Date: Mon, 4 Jul 2011 10:27:51 -0700\n" - "Subject: [PATCH] ASoC: Manage WM8731 ACTIVE bit as a supply widget\n" - "\n" - "Now we have supply widgets there's no need to open code the handling of\n" - "the ACTIVE bit.\n" - "\n" - "Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>\n" - "---\n" - " sound/soc/codecs/wm8731.c | 29 +++--------------------------\n" - " 1 files changed, 3 insertions(+), 26 deletions(-)\n" - "\n" - "diff --git a/sound/soc/codecs/wm8731.c b/sound/soc/codecs/wm8731.c\n" - "index 2dc964b..59d9e59 100644\n" - "--- a/sound/soc/codecs/wm8731.c\n" - "+++ b/sound/soc/codecs/wm8731.c\n" - "@@ -175,6 +175,7 @@ static const struct snd_kcontrol_new wm8731_input_mux_controls =\n" - " SOC_DAPM_ENUM(\"Input Select\", wm8731_insel_enum);\n" - " \n" - " static const struct snd_soc_dapm_widget wm8731_dapm_widgets[] = {\n" - "+SND_SOC_DAPM_SUPPLY(\"Active\",WM8731_ACTIVE, 0, 0, NULL, 0),\n" - " SND_SOC_DAPM_SUPPLY(\"OSC\", WM8731_PWR, 5, 1, NULL, 0),\n" - " SND_SOC_DAPM_MIXER(\"Output Mixer\", WM8731_PWR, 4, 1,\n" - " \t&wm8731_output_mixer_controls[0],\n" - "@@ -204,6 +205,8 @@ static int wm8731_check_osc(struct snd_soc_dapm_widget *source,\n" - " static const struct snd_soc_dapm_route wm8731_intercon[] = {\n" - " \t{\"DAC\", NULL, \"OSC\", wm8731_check_osc},\n" - " \t{\"ADC\", NULL, \"OSC\", wm8731_check_osc},\n" - "+\t{\"DAC\", NULL, \"ACTIVE\"},\n" - "+\t{\"ADC\", NULL, \"ACTIVE\"},\n" - " \n" - " \t/* output mixer */\n" - " \t{\"Output Mixer\", \"Line Bypass Switch\", \"Line Input\"},\n" - "@@ -315,29 +318,6 @@ static int wm8731_hw_params(struct snd_pcm_substream *substream,\n" - " \treturn 0;\n" - " }\n" - " \n" - "-static int wm8731_pcm_prepare(struct snd_pcm_substream *substream,\n" - "-\t\t\t struct snd_soc_dai *dai)\n" - "-{\n" - "-\tstruct snd_soc_codec *codec = dai->codec;\n" - "-\n" - "-\t/* set active */\n" - "-\tsnd_soc_write(codec, WM8731_ACTIVE, 0x0001);\n" - "-\n" - "-\treturn 0;\n" - "-}\n" - "-\n" - "-static void wm8731_shutdown(struct snd_pcm_substream *substream,\n" - "-\t\t\t struct snd_soc_dai *dai)\n" - "-{\n" - "-\tstruct snd_soc_codec *codec = dai->codec;\n" - "-\n" - "-\t/* deactivate */\n" - "-\tif (!codec->active) {\n" - "-\t\tudelay(50);\n" - "-\t\tsnd_soc_write(codec, WM8731_ACTIVE, 0x0);\n" - "-\t}\n" - "-}\n" - "-\n" - " static int wm8731_mute(struct snd_soc_dai *dai, int mute)\n" - " {\n" - " \tstruct snd_soc_codec *codec = dai->codec;\n" - "@@ -480,7 +460,6 @@ static int wm8731_set_bias_level(struct snd_soc_codec *codec,\n" - " \t\tsnd_soc_write(codec, WM8731_PWR, reg | 0x0040);\n" - " \t\tbreak;\n" - " \tcase SND_SOC_BIAS_OFF:\n" - "-\t\tsnd_soc_write(codec, WM8731_ACTIVE, 0x0);\n" - " \t\tsnd_soc_write(codec, WM8731_PWR, 0xffff);\n" - " \t\tregulator_bulk_disable(ARRAY_SIZE(wm8731->supplies),\n" - " \t\t\t\t wm8731->supplies);\n" - "@@ -496,9 +475,7 @@ static int wm8731_set_bias_level(struct snd_soc_codec *codec,\n" - " \tSNDRV_PCM_FMTBIT_S24_LE)\n" - " \n" - " static struct snd_soc_dai_ops wm8731_dai_ops = {\n" - "-\t.prepare\t= wm8731_pcm_prepare,\n" - " \t.hw_params\t= wm8731_hw_params,\n" - "-\t.shutdown\t= wm8731_shutdown,\n" - " \t.digital_mute\t= wm8731_mute,\n" - " \t.set_sysclk\t= wm8731_set_dai_sysclk,\n" - " \t.set_fmt\t= wm8731_set_dai_fmt,\n" - "-- \n" - 1.7.5.4 + tests OK?): -a16df2715109edc489d90314b1d3e5d76b9ee25357dfa7b6435528bb90a780f1 +545bc71dbb3aee68cc273b3192660911a2e54868297f7463eae2dddee75dab5d
diff --git a/a/content_digest b/N2/content_digest index 7bd3fdd..bff03ed 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -6,8 +6,8 @@ "Subject\0Re: [PATCH] ASoC: wm8731: set the ACTIVE bit if bias ON entered\0" "Date\0Mon, 4 Jul 2011 10:29:00 -0700\0" "To\0Nicolas Ferre <nicolas.ferre@atmel.com>\0" - "Cc\0alsa-devel@alsa-project.org" - lrg@ti.com + "Cc\0lrg@ti.com" + alsa-devel@alsa-project.org linux-arm-kernel@lists.infradead.org " linux-kernel@vger.kernel.org\0" "\00:1\0" @@ -107,4 +107,4 @@ "-- \n" 1.7.5.4 -a16df2715109edc489d90314b1d3e5d76b9ee25357dfa7b6435528bb90a780f1 +0862c6df3a50f29a0aa6d1882ff02755d07f2379b4e564135894f7761adf5b49
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.