diff for duplicates of <52276079.5020101@baylibre.com> diff --git a/a/1.txt b/N1/1.txt index 3197a85..917e7c0 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -58,7 +58,7 @@ Benoit > reg = <0x48200000 0x1000>; > }; > -> + edma: dma-controller@49000000 { +> + edma: dma-controller at 49000000 { > + compatible = "ti,edma3"; > + ti,hwmods = "tpcc", "tptc0", "tptc1", "tptc2"; > + reg = <0x49000000 0x10000>, @@ -70,7 +70,7 @@ Benoit > + ti,edma-slots = <256>; > + }; > + -> gpio0: gpio@44e07000 { +> gpio0: gpio at 44e07000 { > compatible = "ti,omap4-gpio"; > ti,hwmods = "gpio1"; > diff --git a/a/content_digest b/N1/content_digest index a935e28..be8a5af 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,17 +1,10 @@ "ref\01377505784-9820-1-git-send-email-bigeasy@linutronix.de\0" "ref\0521B1380.3030908@baylibre.com\0" "ref\0522144AB.9010802@ti.com\0" - "From\0Benoit Cousson <bcousson@baylibre.com>\0" - "Subject\0Re: [PATCH v2] ARM: dts: add AM33XX EDMA support\0" + "From\0bcousson@baylibre.com (Benoit Cousson)\0" + "Subject\0[PATCH v2] ARM: dts: add AM33XX EDMA support\0" "Date\0Wed, 04 Sep 2013 18:31:53 +0200\0" - "To\0joelf@ti.com\0" - "Cc\0Sebastian Andrzej Siewior <bigeasy@linutronix.de>" - tony@atomide.com - santosh.shilimkar@ti.com - linux-omap@vger.kernel.org - devicetree@vger.kernel.org - linux-arm-kernel@lists.infradead.org - " linux-kernel@vger.kernel.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Hi Joel,\n" @@ -74,7 +67,7 @@ "> \t\t\treg = <0x48200000 0x1000>;\n" "> \t\t};\n" ">\n" - "> +\t\tedma: dma-controller@49000000 {\n" + "> +\t\tedma: dma-controller at 49000000 {\n" "> +\t\t\tcompatible = \"ti,edma3\";\n" "> +\t\t\tti,hwmods = \"tpcc\", \"tptc0\", \"tptc1\", \"tptc2\";\n" "> +\t\t\treg =\t<0x49000000 0x10000>,\n" @@ -86,9 +79,9 @@ "> +\t\t\tti,edma-slots = <256>;\n" "> +\t\t};\n" "> +\n" - "> \t\tgpio0: gpio@44e07000 {\n" + "> \t\tgpio0: gpio at 44e07000 {\n" "> \t\t\tcompatible = \"ti,omap4-gpio\";\n" "> \t\t\tti,hwmods = \"gpio1\";\n" > -80dfd7c421e27b262d3378d86d8dea523ae5a699c80e29660671f34b36e320dc +9915df94cf3ced8095274787575d19ed2f2d81033c1f1881e4fc3bb52d42f8a6
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.