diff for duplicates of <52D3CB18.8040608@koalo.de> diff --git a/a/1.txt b/N1/1.txt index dcd3742..3f06be8 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -2,7 +2,7 @@ This adds the definitions for the BCM2835 I2S driver to the device tree. Some GPIO settings are needed for the correct pin functions. -Signed-off-by: Florian Meier <florian.meier@koalo.de> +Signed-off-by: Florian Meier <florian.meier-oZ8rN/sblLk@public.gmane.org> --- Sorry, I forgot to disable word-wrap again.... @@ -50,7 +50,7 @@ index 1da6b36..ca2259c 100644 brcm,dma-channel-mask = <0x7f35>; }; + -+ bcm2835_i2s: i2s at 7e203000 { ++ bcm2835_i2s: i2s@7e203000 { + compatible = "brcm,bcm2835-i2s"; + reg = <0x7e203000 0x20>, + <0x7e101098 0x02>; @@ -64,3 +64,7 @@ index 1da6b36..ca2259c 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 77145bd..ae3eac6 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,15 +1,20 @@ "ref\052D3CA6E.1010803@koalo.de\0" - "From\0florian.meier@koalo.de (Florian Meier)\0" + "ref\052D3CA6E.1010803-oZ8rN/sblLk@public.gmane.org\0" + "From\0Florian Meier <florian.meier-oZ8rN/sblLk@public.gmane.org>\0" "Subject\0[PATCH 2/2] BCM2835: Add I2S driver to device tree\0" "Date\0Mon, 13 Jan 2014 12:16:40 +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 I2S driver\n" "to the device tree. Some GPIO settings are needed for\n" "the correct pin functions.\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" "\n" "Sorry, I forgot to disable word-wrap again....\n" @@ -57,7 +62,7 @@ " \t\t\tbrcm,dma-channel-mask = <0x7f35>;\n" " \t\t};\n" "+\n" - "+\t\tbcm2835_i2s: i2s at 7e203000 {\n" + "+\t\tbcm2835_i2s: i2s@7e203000 {\n" "+\t\t\tcompatible = \"brcm,bcm2835-i2s\";\n" "+\t\t\treg = <0x7e203000 0x20>,\n" "+\t\t\t <0x7e101098 0x02>;\n" @@ -70,6 +75,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 -c205f6f7786fca10029a54f6ac1c03693c92265eff96b7177cc977c93ec0a8ad +a379ec14de942931ae67b25848fa574af636b9298b89a920e2fa7220e9920dcb
diff --git a/a/1.txt b/N2/1.txt index dcd3742..e940ae6 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -50,7 +50,7 @@ index 1da6b36..ca2259c 100644 brcm,dma-channel-mask = <0x7f35>; }; + -+ bcm2835_i2s: i2s at 7e203000 { ++ bcm2835_i2s: i2s@7e203000 { + compatible = "brcm,bcm2835-i2s"; + reg = <0x7e203000 0x20>, + <0x7e101098 0x02>; diff --git a/a/content_digest b/N2/content_digest index 77145bd..bfcc979 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,8 +1,12 @@ "ref\052D3CA6E.1010803@koalo.de\0" - "From\0florian.meier@koalo.de (Florian Meier)\0" + "From\0Florian Meier <florian.meier@koalo.de>\0" "Subject\0[PATCH 2/2] BCM2835: Add I2S driver to device tree\0" "Date\0Mon, 13 Jan 2014 12:16:40 +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 I2S driver\n" @@ -57,7 +61,7 @@ " \t\t\tbrcm,dma-channel-mask = <0x7f35>;\n" " \t\t};\n" "+\n" - "+\t\tbcm2835_i2s: i2s at 7e203000 {\n" + "+\t\tbcm2835_i2s: i2s@7e203000 {\n" "+\t\t\tcompatible = \"brcm,bcm2835-i2s\";\n" "+\t\t\treg = <0x7e203000 0x20>,\n" "+\t\t\t <0x7e101098 0x02>;\n" @@ -72,4 +76,4 @@ "-- \n" 1.8.3.2 -c205f6f7786fca10029a54f6ac1c03693c92265eff96b7177cc977c93ec0a8ad +da5c8ba6609a821fc2cd80b837cc6dcd12add3bcb092e6e13612ce1a3bec5bbb
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.