diff for duplicates of <530E657A.4080600@ti.com> diff --git a/a/1.txt b/N1/1.txt index 98ad3ad..044066f 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -6,7 +6,7 @@ On 02/26/2014 03:05 PM, Laurent Pinchart wrote: > Thank you for the patch. > > On Thursday 13 February 2014 12:22:55 Suman Anna wrote: ->> From: Florian Vaussard <florian.vaussard-p8DiymsW2f8@public.gmane.org> +>> From: Florian Vaussard <florian.vaussard@epfl.ch> >> >> Add the IOMMU nodes for the DSP and IPU subsystems. The external >> address space for DSP starts at 0x20000000 in OMAP4 compared to @@ -15,9 +15,9 @@ On 02/26/2014 03:05 PM, Laurent Pinchart wrote: >> The MMU within the IPU sub-system also supports a bus error back >> capability, not available on the DSP MMU. >> ->> Signed-off-by: Florian Vaussard <florian.vaussard-p8DiymsW2f8@public.gmane.org> ->> [s-anna-l0cyMroinI0@public.gmane.org: dma-window updates and bus error back addition] ->> Signed-off-by: Suman Anna <s-anna-l0cyMroinI0@public.gmane.org> +>> Signed-off-by: Florian Vaussard <florian.vaussard@epfl.ch> +>> [s-anna at ti.com: dma-window updates and bus error back addition] +>> Signed-off-by: Suman Anna <s-anna@ti.com> >> --- >> arch/arm/boot/dts/omap4.dtsi | 17 +++++++++++++++++ >> 1 file changed, 17 insertions(+) @@ -30,7 +30,7 @@ On 02/26/2014 03:05 PM, Laurent Pinchart wrote: >> dma-names = "tx", "rx"; >> }; >> ->> + mmu_dsp: mmu@4a066000 { +>> + mmu_dsp: mmu at 4a066000 { >> + compatible = "ti,omap4-iommu"; >> + reg = <0x4a066000 0xff>; >> + interrupts = <GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH>; @@ -38,7 +38,7 @@ On 02/26/2014 03:05 PM, Laurent Pinchart wrote: >> + dma-window = <0x20000000 0xdffff000>; >> + }; >> + ->> + mmu_ipu: mmu@55082000 { +>> + mmu_ipu: mmu at 55082000 { >> + compatible = "ti,omap4-iommu"; >> + reg = <0x55082000 0xff>; >> + interrupts = <GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>; @@ -67,7 +67,7 @@ Suman >> + ti,iommu-bus-err-back; >> + }; >> + ->> wdt2: wdt@4a314000 { +>> wdt2: wdt at 4a314000 { >> compatible = "ti,omap4-wdt", "ti,omap3-wdt"; >> reg = <0x4a314000 0x80>; > diff --git a/a/content_digest b/N1/content_digest index a2f16b8..71ceee5 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,17 +1,10 @@ "ref\01392315776-33197-1-git-send-email-s-anna@ti.com\0" "ref\01392315776-33197-4-git-send-email-s-anna@ti.com\0" "ref\05025565.C2g8cq3k2V@avalon\0" - "From\0Suman Anna <s-anna-l0cyMroinI0@public.gmane.org>\0" - "Subject\0Re: [PATCH 3/4] ARM: dts: OMAP4: Add IOMMU nodes\0" + "From\0s-anna@ti.com (Suman Anna)\0" + "Subject\0[PATCH 3/4] ARM: dts: OMAP4: Add IOMMU nodes\0" "Date\0Wed, 26 Feb 2014 16:06:50 -0600\0" - "To\0Laurent Pinchart <laurent.pinchart-ryLnwIuWjnjg/C1BVhZhaw@public.gmane.org>\0" - "Cc\0devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org" - Tony Lindgren <tony-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org> - iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org - linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org - Benoit Cousson <bcousson-rdvid1DuHRBWk0Htik3J/w@public.gmane.org> - linux-omap-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - " Florian Vaussard <florian.vaussard-p8DiymsW2f8@public.gmane.org>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Hi Laurent,\n" @@ -22,7 +15,7 @@ "> Thank you for the patch.\n" ">\n" "> On Thursday 13 February 2014 12:22:55 Suman Anna wrote:\n" - ">> From: Florian Vaussard <florian.vaussard-p8DiymsW2f8@public.gmane.org>\n" + ">> From: Florian Vaussard <florian.vaussard@epfl.ch>\n" ">>\n" ">> Add the IOMMU nodes for the DSP and IPU subsystems. The external\n" ">> address space for DSP starts at 0x20000000 in OMAP4 compared to\n" @@ -31,9 +24,9 @@ ">> The MMU within the IPU sub-system also supports a bus error back\n" ">> capability, not available on the DSP MMU.\n" ">>\n" - ">> Signed-off-by: Florian Vaussard <florian.vaussard-p8DiymsW2f8@public.gmane.org>\n" - ">> [s-anna-l0cyMroinI0@public.gmane.org: dma-window updates and bus error back addition]\n" - ">> Signed-off-by: Suman Anna <s-anna-l0cyMroinI0@public.gmane.org>\n" + ">> Signed-off-by: Florian Vaussard <florian.vaussard@epfl.ch>\n" + ">> [s-anna at ti.com: dma-window updates and bus error back addition]\n" + ">> Signed-off-by: Suman Anna <s-anna@ti.com>\n" ">> ---\n" ">> arch/arm/boot/dts/omap4.dtsi | 17 +++++++++++++++++\n" ">> 1 file changed, 17 insertions(+)\n" @@ -46,7 +39,7 @@ ">> \t\t\tdma-names = \"tx\", \"rx\";\n" ">> \t\t};\n" ">>\n" - ">> +\t\tmmu_dsp: mmu@4a066000 {\n" + ">> +\t\tmmu_dsp: mmu at 4a066000 {\n" ">> +\t\t\tcompatible = \"ti,omap4-iommu\";\n" ">> +\t\t\treg = <0x4a066000 0xff>;\n" ">> +\t\t\tinterrupts = <GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH>;\n" @@ -54,7 +47,7 @@ ">> +\t\t\tdma-window = <0x20000000 0xdffff000>;\n" ">> +\t\t};\n" ">> +\n" - ">> +\t\tmmu_ipu: mmu@55082000 {\n" + ">> +\t\tmmu_ipu: mmu at 55082000 {\n" ">> +\t\t\tcompatible = \"ti,omap4-iommu\";\n" ">> +\t\t\treg = <0x55082000 0xff>;\n" ">> +\t\t\tinterrupts = <GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>;\n" @@ -83,9 +76,9 @@ ">> +\t\t\tti,iommu-bus-err-back;\n" ">> +\t\t};\n" ">> +\n" - ">> \t\twdt2: wdt@4a314000 {\n" + ">> \t\twdt2: wdt at 4a314000 {\n" ">> \t\t\tcompatible = \"ti,omap4-wdt\", \"ti,omap3-wdt\";\n" ">> \t\t\treg = <0x4a314000 0x80>;\n" > -14f9f1015f464e78e744daea6e7275673e3a49245d33384c97d893b95c69ed87 +1a68559656b813efb169ef210f907b4b36c67c853e939e05c46e59321e7b8e03
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.