diff for duplicates of <51E8A6EF.4040608@atmel.com> diff --git a/a/1.txt b/N1/1.txt index 507bf57..a9264a8 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -16,8 +16,7 @@ On 07/18/2013 07:17 PM, Mark Brown wrote: OK, I will cc the devicetree-discuss next version. ->> + atmel,audio-routing = ->> + "Headphone Jack", "HPOUTL", +>> + atmel,audio-routing >> + "Headphone Jack", "HPOUTL", >> + "Headphone Jack", "HPOUTR", >> + "IN2L", "Line In Jack", >> + "IN2R", "Line In Jack", @@ -75,7 +74,7 @@ OK, I will put set_sysclk here. >> + case SND_SOC_BIAS_PREPARE: >> + if (!mclk_on) { >> + ret = clk_prepare_enable(mclk); ->> + if (ret == 0) +>> + if (ret = 0) >> + mclk_on = 1; >> + } >> + break; diff --git a/a/content_digest b/N1/content_digest index cee763c..01f26df 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\020130718111709.GL22506@sirena.org.uk\0" "From\0Bo Shen <voice.shen@atmel.com>\0" "Subject\0Re: [PATCH] ASoC: atmel: add wm8904 based audio machine driver\0" - "Date\0Fri, 19 Jul 2013 10:39:43 +0800\0" + "Date\0Fri, 19 Jul 2013 02:39:43 +0000\0" "To\0Mark Brown <broonie@kernel.org>\0" "Cc\0nicolas.ferre@atmel.com" plagnioj@jcrosoft.com @@ -29,8 +29,7 @@ "\n" "OK, I will cc the devicetree-discuss next version.\n" "\n" - ">> +\tatmel,audio-routing =\n" - ">> +\t\t\"Headphone Jack\", \"HPOUTL\",\n" + ">> +\tatmel,audio-routing >> +\t\t\"Headphone Jack\", \"HPOUTL\",\n" ">> +\t\t\"Headphone Jack\", \"HPOUTR\",\n" ">> +\t\t\"IN2L\", \"Line In Jack\",\n" ">> +\t\t\"IN2R\", \"Line In Jack\",\n" @@ -88,7 +87,7 @@ ">> +\tcase SND_SOC_BIAS_PREPARE:\n" ">> +\t\tif (!mclk_on) {\n" ">> +\t\t\tret = clk_prepare_enable(mclk);\n" - ">> +\t\t\tif (ret == 0)\n" + ">> +\t\t\tif (ret = 0)\n" ">> +\t\t\t\tmclk_on = 1;\n" ">> +\t\t}\n" ">> +\t\tbreak;\n" @@ -126,4 +125,4 @@ "Best Reards,\n" Bo Shen -e2a22896c8f3959c8ac9eb2acf40faa07df7133f2643d322d50a72df7bcca239 +49a0d478a5724620d676786349ad787e2cb2b13a83d132ceac9637092405ae06
diff --git a/a/content_digest b/N2/content_digest index cee763c..9c70d7c 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,14 +1,9 @@ "ref\01374132483-25375-1-git-send-email-voice.shen@atmel.com\0" "ref\020130718111709.GL22506@sirena.org.uk\0" - "From\0Bo Shen <voice.shen@atmel.com>\0" - "Subject\0Re: [PATCH] ASoC: atmel: add wm8904 based audio machine driver\0" + "From\0voice.shen@atmel.com (Bo Shen)\0" + "Subject\0[PATCH] ASoC: atmel: add wm8904 based audio machine driver\0" "Date\0Fri, 19 Jul 2013 10:39:43 +0800\0" - "To\0Mark Brown <broonie@kernel.org>\0" - "Cc\0nicolas.ferre@atmel.com" - plagnioj@jcrosoft.com - linux-sound@vger.kernel.org - alsa-devel@alsa-project.org - " linux-arm-kernel@lists.infradead.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Hi Mark,\n" @@ -126,4 +121,4 @@ "Best Reards,\n" Bo Shen -e2a22896c8f3959c8ac9eb2acf40faa07df7133f2643d322d50a72df7bcca239 +b402fbd4726d3961b86d19a3200fea4ab8179a29880570943a3b757942b5ec13
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.