diff for duplicates of <4FBE5812.8020806@ti.com> diff --git a/a/1.txt b/N1/1.txt index 9dc76aa..f6b6dd0 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -19,12 +19,12 @@ Acked-by: Benoit Cousson <b-cousson@ti.com> > #interrupt-cells =<1>; > }; > -> + mailbox: mailbox@48094000 { +> + mailbox: mailbox at 48094000 { > + compatible = "ti,omap2-mailbox"; > + ti,hwmods = "mailbox"; > + }; > + -> uart1: serial@4806a000 { +> uart1: serial at 4806a000 { > compatible = "ti,omap2-uart"; > ti,hwmods = "uart1"; > diff --git a/arch/arm/boot/dts/omap3.dtsi b/arch/arm/boot/dts/omap3.dtsi @@ -35,12 +35,12 @@ Acked-by: Benoit Cousson <b-cousson@ti.com> > reg =<0x48200000 0x1000>; > }; > -> + mailbox: mailbox@48094000 { +> + mailbox: mailbox at 48094000 { > + compatible = "ti,omap3-mailbox"; > + ti,hwmods = "mailbox"; > + }; > + -> uart1: serial@4806a000 { +> uart1: serial at 4806a000 { > compatible = "ti,omap3-uart"; > ti,hwmods = "uart1"; > diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi @@ -51,11 +51,11 @@ Acked-by: Benoit Cousson <b-cousson@ti.com> > <0x48240100 0x0100>; > }; > -> + mailbox: mailbox@4a0f4000 { +> + mailbox: mailbox at 4a0f4000 { > + compatible = "ti,omap4-mailbox"; > + ti,hwmods = "mailbox"; > + }; > + -> uart1: serial@4806a000 { +> uart1: serial at 4806a000 { > compatible = "ti,omap4-uart"; > ti,hwmods = "uart1"; diff --git a/a/content_digest b/N1/content_digest index 0a3fb4f..62faed9 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,20 +1,9 @@ "ref\01335894460-19941-1-git-send-email-omar.luna@linaro.org\0" "ref\01335894460-19941-3-git-send-email-omar.luna@linaro.org\0" - "From\0Cousson, Benoit <b-cousson@ti.com>\0" - "Subject\0Re: [PATCH 2/2] arm/dts: OMAP2+: Add mailbox nodes\0" + "From\0b-cousson@ti.com (Cousson, Benoit)\0" + "Subject\0[PATCH 2/2] arm/dts: OMAP2+: Add mailbox nodes\0" "Date\0Thu, 24 May 2012 17:47:30 +0200\0" - "To\0Omar Ramirez Luna <omar.luna@linaro.org>\0" - "Cc\0devicetree-discuss@lists.ozlabs.org" - Grant Likely <grant.likely@secretlab.ca> - Rob Herring <rob.herring@calxeda.com> - Rob Landley <rob@landley.net> - Russell King <linux@arm.linux.org.uk> - Tony Lindgren <tony@atomide.com> - linux-doc@vger.kernel.org - linux-arm-kernel@lists.infradead.org - linux-omap@vger.kernel.org - patches@linaro.org - " linaro-dev@lists.linaro.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On 5/1/2012 7:47 PM, Omar Ramirez Luna wrote:\n" @@ -38,12 +27,12 @@ "> \t\t\t#interrupt-cells =<1>;\n" "> \t\t};\n" ">\n" - "> +\t\tmailbox: mailbox@48094000 {\n" + "> +\t\tmailbox: mailbox at 48094000 {\n" "> +\t\t\tcompatible = \"ti,omap2-mailbox\";\n" "> +\t\t\tti,hwmods = \"mailbox\";\n" "> +\t\t};\n" "> +\n" - "> \t\tuart1: serial@4806a000 {\n" + "> \t\tuart1: serial at 4806a000 {\n" "> \t\t\tcompatible = \"ti,omap2-uart\";\n" "> \t\t\tti,hwmods = \"uart1\";\n" "> diff --git a/arch/arm/boot/dts/omap3.dtsi b/arch/arm/boot/dts/omap3.dtsi\n" @@ -54,12 +43,12 @@ "> \t\t\treg =<0x48200000 0x1000>;\n" "> \t\t};\n" ">\n" - "> +\t\tmailbox: mailbox@48094000 {\n" + "> +\t\tmailbox: mailbox at 48094000 {\n" "> +\t\t\tcompatible = \"ti,omap3-mailbox\";\n" "> +\t\t\tti,hwmods = \"mailbox\";\n" "> +\t\t};\n" "> +\n" - "> \t\tuart1: serial@4806a000 {\n" + "> \t\tuart1: serial at 4806a000 {\n" "> \t\t\tcompatible = \"ti,omap3-uart\";\n" "> \t\t\tti,hwmods = \"uart1\";\n" "> diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi\n" @@ -70,13 +59,13 @@ "> \t\t\t<0x48240100 0x0100>;\n" "> \t\t};\n" ">\n" - "> +\t\tmailbox: mailbox@4a0f4000 {\n" + "> +\t\tmailbox: mailbox at 4a0f4000 {\n" "> +\t\t\tcompatible = \"ti,omap4-mailbox\";\n" "> +\t\t\tti,hwmods = \"mailbox\";\n" "> +\t\t};\n" "> +\n" - "> \t\tuart1: serial@4806a000 {\n" + "> \t\tuart1: serial at 4806a000 {\n" "> \t\t\tcompatible = \"ti,omap4-uart\";\n" "> \t\t\tti,hwmods = \"uart1\";" -d493aae035a75393a4b8d2d27304f21f608f03d0266bda2f36c6e57a78ba8971 +1022c838f5aaf382476eb3e9df968f087bb3862e292f14b3be6bc1111ceeaf39
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.