diff for duplicates of <20150310172036.GG31849@leverpostej> diff --git a/a/1.txt b/N1/1.txt index 063804f..92f80a1 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -5,7 +5,7 @@ On Tue, Mar 10, 2015 at 05:10:54PM +0000, Feng Kan wrote: > is based on the APM X-Gene Shadowcat SoC. This DTS enables PMU, > SATA and Serial. > -> Signed-off-by: Feng Kan <fkan@apm.com> +> Signed-off-by: Feng Kan <fkan-qTEPVZfXA3Y@public.gmane.org> > --- > arch/arm64/boot/dts/apm/apm-merlin.dts | 39 ++++++++ > arch/arm64/boot/dts/apm/apm-shadowcat.dtsi | 154 +++++++++++++++++++++++++++++ @@ -22,7 +22,7 @@ On Tue, Mar 10, 2015 at 05:10:54PM +0000, Feng Kan wrote: [...] -> + cpu at 000 { +> + cpu@000 { > + device_type = "cpu"; > + compatible = "apm,strega", "arm,armv8"; > + reg = <0x0 0x000>; @@ -41,7 +41,7 @@ executing to poll it can't be accidentally clobbered. [...] -> + gic: interrupt-controller at 78090000 { +> + gic: interrupt-controller@78090000 { > + compatible = "arm,cortex-a15-gic"; > + #interrupt-cells = <3>; > + #address-cells = <2>; @@ -82,7 +82,7 @@ dts. [...] -> + serial0: serial at 10600000 { +> + serial0: serial@10600000 { > + device_type = "serial"; > + compatible = "ns16550"; > + reg = <0 0x10600000 0x0 0x1000>; @@ -97,3 +97,7 @@ this. Thanks, Mark. +-- +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 fd137d3..92b7aae 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,13 @@ "ref\01426007454-11848-1-git-send-email-fkan@apm.com\0" - "From\0mark.rutland@arm.com (Mark Rutland)\0" - "Subject\0[PATCH] arm64: dts: add APM Merlin Board device tree\0" + "ref\01426007454-11848-1-git-send-email-fkan-qTEPVZfXA3Y@public.gmane.org\0" + "From\0Mark Rutland <mark.rutland-5wv7dgnIgG8@public.gmane.org>\0" + "Subject\0Re: [PATCH] arm64: dts: add APM Merlin Board device tree\0" "Date\0Tue, 10 Mar 2015 17:20:36 +0000\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Feng Kan <fkan-qTEPVZfXA3Y@public.gmane.org>\0" + "Cc\0patches-qTEPVZfXA3Y@public.gmane.org <patches-qTEPVZfXA3Y@public.gmane.org>" + devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org <devicetree-u79uwXL29TY76Z2rM5mHXA@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>\0" "\00:1\0" "b\0" "Hi,\n" @@ -12,7 +17,7 @@ "> is based on the APM X-Gene Shadowcat SoC. This DTS enables PMU,\n" "> SATA and Serial.\n" "> \n" - "> Signed-off-by: Feng Kan <fkan@apm.com>\n" + "> Signed-off-by: Feng Kan <fkan-qTEPVZfXA3Y@public.gmane.org>\n" "> ---\n" "> arch/arm64/boot/dts/apm/apm-merlin.dts | 39 ++++++++\n" "> arch/arm64/boot/dts/apm/apm-shadowcat.dtsi | 154 +++++++++++++++++++++++++++++\n" @@ -29,7 +34,7 @@ "\n" "[...]\n" "\n" - "> +\t\tcpu at 000 {\n" + "> +\t\tcpu@000 {\n" "> +\t\t\tdevice_type = \"cpu\";\n" "> +\t\t\tcompatible = \"apm,strega\", \"arm,armv8\";\n" "> +\t\t\treg = <0x0 0x000>;\n" @@ -48,7 +53,7 @@ "\n" "[...]\n" "\n" - "> +\tgic: interrupt-controller at 78090000 {\n" + "> +\tgic: interrupt-controller@78090000 {\n" "> +\t\tcompatible = \"arm,cortex-a15-gic\";\n" "> +\t\t#interrupt-cells = <3>;\n" "> +\t\t#address-cells = <2>;\n" @@ -89,7 +94,7 @@ "\n" "[...]\n" "\n" - "> +\t\tserial0: serial at 10600000 {\n" + "> +\t\tserial0: serial@10600000 {\n" "> +\t\t\tdevice_type = \"serial\";\n" "> +\t\t\tcompatible = \"ns16550\";\n" "> +\t\t\treg = <0 0x10600000 0x0 0x1000>;\n" @@ -103,6 +108,10 @@ "this.\n" "\n" "Thanks,\n" - Mark. + "Mark.\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 -57974dd1f2312ff7b656e32b9be170f172e71b47c8cfd22b035c7b4aefb69978 +4155b1830e7a280edc1d71cec4fe13242d5287082dcaae42dd1f9be5ab1793d2
diff --git a/a/1.txt b/N2/1.txt index 063804f..dcf463d 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -22,7 +22,7 @@ On Tue, Mar 10, 2015 at 05:10:54PM +0000, Feng Kan wrote: [...] -> + cpu at 000 { +> + cpu@000 { > + device_type = "cpu"; > + compatible = "apm,strega", "arm,armv8"; > + reg = <0x0 0x000>; @@ -41,7 +41,7 @@ executing to poll it can't be accidentally clobbered. [...] -> + gic: interrupt-controller at 78090000 { +> + gic: interrupt-controller@78090000 { > + compatible = "arm,cortex-a15-gic"; > + #interrupt-cells = <3>; > + #address-cells = <2>; @@ -82,7 +82,7 @@ dts. [...] -> + serial0: serial at 10600000 { +> + serial0: serial@10600000 { > + device_type = "serial"; > + compatible = "ns16550"; > + reg = <0 0x10600000 0x0 0x1000>; diff --git a/a/content_digest b/N2/content_digest index fd137d3..e153ad3 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,8 +1,12 @@ "ref\01426007454-11848-1-git-send-email-fkan@apm.com\0" - "From\0mark.rutland@arm.com (Mark Rutland)\0" - "Subject\0[PATCH] arm64: dts: add APM Merlin Board device tree\0" + "From\0Mark Rutland <mark.rutland@arm.com>\0" + "Subject\0Re: [PATCH] arm64: dts: add APM Merlin Board device tree\0" "Date\0Tue, 10 Mar 2015 17:20:36 +0000\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Feng Kan <fkan@apm.com>\0" + "Cc\0patches@apm.com <patches@apm.com>" + devicetree@vger.kernel.org <devicetree@vger.kernel.org> + linux-arm-kernel@lists.infradead.org <linux-arm-kernel@lists.infradead.org> + " linux-kernel@vger.kernel.org <linux-kernel@vger.kernel.org>\0" "\00:1\0" "b\0" "Hi,\n" @@ -29,7 +33,7 @@ "\n" "[...]\n" "\n" - "> +\t\tcpu at 000 {\n" + "> +\t\tcpu@000 {\n" "> +\t\t\tdevice_type = \"cpu\";\n" "> +\t\t\tcompatible = \"apm,strega\", \"arm,armv8\";\n" "> +\t\t\treg = <0x0 0x000>;\n" @@ -48,7 +52,7 @@ "\n" "[...]\n" "\n" - "> +\tgic: interrupt-controller at 78090000 {\n" + "> +\tgic: interrupt-controller@78090000 {\n" "> +\t\tcompatible = \"arm,cortex-a15-gic\";\n" "> +\t\t#interrupt-cells = <3>;\n" "> +\t\t#address-cells = <2>;\n" @@ -89,7 +93,7 @@ "\n" "[...]\n" "\n" - "> +\t\tserial0: serial at 10600000 {\n" + "> +\t\tserial0: serial@10600000 {\n" "> +\t\t\tdevice_type = \"serial\";\n" "> +\t\t\tcompatible = \"ns16550\";\n" "> +\t\t\treg = <0 0x10600000 0x0 0x1000>;\n" @@ -105,4 +109,4 @@ "Thanks,\n" Mark. -57974dd1f2312ff7b656e32b9be170f172e71b47c8cfd22b035c7b4aefb69978 +6260c7f9baffddc4000fb8f98b1039469852d751d948eb6a21ffb05cc1e8d6c4
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.