diff for duplicates of <1386901645-28895-4-git-send-email-ynvich@gmail.com> diff --git a/a/1.txt b/N1/1.txt index e9b361b..956c088 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -29,7 +29,7 @@ index b7025de..9f54c69 100644 Optional properties: - marvell,detect-delay-ms: sets the detection delay timeout in ms. -@@ -21,5 +23,8 @@ mmc0: mmc@41100000 { +@@ -21,5 +23,8 @@ mmc0: mmc at 41100000 { interrupts = <23>; cd-gpios = <&gpio 23 0>; wp-gpios = <&gpio 24 0>; @@ -46,7 +46,7 @@ index 44df554..c2a90c5 100644 marvell,intc-nr-irqs = <34>; }; -+ dma: dma-controller@40000000 { ++ dma: dma-controller at 40000000 { + compatible = "marvell,pdma-1.0"; + reg = <0x40000000 0x10000>; + interrupts = <25>; @@ -54,13 +54,13 @@ index 44df554..c2a90c5 100644 + dma-channels = <32>; + }; + - gpio: gpio@40e00000 { + gpio: gpio at 40e00000 { compatible = "intel,pxa27x-gpio"; interrupts = <8>, <9>, <10>; interrupt-names = "gpio0", "gpio1", "gpio_mux"; }; + -+ mmc@41100000 { ++ mmc at 41100000 { + dmas = <&dma 21 + &dma 22>; + dma-names = "rx", "tx"; diff --git a/a/content_digest b/N1/content_digest index 7bf00df..03c7460 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,27 +1,9 @@ "ref\01386543229-1542-1-git-send-email-ynvich@gmail.com\0" "ref\01386901645-28895-1-git-send-email-ynvich@gmail.com\0" - "From\0Sergei Ianovich <ynvich@gmail.com>\0" + "From\0ynvich@gmail.com (Sergei Ianovich)\0" "Subject\0[PATCH v2 03/16] ARM: dts: provide DMA config to pxamci\0" "Date\0Fri, 13 Dec 2013 06:27:12 +0400\0" - "To\0linux-kernel@vger.kernel.org" - " linux-arm-kernel@lists.infradead.org\0" - "Cc\0Sergei Ianovich <ynvich@gmail.com>" - Daniel Mack <zonque@gmail.com> - Arnd Bergmann <arnd@arndb.de> - Rob Herring <rob.herring@calxeda.com> - Pawel Moll <pawel.moll@arm.com> - Mark Rutland <mark.rutland@arm.com> - Stephen Warren <swarren@wwwdotorg.org> - Ian Campbell <ijc+devicetree@hellion.org.uk> - Rob Landley <rob@landley.net> - Russell King <linux@arm.linux.org.uk> - Chris Ball <cjb@laptop.org> - Viresh Kumar <viresh.kumar@linaro.org> - Shawn Guo <shawn.guo@linaro.org> - Haojian Zhuang <haojian.zhuang@gmail.com> - open list:OPEN FIRMWARE AND... <devicetree@vger.kernel.org> - open list:DOCUMENTATION <linux-doc@vger.kernel.org> - " linux-mmc@vger.kernel.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Non-dts implementation supply required DMA channel numbers as\n" @@ -55,7 +37,7 @@ " \n" " Optional properties:\n" " - marvell,detect-delay-ms: sets the detection delay timeout in ms.\n" - "@@ -21,5 +23,8 @@ mmc0: mmc@41100000 {\n" + "@@ -21,5 +23,8 @@ mmc0: mmc at 41100000 {\n" " \tinterrupts = <23>;\n" " \tcd-gpios = <&gpio 23 0>;\n" " \twp-gpios = <&gpio 24 0>;\n" @@ -72,7 +54,7 @@ " \t\t\tmarvell,intc-nr-irqs = <34>;\n" " \t\t};\n" " \n" - "+\t\tdma: dma-controller@40000000 {\n" + "+\t\tdma: dma-controller at 40000000 {\n" "+\t\t\tcompatible = \"marvell,pdma-1.0\";\n" "+\t\t\treg = <0x40000000 0x10000>;\n" "+\t\t\tinterrupts = <25>;\n" @@ -80,13 +62,13 @@ "+\t\t\tdma-channels = <32>;\n" "+\t\t};\n" "+\n" - " \t\tgpio: gpio@40e00000 {\n" + " \t\tgpio: gpio at 40e00000 {\n" " \t\t\tcompatible = \"intel,pxa27x-gpio\";\n" " \t\t\tinterrupts = <8>, <9>, <10>;\n" " \t\t\tinterrupt-names = \"gpio0\", \"gpio1\", \"gpio_mux\";\n" " \t\t};\n" "+\n" - "+\t\tmmc@41100000 {\n" + "+\t\tmmc at 41100000 {\n" "+\t\t\tdmas = <&dma 21\n" "+\t\t\t\t&dma 22>;\n" "+\t\t\tdma-names = \"rx\", \"tx\";\n" @@ -180,4 +162,4 @@ "-- \n" 1.8.4.3 -2ceafed190b06e2aa5711c38658fb75a51228c9a932291aed3d653340f9a0709 +50ffb41e950cb74d3e4b4e4797f28d987891e47060d05ab0cc535ec807b5ea97
diff --git a/a/content_digest b/N2/content_digest index 7bf00df..95d1dff 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -19,8 +19,8 @@ Viresh Kumar <viresh.kumar@linaro.org> Shawn Guo <shawn.guo@linaro.org> Haojian Zhuang <haojian.zhuang@gmail.com> - open list:OPEN FIRMWARE AND... <devicetree@vger.kernel.org> - open list:DOCUMENTATION <linux-doc@vger.kernel.org> + devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND...) + linux-doc@vger.kernel.org (open list:DOCUMENTATION) " linux-mmc@vger.kernel.org\0" "\00:1\0" "b\0" @@ -180,4 +180,4 @@ "-- \n" 1.8.4.3 -2ceafed190b06e2aa5711c38658fb75a51228c9a932291aed3d653340f9a0709 +29347f4a7b3a58a1904c5b9d99c3d00a482c19848dd8980951d6a9baded2b18a
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.