diff for duplicates of <20150409151846.GR18048@atomide.com> diff --git a/a/1.txt b/N1/1.txt index b3ef2a5..c8899d5 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -25,7 +25,7 @@ Tony > dma-requests = <127>; > }; > -> + sdma_xbar: dma-router@4a002b78 { +> + sdma_xbar: dma-router at 4a002b78 { > + compatible = "ti,dra7-dma-crossbar"; > + reg = <0x4a002b78 0xfc>; > + #dma-cells = <1>; @@ -34,7 +34,7 @@ Tony > + dma-masters = <&sdma>; > + }; > + -> gpio1: gpio@4ae10000 { +> gpio1: gpio at 4ae10000 { > compatible = "ti,omap4-gpio"; > reg = <0x4ae10000 0x200>; > @@ -398,7 +407,7 @@ diff --git a/a/content_digest b/N1/content_digest index 9b57c9c..d1ebb2d 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,21 +1,9 @@ "ref\01428572154-3548-1-git-send-email-peter.ujfalusi@ti.com\0" "ref\01428572154-3548-9-git-send-email-peter.ujfalusi@ti.com\0" - "From\0Tony Lindgren <tony@atomide.com>\0" - "Subject\0Re: [PATCH v5 8/8] ARM: DTS: dra7x: Integrate sDMA crossbar\0" + "From\0tony@atomide.com (Tony Lindgren)\0" + "Subject\0[PATCH v5 8/8] ARM: DTS: dra7x: Integrate sDMA crossbar\0" "Date\0Thu, 9 Apr 2015 08:18:46 -0700\0" - "To\0Peter Ujfalusi <peter.ujfalusi@ti.com>\0" - "Cc\0vinod.koul@intel.com" - linux@arm.linux.org.uk - grant.likely@linaro.org - dmaengine@vger.kernel.org - linux-kernel@vger.kernel.org - devicetree@vger.kernel.org - linux-omap@vger.kernel.org - linux-arm-kernel@lists.infradead.org - robh+dt@kernel.org - nm@ti.com - arnd@arndb.de - " maxime.ripard@free-electrons.com\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "* Peter Ujfalusi <peter.ujfalusi@ti.com> [150409 02:37]:\n" @@ -45,7 +33,7 @@ "> \t\t\tdma-requests = <127>;\n" "> \t\t};\n" "> \n" - "> +\t\tsdma_xbar: dma-router@4a002b78 {\n" + "> +\t\tsdma_xbar: dma-router at 4a002b78 {\n" "> +\t\t\tcompatible = \"ti,dra7-dma-crossbar\";\n" "> +\t\t\treg = <0x4a002b78 0xfc>;\n" "> +\t\t\t#dma-cells = <1>;\n" @@ -54,7 +42,7 @@ "> +\t\t\tdma-masters = <&sdma>;\n" "> +\t\t};\n" "> +\n" - "> \t\tgpio1: gpio@4ae10000 {\n" + "> \t\tgpio1: gpio at 4ae10000 {\n" "> \t\t\tcompatible = \"ti,omap4-gpio\";\n" "> \t\t\treg = <0x4ae10000 0x200>;\n" "> @@ -398,7 +407,7 @@\n" @@ -207,4 +195,4 @@ "> 2.3.5\n" > -336db7e1ca670151c8a047ea5d6c71dd27d53ff1f060718aeac66b903453b145 +5c5e84eba696f7711a700c58bdcc44d5c883da9b98391b61f25065db7730389a
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.