diff for duplicates of <530E4D27.4010205@ti.com> diff --git a/a/1.txt b/N1/1.txt index b2acb59..9ffefde 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -6,16 +6,16 @@ Hi Laurent, >>> On Tuesday 25 February 2014 17:02:35 Suman Anna wrote: >>>> On 02/25/2014 03:26 PM, Laurent Pinchart wrote: >>>>> On Thursday 13 February 2014 12:15:34 Suman Anna wrote: ->>>>>> From: Florian Vaussard <florian.vaussard-p8DiymsW2f8@public.gmane.org> +>>>>>> From: Florian Vaussard <florian.vaussard@epfl.ch> >>>>>> >>>>>> This patch adds the iommu bindings for all OMAP2+ SoCs. Apart from >>>>>> the standard bindings used by OMAP peripherals, this patch uses a >>>>>> 'dma-window' (already used by Tegra SMMU) and adds two OMAP custom >>>>>> bindings - 'ti,#tlb-entries' and 'ti,iommu-bus-err-back'. >>>>>> ->>>>>> Signed-off-by: Florian Vaussard <florian.vaussard-p8DiymsW2f8@public.gmane.org> ->>>>>> [s-anna-l0cyMroinI0@public.gmane.org: split bindings document, add dra7 and bus error back] ->>>>>> 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: split bindings document, add dra7 and bus error back] +>>>>>> Signed-off-by: Suman Anna <s-anna@ti.com> >>>>>> --- >>>>>> >>>>>> .../devicetree/bindings/iommu/ti,omap-iommu.txt | 28 ++++++++++++++ @@ -113,7 +113,7 @@ Suman >> >>>>>> +Example: >>>>>> + /* OMAP3 ISP MMU */ ->>>>>> + mmu_isp: mmu@480bd400 { +>>>>>> + mmu_isp: mmu at 480bd400 { >>>>>> + compatible = "ti,omap2-iommu"; >>>>>> + reg = <0x480bd400 0x80>; >>>>>> + interrupts = <24>; diff --git a/a/content_digest b/N1/content_digest index 908e8bc..34c2d0e 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,19 +2,10 @@ "ref\01552997.8jd4jgn3Ze@avalon\0" "ref\0530E1E20.9000301@ti.com\0" "ref\08258385.uITvkIdEvn@avalon\0" - "From\0Suman Anna <s-anna-l0cyMroinI0@public.gmane.org>\0" - "Subject\0Re: [PATCHv2 03/16] Documentation: dt: add OMAP iommu bindings\0" + "From\0s-anna@ti.com (Suman Anna)\0" + "Subject\0[PATCHv2 03/16] Documentation: dt: add OMAP iommu bindings\0" "Date\0Wed, 26 Feb 2014 14:23:03 -0600\0" - "To\0Laurent Pinchart <laurent.pinchart-ryLnwIuWjnjg/C1BVhZhaw@public.gmane.org>\0" - "Cc\0Mark Rutland <mark.rutland-5wv7dgnIgG8@public.gmane.org>" - devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - Tony Lindgren <tony-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org> - iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org - Rob Herring <robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> - linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org - Kumar Gala <galak-sgV2jX0FEOL9JmXXK+q4OQ@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" @@ -25,16 +16,16 @@ ">>> On Tuesday 25 February 2014 17:02:35 Suman Anna wrote:\n" ">>>> On 02/25/2014 03:26 PM, Laurent Pinchart wrote:\n" ">>>>> On Thursday 13 February 2014 12:15:34 Suman Anna wrote:\n" - ">>>>>> From: Florian Vaussard <florian.vaussard-p8DiymsW2f8@public.gmane.org>\n" + ">>>>>> From: Florian Vaussard <florian.vaussard@epfl.ch>\n" ">>>>>>\n" ">>>>>> This patch adds the iommu bindings for all OMAP2+ SoCs. Apart from\n" ">>>>>> the standard bindings used by OMAP peripherals, this patch uses a\n" ">>>>>> 'dma-window' (already used by Tegra SMMU) and adds two OMAP custom\n" ">>>>>> bindings - 'ti,#tlb-entries' and 'ti,iommu-bus-err-back'.\n" ">>>>>>\n" - ">>>>>> Signed-off-by: Florian Vaussard <florian.vaussard-p8DiymsW2f8@public.gmane.org>\n" - ">>>>>> [s-anna-l0cyMroinI0@public.gmane.org: split bindings document, add dra7 and bus error back]\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: split bindings document, add dra7 and bus error back]\n" + ">>>>>> Signed-off-by: Suman Anna <s-anna@ti.com>\n" ">>>>>> ---\n" ">>>>>>\n" ">>>>>> .../devicetree/bindings/iommu/ti,omap-iommu.txt | 28 ++++++++++++++\n" @@ -132,7 +123,7 @@ ">>\n" ">>>>>> +Example:\n" ">>>>>> +\t/* OMAP3 ISP MMU */\n" - ">>>>>> +\tmmu_isp: mmu@480bd400 {\n" + ">>>>>> +\tmmu_isp: mmu at 480bd400 {\n" ">>>>>> +\t\tcompatible = \"ti,omap2-iommu\";\n" ">>>>>> +\t\treg = <0x480bd400 0x80>;\n" ">>>>>> +\t\tinterrupts = <24>;\n" @@ -142,4 +133,4 @@ ">>>>>> +\t};\n" > -aca264cf65613eed478f718b0f43f0ed1e7a74046fdf7c6d175cc006b2c1738c +986dbd3cba1e315e0b80f0e8520ec53418cef10ddaee74f45f47466d79128101
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.