diff for duplicates of <5090F283.8080701@atmel.com> diff --git a/a/1.txt b/N1/1.txt index e852cc8..c11df66 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -38,8 +38,7 @@ Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> > + compatible = "atmel,at91sam9g20-audio"; > + atmel,model = "wm8731 @ sam9g20ek"; > + -> + atmel,audio-routing = -> + "Ext Spk", "LHPOUT", +> + atmel,audio-routing > + "Ext Spk", "LHPOUT", > + "Int MIC", "MICIN"; > + > + atmel,dai = <&dai>; @@ -85,8 +84,7 @@ Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> > + compatible = "atmel,at91sam9g20-audio"; > + atmel,model = "wm8731 @ sam9g20ek"; > + -> + atmel,audio-routing = -> + "Ext Spk", "LHPOUT", +> + atmel,audio-routing > + "Ext Spk", "LHPOUT", > + "Int Mic", "MICIN"; > + > + atmel,audio-codec = <&wm8731>; diff --git a/a/content_digest b/N1/content_digest index bcf17c9..547293c 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\01351668420-18447-4-git-send-email-voice.shen@atmel.com\0" "From\0Nicolas Ferre <nicolas.ferre@atmel.com>\0" "Subject\0Re: [Patch v2 4/4] ASoC: sam9g20-wm8731: convert to device tree support\0" - "Date\0Wed, 31 Oct 2012 10:42:27 +0100\0" + "Date\0Wed, 31 Oct 2012 08:42:27 +0000\0" "To\0Bo Shen <voice.shen@atmel.com>\0" "Cc\0broonie@opensource.wolfsonmicro.com" linux-arm-kernel@lists.infradead.org @@ -53,8 +53,7 @@ "> +\tcompatible = \"atmel,at91sam9g20-audio\";\n" "> +\tatmel,model = \"wm8731 @ sam9g20ek\";\n" "> +\n" - "> +\tatmel,audio-routing =\n" - "> +\t\t\"Ext Spk\", \"LHPOUT\",\n" + "> +\tatmel,audio-routing > +\t\t\"Ext Spk\", \"LHPOUT\",\n" "> +\t\t\"Int MIC\", \"MICIN\";\n" "> +\n" "> +\tatmel,dai = <&dai>;\n" @@ -100,8 +99,7 @@ "> +\t\tcompatible = \"atmel,at91sam9g20-audio\";\n" "> +\t\tatmel,model = \"wm8731 @ sam9g20ek\";\n" "> +\n" - "> +\t\tatmel,audio-routing =\n" - "> +\t\t\t\"Ext Spk\", \"LHPOUT\",\n" + "> +\t\tatmel,audio-routing > +\t\t\t\"Ext Spk\", \"LHPOUT\",\n" "> +\t\t\t\"Int Mic\", \"MICIN\";\n" "> +\n" "> +\t\tatmel,audio-codec = <&wm8731>;\n" @@ -213,4 +211,4 @@ "-- \n" Nicolas Ferre -139367827c531992f804d274be9a547bed1984515fb65044d1f1ec931907fd96 +100e3cbca79e77a1135c12386840a64917592b202895440d5c51814ccdf5bfe6
diff --git a/a/1.txt b/N2/1.txt index e852cc8..eb1234f 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -54,19 +54,19 @@ Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> > status = "okay"; > }; > + -> + ssc0: ssc@fffbc000 { +> + ssc0: ssc at fffbc000 { > + status = "okay"; > + }; > }; > -> nand0: nand@40000000 { +> nand0: nand at 40000000 { > @@ -114,8 +118,8 @@ > reg = <0x50>; > }; > -> - wm8731@1b { +> - wm8731 at 1b { > - compatible = "wm8731"; -> + wm8731: wm8731@1b { +> + wm8731: wm8731 at 1b { > + compatible = "wlf,wm8731"; > reg = <0x1b>; > }; diff --git a/a/content_digest b/N2/content_digest index bcf17c9..be1014e 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,16 +1,9 @@ "ref\01351668420-18447-1-git-send-email-voice.shen@atmel.com\0" "ref\01351668420-18447-4-git-send-email-voice.shen@atmel.com\0" - "From\0Nicolas Ferre <nicolas.ferre@atmel.com>\0" - "Subject\0Re: [Patch v2 4/4] ASoC: sam9g20-wm8731: convert to device tree support\0" + "From\0nicolas.ferre@atmel.com (Nicolas Ferre)\0" + "Subject\0[Patch v2 4/4] ASoC: sam9g20-wm8731: convert to device tree support\0" "Date\0Wed, 31 Oct 2012 10:42:27 +0100\0" - "To\0Bo Shen <voice.shen@atmel.com>\0" - "Cc\0broonie@opensource.wolfsonmicro.com" - linux-arm-kernel@lists.infradead.org - devicetree-discuss@lists.ozlabs.org - linux-sound@vger.kernel.org - alsa-devel@alsa-project.org - plagnioj@jcrosoft.com - " jm.lin@atmel.com\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On 10/31/2012 08:27 AM, Bo Shen :\n" @@ -69,19 +62,19 @@ "> \t\t\t\tstatus = \"okay\";\n" "> \t\t\t};\n" "> +\n" - "> +\t\t\tssc0: ssc@fffbc000 {\n" + "> +\t\t\tssc0: ssc at fffbc000 {\n" "> +\t\t\t\tstatus = \"okay\";\n" "> +\t\t\t};\n" "> \t\t};\n" "> \n" - "> \t\tnand0: nand@40000000 {\n" + "> \t\tnand0: nand at 40000000 {\n" "> @@ -114,8 +118,8 @@\n" "> \t\t\treg = <0x50>;\n" "> \t\t};\n" "> \n" - "> -\t\twm8731@1b {\n" + "> -\t\twm8731 at 1b {\n" "> -\t\t\tcompatible = \"wm8731\";\n" - "> +\t\twm8731: wm8731@1b {\n" + "> +\t\twm8731: wm8731 at 1b {\n" "> +\t\t\tcompatible = \"wlf,wm8731\";\n" "> \t\t\treg = <0x1b>;\n" "> \t\t};\n" @@ -213,4 +206,4 @@ "-- \n" Nicolas Ferre -139367827c531992f804d274be9a547bed1984515fb65044d1f1ec931907fd96 +9b58ea51c871e694875480698856b8fda62f1050c32c967c3fc568decc88e9c3
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.