diff for duplicates of <504EFF86.10105@stericsson.com> diff --git a/a/1.txt b/N1/1.txt index 65307ba..5a371df 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -6,7 +6,7 @@ On 09/10/2012 06:43 PM, Lee Jones wrote: >> Here we add the required documentation for the new Device Tree >> bindings pertaining to the MSP CPU-side DAI Driver. >> ->> CC: alsa-devel@alsa-project.org +>> CC: alsa-devel at alsa-project.org >> Signed-off-by: Lee Jones <lee.jones@linaro.org> >> --- >> .../devicetree/bindings/sound/ux500-msp.txt | 43 ++++++++++++++++++++ @@ -44,14 +44,14 @@ On 09/10/2012 06:43 PM, Lee Jones wrote: >> + compatible = "stericsson,ux500-pcm"; >> + }; >> + ->> + msp1: msp@80124000 { +>> + msp1: msp at 80124000 { >> + compatible = "stericsson,ux500-msp-i2s"; >> + reg = <0x80124000 0x1000>; >> + interrupts = <0 62 0x4>; >> + v-ape-supply = <&db8500_vape_reg>; >> + }; >> + ->> + msp3: msp@80125000 { +>> + msp3: msp at 80125000 { >> + compatible = "stericsson,ux500-msp-i2s"; >> + reg = <0x80125000 0x1000>; >> + interrupts = <0 62 0x4>; diff --git a/a/content_digest b/N1/content_digest index 390936c..26e0b27 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,18 +1,10 @@ "ref\01345816913-4113-1-git-send-email-lee.jones@linaro.org\0" "ref\01345816913-4113-8-git-send-email-lee.jones@linaro.org\0" "ref\020120910164333.GB24506@gmail.com\0" - "From\0Ola Lilja <ola.o.lilja@stericsson.com>\0" - "Subject\0Re: [PATCH 07/17] Documentation: Define the MSP Driver Device Tree bindings\0" + "From\0ola.o.lilja@stericsson.com (Ola Lilja)\0" + "Subject\0[PATCH 07/17] Documentation: Define the MSP Driver Device Tree bindings\0" "Date\0Tue, 11 Sep 2012 11:08:22 +0200\0" - "To\0Lee Jones <lee.jones@linaro.org>\0" - "Cc\0alsa-devel@alsa-project.org <alsa-devel@alsa-project.org>" - Linus WALLEIJ <linus.walleij@stericsson.com> - arnd@arndb.de <arnd@arndb.de> - Roger NILSSON1 <roger.xr.nilsson@stericsson.com> - broonie@opensource.wolfsonmicro.com <broonie@opensource.wolfsonmicro.com> - linux-kernel@vger.kernel.org <linux-kernel@vger.kernel.org> - STEricsson_nomadik_linux <STEricsson_nomadik_linux@list.st.com> - " linux-arm-kernel@lists.infradead.org <linux-arm-kernel@lists.infradead.org>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On 09/10/2012 06:43 PM, Lee Jones wrote:\n" @@ -23,7 +15,7 @@ ">> Here we add the required documentation for the new Device Tree\n" ">> bindings pertaining to the MSP CPU-side DAI Driver.\n" ">> \n" - ">> CC: alsa-devel@alsa-project.org\n" + ">> CC: alsa-devel at alsa-project.org\n" ">> Signed-off-by: Lee Jones <lee.jones@linaro.org>\n" ">> ---\n" ">> .../devicetree/bindings/sound/ux500-msp.txt | 43 ++++++++++++++++++++\n" @@ -61,14 +53,14 @@ ">> +\t\tcompatible = \"stericsson,ux500-pcm\";\n" ">> +\t};\n" ">> +\n" - ">> +\tmsp1: msp@80124000 {\n" + ">> +\tmsp1: msp at 80124000 {\n" ">> +\t\tcompatible = \"stericsson,ux500-msp-i2s\";\n" ">> +\t\treg = <0x80124000 0x1000>;\n" ">> +\t\tinterrupts = <0 62 0x4>;\n" ">> +\t\tv-ape-supply = <&db8500_vape_reg>;\n" ">> +\t};\n" ">> +\n" - ">> +\tmsp3: msp@80125000 {\n" + ">> +\tmsp3: msp at 80125000 {\n" ">> +\t\tcompatible = \"stericsson,ux500-msp-i2s\";\n" ">> +\t\treg = <0x80125000 0x1000>;\n" ">> +\t\tinterrupts = <0 62 0x4>;\n" @@ -90,4 +82,4 @@ ">> \n" > -d46a36e6eb350b5cbb6e22a7d3fe4612f4019c74307b1ebb4adc107b2e744537 +a34295233fe614f13db07d9f63badf5a31c3c83de7820ae3fa86a12aa96ad393
diff --git a/a/content_digest b/N2/content_digest index 390936c..89c1722 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -5,14 +5,14 @@ "Subject\0Re: [PATCH 07/17] Documentation: Define the MSP Driver Device Tree bindings\0" "Date\0Tue, 11 Sep 2012 11:08:22 +0200\0" "To\0Lee Jones <lee.jones@linaro.org>\0" - "Cc\0alsa-devel@alsa-project.org <alsa-devel@alsa-project.org>" + "Cc\0linux-arm-kernel@lists.infradead.org <linux-arm-kernel@lists.infradead.org>" + linux-kernel@vger.kernel.org <linux-kernel@vger.kernel.org> + STEricsson_nomadik_linux <STEricsson_nomadik_linux@list.st.com> Linus WALLEIJ <linus.walleij@stericsson.com> arnd@arndb.de <arnd@arndb.de> - Roger NILSSON1 <roger.xr.nilsson@stericsson.com> broonie@opensource.wolfsonmicro.com <broonie@opensource.wolfsonmicro.com> - linux-kernel@vger.kernel.org <linux-kernel@vger.kernel.org> - STEricsson_nomadik_linux <STEricsson_nomadik_linux@list.st.com> - " linux-arm-kernel@lists.infradead.org <linux-arm-kernel@lists.infradead.org>\0" + Roger NILSSON1 <roger.xr.nilsson@stericsson.com> + " alsa-devel@alsa-project.org <alsa-devel@alsa-project.org>\0" "\00:1\0" "b\0" "On 09/10/2012 06:43 PM, Lee Jones wrote:\n" @@ -90,4 +90,4 @@ ">> \n" > -d46a36e6eb350b5cbb6e22a7d3fe4612f4019c74307b1ebb4adc107b2e744537 +ea58b67e0812c442a0886156bc24fb1a1a762c06a2ff8b4a3c08f9b43bd50d03
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.