diff for duplicates of <5396F9C6.2050901@atmel.com> diff --git a/a/content_digest b/N1/content_digest index df3ee0b..9431fba 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\01402284707-23354-6-git-send-email-voice.shen@atmel.com\0" "From\0Nicolas Ferre <nicolas.ferre@atmel.com>\0" "Subject\0Re: [PATCH v2 5/5] ARM: atmel: at91sam9n12ek: switch sound to CCF\0" - "Date\0Tue, 10 Jun 2014 14:27:50 +0200\0" + "Date\0Tue, 10 Jun 2014 12:27:50 +0000\0" "To\0Bo Shen <voice.shen@atmel.com>" " Mark Brown <broonie@kernel.org>\0" "Cc\0boris.brezillon@free-electrons.com" @@ -48,4 +48,4 @@ "-- \n" Nicolas Ferre -5fa6ad9f35e5de3bba777c465d74a18acd0280a4436911d5ae274ef5e65383dd +76132fa1b74f5b08cab27594bea17829911a8782a1935af15317059d837667f3
diff --git a/a/1.txt b/N2/1.txt index 0d9a8f8..4237e0b 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -20,14 +20,14 @@ Thanks. > --- a/arch/arm/boot/dts/at91sam9n12ek.dts > +++ b/arch/arm/boot/dts/at91sam9n12ek.dts > @@ -56,6 +56,8 @@ -> wm8904: codec@1a { +> wm8904: codec at 1a { > compatible = "wm8904"; > reg = <0x1a>; > + clocks = <&pck0>; > + clock-names = "mclk"; > }; > -> qt1070: keyboard@1b { +> qt1070: keyboard at 1b { > diff --git a/a/content_digest b/N2/content_digest index df3ee0b..a52ef34 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,15 +1,9 @@ "ref\01402284707-23354-1-git-send-email-voice.shen@atmel.com\0" "ref\01402284707-23354-6-git-send-email-voice.shen@atmel.com\0" - "From\0Nicolas Ferre <nicolas.ferre@atmel.com>\0" - "Subject\0Re: [PATCH v2 5/5] ARM: atmel: at91sam9n12ek: switch sound to CCF\0" + "From\0nicolas.ferre@atmel.com (Nicolas Ferre)\0" + "Subject\0[PATCH v2 5/5] ARM: atmel: at91sam9n12ek: switch sound to CCF\0" "Date\0Tue, 10 Jun 2014 14:27:50 +0200\0" - "To\0Bo Shen <voice.shen@atmel.com>" - " Mark Brown <broonie@kernel.org>\0" - "Cc\0boris.brezillon@free-electrons.com" - alsa-devel@alsa-project.org - linux-sound@vger.kernel.org - linux-arm-kernel@lists.infradead.org - " devicetree@vger.kernel.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On 09/06/2014 05:31, Bo Shen :\n" @@ -34,18 +28,18 @@ "> --- a/arch/arm/boot/dts/at91sam9n12ek.dts\n" "> +++ b/arch/arm/boot/dts/at91sam9n12ek.dts\n" "> @@ -56,6 +56,8 @@\n" - "> \t\t\t\twm8904: codec@1a {\n" + "> \t\t\t\twm8904: codec at 1a {\n" "> \t\t\t\t\tcompatible = \"wm8904\";\n" "> \t\t\t\t\treg = <0x1a>;\n" "> +\t\t\t\t\tclocks = <&pck0>;\n" "> +\t\t\t\t\tclock-names = \"mclk\";\n" "> \t\t\t\t};\n" "> \n" - "> \t\t\t\tqt1070: keyboard@1b {\n" + "> \t\t\t\tqt1070: keyboard at 1b {\n" "> \n" "\n" "\n" "-- \n" Nicolas Ferre -5fa6ad9f35e5de3bba777c465d74a18acd0280a4436911d5ae274ef5e65383dd +527e70621671df373691735fd50b50590a394ace0dbc063c12a3d4092328d316
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.