diff for duplicates of <51C37AD7.1020309@ti.com> diff --git a/a/1.txt b/N1/1.txt index 10ee682..c271e64 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -24,7 +24,7 @@ On 6/18/2013 5:35 PM, Suman Anna wrote: > dma-names = "tx", "rx"; > }; > -> + mailbox: mailbox@48094000 { +> + mailbox: mailbox at 48094000 { > + compatible = "ti,omap2-mailbox"; > + reg = <0x48094000 0x200>; > + interrupts = <26>, /* DSP Interrupt */ @@ -44,7 +44,7 @@ Benoit > + ti,mbox-data = <0 1 0 0>, <2 3 1 3>; > + }; > + -> timer1: timer@48028000 { +> timer1: timer at 48028000 { > compatible = "ti,omap2420-timer"; > reg = <0x48028000 0x400>; > diff --git a/arch/arm/boot/dts/omap2430.dtsi b/arch/arm/boot/dts/omap2430.dtsi @@ -55,7 +55,7 @@ Benoit > dma-names = "tx", "rx"; > }; > -> + mailbox: mailbox@48094000 { +> + mailbox: mailbox at 48094000 { > + compatible = "ti,omap2-mailbox"; > + reg = <0x48094000 0x200>; > + interrupts = <26>; @@ -67,7 +67,7 @@ Benoit > + ti,mbox-data = <0 1 0 0>; > + }; > + -> timer1: timer@49018000 { +> timer1: timer at 49018000 { > compatible = "ti,omap2420-timer"; > reg = <0x49018000 0x400>; > diff --git a/arch/arm/boot/dts/omap3.dtsi b/arch/arm/boot/dts/omap3.dtsi @@ -78,7 +78,7 @@ Benoit > dma-names = "tx", "rx"; > }; > -> + mailbox: mailbox@48094000 { +> + mailbox: mailbox at 48094000 { > + compatible = "ti,omap2-mailbox"; > + reg = <0x48094000 0x200>; > + interrupts = <26>; @@ -90,7 +90,7 @@ Benoit > + ti,mbox-data = <0 1 0 0>; > + }; > + -> timer1: timer@48318000 { +> timer1: timer at 48318000 { > compatible = "ti,omap3430-timer"; > reg = <0x48318000 0x400>; > diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi @@ -101,7 +101,7 @@ Benoit > }; > }; > -> + mailbox: mailbox@4a0f4000 { +> + mailbox: mailbox at 4a0f4000 { > + compatible = "ti,omap4-mailbox"; > + reg = <0x4a0f4000 0x200>; > + interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>; @@ -113,7 +113,7 @@ Benoit > + ti,mbox-data = <0 1 0 0>, <3 2 0 0>; > + }; > + -> timer1: timer@4a318000 { +> timer1: timer at 4a318000 { > compatible = "ti,omap3430-timer"; > reg = <0x4a318000 0x80>; > diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c diff --git a/a/content_digest b/N1/content_digest index a9e18ed..0e3997e 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,17 +1,8 @@ "ref\01371594900-37640-1-git-send-email-s-anna@ti.com\0" - "From\0Cousson, Benoit <b-cousson@ti.com>\0" - "Subject\0Re: [PATCH 3/3] ARM: dts: OMAP2+: Add mailbox nodes\0" + "From\0b-cousson@ti.com (Cousson, Benoit)\0" + "Subject\0[PATCH 3/3] ARM: dts: OMAP2+: Add mailbox nodes\0" "Date\0Thu, 20 Jun 2013 16:57:43 -0500\0" - "To\0Suman Anna <s-anna@ti.com>\0" - "Cc\0Tony Lindgren <tony@atomide.com>" - Paul Walmsley <paul@pwsan.com> - Ohad Ben-Cohen <ohad@wizery.com> - Omar Ramirez Luna <omar.ramirez@copitl.com> - Jassi Brar <jaswinder.singh@linaro.org> - Loic Pallardy <loic.pallardy@st.com> - linux-omap@vger.kernel.org - linux-arm-kernel@lists.infradead.org - " devicetree-discuss@lists.ozlabs.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On 6/18/2013 5:35 PM, Suman Anna wrote:\n" @@ -40,7 +31,7 @@ "> \t\t\tdma-names = \"tx\", \"rx\";\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\treg = <0x48094000 0x200>;\n" "> +\t\t\tinterrupts = <26>, /* DSP Interrupt */\n" @@ -60,7 +51,7 @@ "> +\t\t\tti,mbox-data = <0 1 0 0>, <2 3 1 3>;\n" "> +\t\t};\n" "> +\n" - "> \t\ttimer1: timer@48028000 {\n" + "> \t\ttimer1: timer at 48028000 {\n" "> \t\t\tcompatible = \"ti,omap2420-timer\";\n" "> \t\t\treg = <0x48028000 0x400>;\n" "> diff --git a/arch/arm/boot/dts/omap2430.dtsi b/arch/arm/boot/dts/omap2430.dtsi\n" @@ -71,7 +62,7 @@ "> \t\t\tdma-names = \"tx\", \"rx\";\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\treg = <0x48094000 0x200>;\n" "> +\t\t\tinterrupts = <26>;\n" @@ -83,7 +74,7 @@ "> +\t\t\tti,mbox-data = <0 1 0 0>;\n" "> +\t\t};\n" "> +\n" - "> \t\ttimer1: timer@49018000 {\n" + "> \t\ttimer1: timer at 49018000 {\n" "> \t\t\tcompatible = \"ti,omap2420-timer\";\n" "> \t\t\treg = <0x49018000 0x400>;\n" "> diff --git a/arch/arm/boot/dts/omap3.dtsi b/arch/arm/boot/dts/omap3.dtsi\n" @@ -94,7 +85,7 @@ "> \t\t\tdma-names = \"tx\", \"rx\";\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\treg = <0x48094000 0x200>;\n" "> +\t\t\tinterrupts = <26>;\n" @@ -106,7 +97,7 @@ "> +\t\t\tti,mbox-data = <0 1 0 0>;\n" "> +\t\t};\n" "> +\n" - "> \t\ttimer1: timer@48318000 {\n" + "> \t\ttimer1: timer at 48318000 {\n" "> \t\t\tcompatible = \"ti,omap3430-timer\";\n" "> \t\t\treg = <0x48318000 0x400>;\n" "> diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi\n" @@ -117,7 +108,7 @@ "> \t\t\t};\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\treg = <0x4a0f4000 0x200>;\n" "> +\t\t\tinterrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>;\n" @@ -129,7 +120,7 @@ "> +\t\t\tti,mbox-data = <0 1 0 0>, <3 2 0 0>;\n" "> +\t\t};\n" "> +\n" - "> \t\ttimer1: timer@4a318000 {\n" + "> \t\ttimer1: timer at 4a318000 {\n" "> \t\t\tcompatible = \"ti,omap3430-timer\";\n" "> \t\t\treg = <0x4a318000 0x80>;\n" "> diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c\n" @@ -151,4 +142,4 @@ "> \t\tomap_init_sham();\n" > -57eb6304ce0ccb5b09a0679945bf5b74fbf7383d56c8879fc5efde389888dc18 +f6f5037aed4c72689fb4489d8789c99b29704362e007fed699118feb215c60a2
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.