diff for duplicates of <4021819.DsUjhG2Ihi@phil> diff --git a/a/1.txt b/N1/1.txt index 05c0d85..d12d3d0 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,8 +1,8 @@ Add dt-nodes for the sram on rk3066 and rk3188 including the reserved section needed for smp bringup. -Signed-off-by: Heiko Stuebner <heiko@sntech.de> -Tested-by: Ulrich Prinz <ulrich.prinz@googlemail.com> +Signed-off-by: Heiko Stuebner <heiko-4mtYJXux2i+zQB+pC5nmwQ@public.gmane.org> +Tested-by: Ulrich Prinz <ulrich.prinz-gM/Ye1E23mwN+BqQ9rBEUg@public.gmane.org> --- .../devicetree/bindings/arm/rockchip/smp-sram.txt | 30 ++++++++++++++++++++++ arch/arm/boot/dts/rk3066a.dtsi | 13 ++++++++++ @@ -34,14 +34,14 @@ index 0000000..d9416fb + +Example: + -+ sram: sram at 10080000 { ++ sram: sram@10080000 { + compatible = "mmio-sram"; + reg = <0x10080000 0x10000>; + #address-cells = <1>; + #size-cells = <1>; + ranges; + -+ smp-sram at 10080000 { ++ smp-sram@10080000 { + compatible = "rockchip,rk3066-smp-sram"; + reg = <0x10080000 0x50>; + }; @@ -54,20 +54,20 @@ index be5d2b0..37d0768 100644 clock-names = "timer", "pclk"; }; -+ sram: sram at 10080000 { ++ sram: sram@10080000 { + compatible = "mmio-sram"; + reg = <0x10080000 0x10000>; + #address-cells = <1>; + #size-cells = <1>; + ranges; + -+ smp-sram at 10080000 { ++ smp-sram@10080000 { + compatible = "rockchip,rk3066-smp-sram"; + reg = <0x10080000 0x50>; + }; + }; + - pinctrl at 20008000 { + pinctrl@20008000 { compatible = "rockchip,rk3066a-pinctrl"; reg = <0x20008000 0x150>; diff --git a/arch/arm/boot/dts/rk3188.dtsi b/arch/arm/boot/dts/rk3188.dtsi @@ -78,21 +78,27 @@ index 1a26b03..412f4d0 100644 interrupts = <GIC_PPI 13 0xf04>; }; -+ sram: sram at 10080000 { ++ sram: sram@10080000 { + compatible = "mmio-sram"; + reg = <0x10080000 0x8000>; + #address-cells = <1>; + #size-cells = <1>; + ranges; + -+ smp-sram at 10080000 { ++ smp-sram@10080000 { + compatible = "rockchip,rk3066-smp-sram"; + reg = <0x10080000 0x50>; + }; + }; + - pinctrl at 20008000 { + pinctrl@20008000 { compatible = "rockchip,rk3188-pinctrl"; reg = <0x20008000 0xa0>, -- 1.8.5.3 + + +-- +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 96969c1..98f7efb 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,15 +1,26 @@ "ref\021117503.1c6iOkvYSr@phil\0" - "From\0heiko@sntech.de (Heiko St\303\274bner)\0" + "From\0Heiko St\303\274bner <heiko-4mtYJXux2i+zQB+pC5nmwQ@public.gmane.org>\0" "Subject\0[PATCH v8 4/6] ARM: rockchip: add sram dt nodes and documentation\0" "Date\0Tue, 25 Feb 2014 12:47:42 +0100\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org <linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org>\0" + "Cc\0arm-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org" + Grant Likely <grant.likely-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> + Rob Herring <robherring2-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> + devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + Philipp Zabel <p.zabel-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> + linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + Greg Kroah-Hartman <gregkh-hQyY1W1yCW8ekmWlsbkhG0B+6BGkLq7r@public.gmane.org> + Pawel Moll <pawel.moll-5wv7dgnIgG8@public.gmane.org> + Mark Rutland <mark.rutland-5wv7dgnIgG8@public.gmane.org> + Stephen Warren <swarren-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org> + " Ian Campbell <ijc+devicetree-KcIKpvwj1kUDXYZnReoRVg@public.gmane.org>\0" "\00:1\0" "b\0" "Add dt-nodes for the sram on rk3066 and rk3188 including the reserved section\n" "needed for smp bringup.\n" "\n" - "Signed-off-by: Heiko Stuebner <heiko@sntech.de>\n" - "Tested-by: Ulrich Prinz <ulrich.prinz@googlemail.com>\n" + "Signed-off-by: Heiko Stuebner <heiko-4mtYJXux2i+zQB+pC5nmwQ@public.gmane.org>\n" + "Tested-by: Ulrich Prinz <ulrich.prinz-gM/Ye1E23mwN+BqQ9rBEUg@public.gmane.org>\n" "---\n" " .../devicetree/bindings/arm/rockchip/smp-sram.txt | 30 ++++++++++++++++++++++\n" " arch/arm/boot/dts/rk3066a.dtsi | 13 ++++++++++\n" @@ -41,14 +52,14 @@ "+\n" "+Example:\n" "+\n" - "+\tsram: sram at 10080000 {\n" + "+\tsram: sram@10080000 {\n" "+\t\tcompatible = \"mmio-sram\";\n" "+\t\treg = <0x10080000 0x10000>;\n" "+\t\t#address-cells = <1>;\n" "+\t\t#size-cells = <1>;\n" "+\t\tranges;\n" "+\n" - "+\t\tsmp-sram at 10080000 {\n" + "+\t\tsmp-sram@10080000 {\n" "+\t\t\tcompatible = \"rockchip,rk3066-smp-sram\";\n" "+\t\t\treg = <0x10080000 0x50>;\n" "+\t\t};\n" @@ -61,20 +72,20 @@ " \t\t\tclock-names = \"timer\", \"pclk\";\n" " \t\t};\n" " \n" - "+\t\tsram: sram at 10080000 {\n" + "+\t\tsram: sram@10080000 {\n" "+\t\t\tcompatible = \"mmio-sram\";\n" "+\t\t\treg = <0x10080000 0x10000>;\n" "+\t\t\t#address-cells = <1>;\n" "+\t\t\t#size-cells = <1>;\n" "+\t\t\tranges;\n" "+\n" - "+\t\t\tsmp-sram at 10080000 {\n" + "+\t\t\tsmp-sram@10080000 {\n" "+\t\t\t\tcompatible = \"rockchip,rk3066-smp-sram\";\n" "+\t\t\t\treg = <0x10080000 0x50>;\n" "+\t\t\t};\n" "+\t\t};\n" "+\n" - " \t\tpinctrl at 20008000 {\n" + " \t\tpinctrl@20008000 {\n" " \t\t\tcompatible = \"rockchip,rk3066a-pinctrl\";\n" " \t\t\treg = <0x20008000 0x150>;\n" "diff --git a/arch/arm/boot/dts/rk3188.dtsi b/arch/arm/boot/dts/rk3188.dtsi\n" @@ -85,23 +96,29 @@ " \t\t\tinterrupts = <GIC_PPI 13 0xf04>;\n" " \t\t};\n" " \n" - "+\t\tsram: sram at 10080000 {\n" + "+\t\tsram: sram@10080000 {\n" "+\t\t\tcompatible = \"mmio-sram\";\n" "+\t\t\treg = <0x10080000 0x8000>;\n" "+\t\t\t#address-cells = <1>;\n" "+\t\t\t#size-cells = <1>;\n" "+\t\t\tranges;\n" "+\n" - "+\t\t\tsmp-sram at 10080000 {\n" + "+\t\t\tsmp-sram@10080000 {\n" "+\t\t\t\tcompatible = \"rockchip,rk3066-smp-sram\";\n" "+\t\t\t\treg = <0x10080000 0x50>;\n" "+\t\t\t};\n" "+\t\t};\n" "+\n" - " \t\tpinctrl at 20008000 {\n" + " \t\tpinctrl@20008000 {\n" " \t\t\tcompatible = \"rockchip,rk3188-pinctrl\";\n" " \t\t\treg = <0x20008000 0xa0>,\n" "-- \n" - 1.8.5.3 + "1.8.5.3\n" + "\n" + "\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 -37076e75c88f3f9afdf4ab0b882642431f85156f98553d427e78235c82733b7d +c35d237c2bcef2f0823c151c710c891a31b81d1421597bc877c514ce39727fda
diff --git a/a/1.txt b/N2/1.txt index 05c0d85..ee72ccf 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -34,14 +34,14 @@ index 0000000..d9416fb + +Example: + -+ sram: sram at 10080000 { ++ sram: sram@10080000 { + compatible = "mmio-sram"; + reg = <0x10080000 0x10000>; + #address-cells = <1>; + #size-cells = <1>; + ranges; + -+ smp-sram at 10080000 { ++ smp-sram@10080000 { + compatible = "rockchip,rk3066-smp-sram"; + reg = <0x10080000 0x50>; + }; @@ -54,20 +54,20 @@ index be5d2b0..37d0768 100644 clock-names = "timer", "pclk"; }; -+ sram: sram at 10080000 { ++ sram: sram@10080000 { + compatible = "mmio-sram"; + reg = <0x10080000 0x10000>; + #address-cells = <1>; + #size-cells = <1>; + ranges; + -+ smp-sram at 10080000 { ++ smp-sram@10080000 { + compatible = "rockchip,rk3066-smp-sram"; + reg = <0x10080000 0x50>; + }; + }; + - pinctrl at 20008000 { + pinctrl@20008000 { compatible = "rockchip,rk3066a-pinctrl"; reg = <0x20008000 0x150>; diff --git a/arch/arm/boot/dts/rk3188.dtsi b/arch/arm/boot/dts/rk3188.dtsi @@ -78,20 +78,20 @@ index 1a26b03..412f4d0 100644 interrupts = <GIC_PPI 13 0xf04>; }; -+ sram: sram at 10080000 { ++ sram: sram@10080000 { + compatible = "mmio-sram"; + reg = <0x10080000 0x8000>; + #address-cells = <1>; + #size-cells = <1>; + ranges; + -+ smp-sram at 10080000 { ++ smp-sram@10080000 { + compatible = "rockchip,rk3066-smp-sram"; + reg = <0x10080000 0x50>; + }; + }; + - pinctrl at 20008000 { + pinctrl@20008000 { compatible = "rockchip,rk3188-pinctrl"; reg = <0x20008000 0xa0>, -- diff --git a/a/content_digest b/N2/content_digest index 96969c1..5e02902 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,8 +1,19 @@ "ref\021117503.1c6iOkvYSr@phil\0" - "From\0heiko@sntech.de (Heiko St\303\274bner)\0" + "From\0Heiko St\303\274bner <heiko@sntech.de>\0" "Subject\0[PATCH v8 4/6] ARM: rockchip: add sram dt nodes and documentation\0" "Date\0Tue, 25 Feb 2014 12:47:42 +0100\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0linux-arm-kernel@lists.infradead.org <linux-arm-kernel@lists.infradead.org>\0" + "Cc\0arm@kernel.org" + Grant Likely <grant.likely@linaro.org> + Rob Herring <robherring2@gmail.com> + devicetree@vger.kernel.org + Philipp Zabel <p.zabel@pengutronix.de> + linux-kernel@vger.kernel.org + Greg Kroah-Hartman <gregkh@linuxfoundation.org> + Pawel Moll <pawel.moll@arm.com> + Mark Rutland <mark.rutland@arm.com> + Stephen Warren <swarren@wwwdotorg.org> + " Ian Campbell <ijc+devicetree@hellion.org.uk>\0" "\00:1\0" "b\0" "Add dt-nodes for the sram on rk3066 and rk3188 including the reserved section\n" @@ -41,14 +52,14 @@ "+\n" "+Example:\n" "+\n" - "+\tsram: sram at 10080000 {\n" + "+\tsram: sram@10080000 {\n" "+\t\tcompatible = \"mmio-sram\";\n" "+\t\treg = <0x10080000 0x10000>;\n" "+\t\t#address-cells = <1>;\n" "+\t\t#size-cells = <1>;\n" "+\t\tranges;\n" "+\n" - "+\t\tsmp-sram at 10080000 {\n" + "+\t\tsmp-sram@10080000 {\n" "+\t\t\tcompatible = \"rockchip,rk3066-smp-sram\";\n" "+\t\t\treg = <0x10080000 0x50>;\n" "+\t\t};\n" @@ -61,20 +72,20 @@ " \t\t\tclock-names = \"timer\", \"pclk\";\n" " \t\t};\n" " \n" - "+\t\tsram: sram at 10080000 {\n" + "+\t\tsram: sram@10080000 {\n" "+\t\t\tcompatible = \"mmio-sram\";\n" "+\t\t\treg = <0x10080000 0x10000>;\n" "+\t\t\t#address-cells = <1>;\n" "+\t\t\t#size-cells = <1>;\n" "+\t\t\tranges;\n" "+\n" - "+\t\t\tsmp-sram at 10080000 {\n" + "+\t\t\tsmp-sram@10080000 {\n" "+\t\t\t\tcompatible = \"rockchip,rk3066-smp-sram\";\n" "+\t\t\t\treg = <0x10080000 0x50>;\n" "+\t\t\t};\n" "+\t\t};\n" "+\n" - " \t\tpinctrl at 20008000 {\n" + " \t\tpinctrl@20008000 {\n" " \t\t\tcompatible = \"rockchip,rk3066a-pinctrl\";\n" " \t\t\treg = <0x20008000 0x150>;\n" "diff --git a/arch/arm/boot/dts/rk3188.dtsi b/arch/arm/boot/dts/rk3188.dtsi\n" @@ -85,23 +96,23 @@ " \t\t\tinterrupts = <GIC_PPI 13 0xf04>;\n" " \t\t};\n" " \n" - "+\t\tsram: sram at 10080000 {\n" + "+\t\tsram: sram@10080000 {\n" "+\t\t\tcompatible = \"mmio-sram\";\n" "+\t\t\treg = <0x10080000 0x8000>;\n" "+\t\t\t#address-cells = <1>;\n" "+\t\t\t#size-cells = <1>;\n" "+\t\t\tranges;\n" "+\n" - "+\t\t\tsmp-sram at 10080000 {\n" + "+\t\t\tsmp-sram@10080000 {\n" "+\t\t\t\tcompatible = \"rockchip,rk3066-smp-sram\";\n" "+\t\t\t\treg = <0x10080000 0x50>;\n" "+\t\t\t};\n" "+\t\t};\n" "+\n" - " \t\tpinctrl at 20008000 {\n" + " \t\tpinctrl@20008000 {\n" " \t\t\tcompatible = \"rockchip,rk3188-pinctrl\";\n" " \t\t\treg = <0x20008000 0xa0>,\n" "-- \n" 1.8.5.3 -37076e75c88f3f9afdf4ab0b882642431f85156f98553d427e78235c82733b7d +3fd7323e0927e3850aab8ab4f97a7e5e109f76afa964d1a528a88a0e7aa0b2bd
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.