diff for duplicates of <201306251048.08181.heiko@sntech.de> diff --git a/a/1.txt b/N1/1.txt index 8b5e585..76e0465 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -2,7 +2,7 @@ The Rockchip SoCs need a special part of their sram for bringup of additional cores. Therefore also add a reserved section when adding the mmio-sram node to keep the sram driver from using this space. -Signed-off-by: Heiko Stuebner <heiko@sntech.de> +Signed-off-by: Heiko Stuebner <heiko-4mtYJXux2i+zQB+pC5nmwQ@public.gmane.org> --- .../devicetree/bindings/arm/rockchip/smp-sram.txt | 23 ++++++++++++++++++++ arch/arm/boot/dts/rk3066a.dtsi | 6 +++++ @@ -33,7 +33,7 @@ index 0000000..80c878e + +Example: + -+ sram: sram at 10080000 { ++ sram: sram@10080000 { + compatible = "rockchip,rk3066-sram", "mmio-sram"; + reg = <0x10080000 0x10000>; + mmio-sram-reserved = <0x0 0x50>; @@ -46,13 +46,13 @@ index 26c4311..24d1941 100644 reg = <0x1013c000 0x100>; }; -+ sram: sram at 10080000 { ++ sram: sram@10080000 { + compatible = "rockchip,rk3066-sram", "mmio-sram"; + reg = <0x10080000 0x10000>; + mmio-sram-reserved = <0x0 0x50>; + }; + - gic: interrupt-controller at 1013d000 { + gic: interrupt-controller@1013d000 { compatible = "arm,cortex-a9-gic"; interrupt-controller; -- diff --git a/a/content_digest b/N1/content_digest index 62ef230..7d0f8ab 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,15 +1,23 @@ "ref\0201306251046.04873.heiko@sntech.de\0" - "From\0heiko@sntech.de (Heiko St\303\274bner)\0" + "ref\0201306251046.04873.heiko-4mtYJXux2i+zQB+pC5nmwQ@public.gmane.org\0" + "From\0Heiko St\303\274bner <heiko-4mtYJXux2i+zQB+pC5nmwQ@public.gmane.org>\0" "Subject\0[PATCH v2 4/6] ARM: rockchip: add sram dt nodes and documentation\0" "Date\0Tue, 25 Jun 2013 10:48:07 +0200\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Arnd Bergmann <arnd-r2nGTMty4D4@public.gmane.org>\0" + "Cc\0Russell King <linux-lFZ/pmaqli7XmaaqVzeoHQ@public.gmane.org>" + Greg Kroah-Hartman <gregkh-hQyY1W1yCW8ekmWlsbkhG0B+6BGkLq7r@public.gmane.org> + devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org + linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + Grant Likely <grant.likely-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> + Philipp Zabel <p.zabel-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> + " linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org <linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org>\0" "\00:1\0" "b\0" "The Rockchip SoCs need a special part of their sram for bringup\n" "of additional cores. Therefore also add a reserved section when adding the\n" "mmio-sram node to keep the sram driver from using this space.\n" "\n" - "Signed-off-by: Heiko Stuebner <heiko@sntech.de>\n" + "Signed-off-by: Heiko Stuebner <heiko-4mtYJXux2i+zQB+pC5nmwQ@public.gmane.org>\n" "---\n" " .../devicetree/bindings/arm/rockchip/smp-sram.txt | 23 ++++++++++++++++++++\n" " arch/arm/boot/dts/rk3066a.dtsi | 6 +++++\n" @@ -40,7 +48,7 @@ "+\n" "+Example:\n" "+\n" - "+\tsram: sram at 10080000 {\n" + "+\tsram: sram@10080000 {\n" "+\t\tcompatible = \"rockchip,rk3066-sram\", \"mmio-sram\";\n" "+\t\treg = <0x10080000 0x10000>;\n" "+\t\tmmio-sram-reserved = <0x0 0x50>;\n" @@ -53,16 +61,16 @@ " \t\t\treg = <0x1013c000 0x100>;\n" " \t\t};\n" " \n" - "+\t\tsram: sram at 10080000 {\n" + "+\t\tsram: sram@10080000 {\n" "+\t\t\tcompatible = \"rockchip,rk3066-sram\", \"mmio-sram\";\n" "+\t\t\treg = <0x10080000 0x10000>;\n" "+\t\t\tmmio-sram-reserved = <0x0 0x50>;\n" "+\t\t};\n" "+\n" - " \t\tgic: interrupt-controller at 1013d000 {\n" + " \t\tgic: interrupt-controller@1013d000 {\n" " \t\t\tcompatible = \"arm,cortex-a9-gic\";\n" " \t\t\tinterrupt-controller;\n" "-- \n" 1.7.10.4 -cb602ce0b8d20ca9ff86e2935fe406b4619e25cafc6ea6af3df8cab2dfdc2f7e +06a2c733b737a800ac98bae331db3fa5a1defaddca8ffbe704f0ffdbc03c1ce7
diff --git a/a/1.txt b/N2/1.txt index 8b5e585..094c200 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -33,7 +33,7 @@ index 0000000..80c878e + +Example: + -+ sram: sram at 10080000 { ++ sram: sram@10080000 { + compatible = "rockchip,rk3066-sram", "mmio-sram"; + reg = <0x10080000 0x10000>; + mmio-sram-reserved = <0x0 0x50>; @@ -46,13 +46,13 @@ index 26c4311..24d1941 100644 reg = <0x1013c000 0x100>; }; -+ sram: sram at 10080000 { ++ sram: sram@10080000 { + compatible = "rockchip,rk3066-sram", "mmio-sram"; + reg = <0x10080000 0x10000>; + mmio-sram-reserved = <0x0 0x50>; + }; + - gic: interrupt-controller at 1013d000 { + gic: interrupt-controller@1013d000 { compatible = "arm,cortex-a9-gic"; interrupt-controller; -- diff --git a/a/content_digest b/N2/content_digest index 62ef230..03c7c24 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,8 +1,17 @@ "ref\0201306251046.04873.heiko@sntech.de\0" - "From\0heiko@sntech.de (Heiko St\303\274bner)\0" + "From\0Heiko St\303\274bner <heiko@sntech.de>\0" "Subject\0[PATCH v2 4/6] ARM: rockchip: add sram dt nodes and documentation\0" "Date\0Tue, 25 Jun 2013 10:48:07 +0200\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Arnd Bergmann <arnd@arndb.de>\0" + "Cc\0Olof Johansson <olof@lixom.net>" + linux-arm-kernel@lists.infradead.org <linux-arm-kernel@lists.infradead.org> + Grant Likely <grant.likely@linaro.org> + Rob Herring <robherring2@gmail.com> + devicetree-discuss@lists.ozlabs.org + Russell King <linux@arm.linux.org.uk> + Philipp Zabel <p.zabel@pengutronix.de> + linux-kernel@vger.kernel.org + " Greg Kroah-Hartman <gregkh@linuxfoundation.org>\0" "\00:1\0" "b\0" "The Rockchip SoCs need a special part of their sram for bringup\n" @@ -40,7 +49,7 @@ "+\n" "+Example:\n" "+\n" - "+\tsram: sram at 10080000 {\n" + "+\tsram: sram@10080000 {\n" "+\t\tcompatible = \"rockchip,rk3066-sram\", \"mmio-sram\";\n" "+\t\treg = <0x10080000 0x10000>;\n" "+\t\tmmio-sram-reserved = <0x0 0x50>;\n" @@ -53,16 +62,16 @@ " \t\t\treg = <0x1013c000 0x100>;\n" " \t\t};\n" " \n" - "+\t\tsram: sram at 10080000 {\n" + "+\t\tsram: sram@10080000 {\n" "+\t\t\tcompatible = \"rockchip,rk3066-sram\", \"mmio-sram\";\n" "+\t\t\treg = <0x10080000 0x10000>;\n" "+\t\t\tmmio-sram-reserved = <0x0 0x50>;\n" "+\t\t};\n" "+\n" - " \t\tgic: interrupt-controller at 1013d000 {\n" + " \t\tgic: interrupt-controller@1013d000 {\n" " \t\t\tcompatible = \"arm,cortex-a9-gic\";\n" " \t\t\tinterrupt-controller;\n" "-- \n" 1.7.10.4 -cb602ce0b8d20ca9ff86e2935fe406b4619e25cafc6ea6af3df8cab2dfdc2f7e +5909738faa99351f640ea52e11b966960a199aaf34e16295660b9891bfc3ddaf
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.