diff for duplicates of <52D3C9EF.1030901@koalo.de> diff --git a/a/1.txt b/N1/1.txt index 722b1c5..532930b 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -2,7 +2,7 @@ This adds the definitions for the BCM2835 dmaengine driver to the device tree. The dma-channel-mask is currently fixed. Later it should be set via the firmware. -Signed-off-by: Florian Meier <florian.meier@koalo.de> +Signed-off-by: Florian Meier <florian.meier-oZ8rN/sblLk@public.gmane.org> --- arch/arm/boot/dts/bcm2835.dtsi | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) @@ -16,7 +16,7 @@ index b021c96..1da6b36 100644 interrupts = <1 9>; }; + -+ dma: dma at 7e007000 { ++ dma: dma@7e007000 { + compatible = "brcm,bcm2835-dma"; + reg = <0x7e007000 0xf00>; + interrupts = <1 16>, @@ -41,3 +41,7 @@ index b021c96..1da6b36 100644 clocks { -- 1.8.3.2 +-- +To unsubscribe from this list: send the line "unsubscribe devicetree" in +the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/a/content_digest b/N1/content_digest index 6a0b619..e1322c4 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,14 +1,18 @@ - "From\0florian.meier@koalo.de (Florian Meier)\0" + "From\0Florian Meier <florian.meier-oZ8rN/sblLk@public.gmane.org>\0" "Subject\0[PATCH 1/2] BCM2835: Add dmaengine driver to device tree\0" "Date\0Mon, 13 Jan 2014 12:11:43 +0100\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Stephen Warren <swarren-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org>\0" + "Cc\0linux-rpi-kernel <linux-rpi-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org>" + linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org <linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org> + linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org <linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> + " devicetree <devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>\0" "\00:1\0" "b\0" "This adds the definitions for the BCM2835 dmaengine driver\n" "to the device tree. The dma-channel-mask is currently\n" "fixed. Later it should be set via the firmware.\n" "\n" - "Signed-off-by: Florian Meier <florian.meier@koalo.de>\n" + "Signed-off-by: Florian Meier <florian.meier-oZ8rN/sblLk@public.gmane.org>\n" "---\n" " arch/arm/boot/dts/bcm2835.dtsi | 21 +++++++++++++++++++++\n" " 1 file changed, 21 insertions(+)\n" @@ -22,7 +26,7 @@ " \t\t\tinterrupts = <1 9>;\n" " \t\t};\n" "+\n" - "+\t\tdma: dma at 7e007000 {\n" + "+\t\tdma: dma@7e007000 {\n" "+\t\t\tcompatible = \"brcm,bcm2835-dma\";\n" "+\t\t\treg = <0x7e007000 0xf00>;\n" "+\t\t\tinterrupts = <1 16>,\n" @@ -46,6 +50,10 @@ " \n" " \tclocks {\n" "-- \n" - 1.8.3.2 + "1.8.3.2\n" + "--\n" + "To unsubscribe from this list: send the line \"unsubscribe devicetree\" in\n" + "the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\n" + More majordomo info at http://vger.kernel.org/majordomo-info.html -f7f4127cbd0c55d29b00de5ec6ed6c141297e7e14ce863e063e7c4a64aa07fb0 +a521993ea2ad6414b287d61acca35b498f1a3e876abbbafed245d8351d168c76
diff --git a/a/1.txt b/N2/1.txt index 722b1c5..83ec54f 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -16,7 +16,7 @@ index b021c96..1da6b36 100644 interrupts = <1 9>; }; + -+ dma: dma at 7e007000 { ++ dma: dma@7e007000 { + compatible = "brcm,bcm2835-dma"; + reg = <0x7e007000 0xf00>; + interrupts = <1 16>, diff --git a/a/content_digest b/N2/content_digest index 6a0b619..2e26df9 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,7 +1,11 @@ - "From\0florian.meier@koalo.de (Florian Meier)\0" + "From\0Florian Meier <florian.meier@koalo.de>\0" "Subject\0[PATCH 1/2] BCM2835: Add dmaengine driver to device tree\0" "Date\0Mon, 13 Jan 2014 12:11:43 +0100\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Stephen Warren <swarren@wwwdotorg.org>\0" + "Cc\0linux-rpi-kernel <linux-rpi-kernel@lists.infradead.org>" + linux-arm-kernel@lists.infradead.org <linux-arm-kernel@lists.infradead.org> + linux-kernel@vger.kernel.org <linux-kernel@vger.kernel.org> + " devicetree <devicetree@vger.kernel.org>\0" "\00:1\0" "b\0" "This adds the definitions for the BCM2835 dmaengine driver\n" @@ -22,7 +26,7 @@ " \t\t\tinterrupts = <1 9>;\n" " \t\t};\n" "+\n" - "+\t\tdma: dma at 7e007000 {\n" + "+\t\tdma: dma@7e007000 {\n" "+\t\t\tcompatible = \"brcm,bcm2835-dma\";\n" "+\t\t\treg = <0x7e007000 0xf00>;\n" "+\t\t\tinterrupts = <1 16>,\n" @@ -48,4 +52,4 @@ "-- \n" 1.8.3.2 -f7f4127cbd0c55d29b00de5ec6ed6c141297e7e14ce863e063e7c4a64aa07fb0 +189909260c9cb2568db1f63c42ae9467b847d0a70b72405742d54541198ee8dd
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.