diff for duplicates of <20180110210453.19264-7-stefan@agner.ch> diff --git a/a/1.txt b/N1/1.txt index 522e246..6699f22 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,9 +1,9 @@ In i.MX 6ULL UART8 is part of the AIPS-3 memory map instead of AIPS-1. Clocks and interrupts remain the same. -Signed-off-by: Stefan Agner <stefan@agner.ch> -Reviewed-by: Rob Herring <robh@kernel.org> -Acked-by: Dong Aisheng <aisheng.dong@nxp.com> +Signed-off-by: Stefan Agner <stefan-XLVq0VzYD2Y@public.gmane.org> +Reviewed-by: Rob Herring <robh-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> +Acked-by: Dong Aisheng <aisheng.dong-3arQi8VN3Tc@public.gmane.org> --- arch/arm/boot/dts/imx6ull.dtsi | 14 ++++++++++++++ 1 file changed, 14 insertions(+) @@ -21,13 +21,13 @@ index bc2cd4fb8b12..571ddd71cdba 100644 + / { soc { - aips3: aips-bus at 2200000 { + aips3: aips-bus@2200000 { @@ -56,6 +59,17 @@ compatible = "fsl,imx6ull-iomuxc-snvs"; reg = <0x02290000 0x4000>; }; + -+ uart8: serial at 2288000 { ++ uart8: serial@2288000 { + compatible = "fsl,imx6ul-uart", + "fsl,imx6q-uart"; + reg = <0x02288000 0x4000>; @@ -42,3 +42,8 @@ index bc2cd4fb8b12..571ddd71cdba 100644 }; -- 2.15.1 + +-- +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 89e23b4..667cbdf 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,16 +1,25 @@ "ref\020180110210453.19264-1-stefan@agner.ch\0" - "From\0stefan@agner.ch (Stefan Agner)\0" + "ref\020180110210453.19264-1-stefan-XLVq0VzYD2Y@public.gmane.org\0" + "From\0Stefan Agner <stefan-XLVq0VzYD2Y@public.gmane.org>\0" "Subject\0[PATCH v2 7/7] ARM: dts: imx6ull: add UART8 support\0" "Date\0Wed, 10 Jan 2018 22:04:53 +0100\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0shawnguo-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org" + " kernel-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org\0" + "Cc\0fabio.estevam-3arQi8VN3Tc@public.gmane.org" + robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org + mark.rutland-5wv7dgnIgG8@public.gmane.org + linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org + devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + " Stefan Agner <stefan-XLVq0VzYD2Y@public.gmane.org>\0" "\00:1\0" "b\0" "In i.MX 6ULL UART8 is part of the AIPS-3 memory map instead of\n" "AIPS-1. Clocks and interrupts remain the same.\n" "\n" - "Signed-off-by: Stefan Agner <stefan@agner.ch>\n" - "Reviewed-by: Rob Herring <robh@kernel.org>\n" - "Acked-by: Dong Aisheng <aisheng.dong@nxp.com>\n" + "Signed-off-by: Stefan Agner <stefan-XLVq0VzYD2Y@public.gmane.org>\n" + "Reviewed-by: Rob Herring <robh-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>\n" + "Acked-by: Dong Aisheng <aisheng.dong-3arQi8VN3Tc@public.gmane.org>\n" "---\n" " arch/arm/boot/dts/imx6ull.dtsi | 14 ++++++++++++++\n" " 1 file changed, 14 insertions(+)\n" @@ -28,13 +37,13 @@ "+\n" " / {\n" " \tsoc {\n" - " \t\taips3: aips-bus at 2200000 {\n" + " \t\taips3: aips-bus@2200000 {\n" "@@ -56,6 +59,17 @@\n" " \t\t\t\tcompatible = \"fsl,imx6ull-iomuxc-snvs\";\n" " \t\t\t\treg = <0x02290000 0x4000>;\n" " \t\t\t};\n" "+\n" - "+\t\t\tuart8: serial at 2288000 {\n" + "+\t\t\tuart8: serial@2288000 {\n" "+\t\t\t\tcompatible = \"fsl,imx6ul-uart\",\n" "+\t\t\t\t\t \"fsl,imx6q-uart\";\n" "+\t\t\t\treg = <0x02288000 0x4000>;\n" @@ -48,6 +57,11 @@ " \t};\n" " };\n" "-- \n" - 2.15.1 + "2.15.1\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 -846d0aadd3898af60ffbc79845fd7dd9064b425e597edfc52c467cd0649a1845 +4d3b86a3c6cc84ab7a12778f7ebba5d43605f171ae0af43ccd93fecf6f3461a4
diff --git a/a/1.txt b/N2/1.txt index 522e246..2c2a36d 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -21,13 +21,13 @@ index bc2cd4fb8b12..571ddd71cdba 100644 + / { soc { - aips3: aips-bus at 2200000 { + aips3: aips-bus@2200000 { @@ -56,6 +59,17 @@ compatible = "fsl,imx6ull-iomuxc-snvs"; reg = <0x02290000 0x4000>; }; + -+ uart8: serial at 2288000 { ++ uart8: serial@2288000 { + compatible = "fsl,imx6ul-uart", + "fsl,imx6q-uart"; + reg = <0x02288000 0x4000>; diff --git a/a/content_digest b/N2/content_digest index 89e23b4..0d02a84 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,8 +1,16 @@ "ref\020180110210453.19264-1-stefan@agner.ch\0" - "From\0stefan@agner.ch (Stefan Agner)\0" + "From\0Stefan Agner <stefan@agner.ch>\0" "Subject\0[PATCH v2 7/7] ARM: dts: imx6ull: add UART8 support\0" "Date\0Wed, 10 Jan 2018 22:04:53 +0100\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0shawnguo@kernel.org" + " kernel@pengutronix.de\0" + "Cc\0fabio.estevam@nxp.com" + robh+dt@kernel.org + mark.rutland@arm.com + linux-arm-kernel@lists.infradead.org + devicetree@vger.kernel.org + linux-kernel@vger.kernel.org + " Stefan Agner <stefan@agner.ch>\0" "\00:1\0" "b\0" "In i.MX 6ULL UART8 is part of the AIPS-3 memory map instead of\n" @@ -28,13 +36,13 @@ "+\n" " / {\n" " \tsoc {\n" - " \t\taips3: aips-bus at 2200000 {\n" + " \t\taips3: aips-bus@2200000 {\n" "@@ -56,6 +59,17 @@\n" " \t\t\t\tcompatible = \"fsl,imx6ull-iomuxc-snvs\";\n" " \t\t\t\treg = <0x02290000 0x4000>;\n" " \t\t\t};\n" "+\n" - "+\t\t\tuart8: serial at 2288000 {\n" + "+\t\t\tuart8: serial@2288000 {\n" "+\t\t\t\tcompatible = \"fsl,imx6ul-uart\",\n" "+\t\t\t\t\t \"fsl,imx6q-uart\";\n" "+\t\t\t\treg = <0x02288000 0x4000>;\n" @@ -50,4 +58,4 @@ "-- \n" 2.15.1 -846d0aadd3898af60ffbc79845fd7dd9064b425e597edfc52c467cd0649a1845 +045ddae6fde0f734a2e4a902d377df60e839877f8d12df27c463e9274e403a2c
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.