diff for duplicates of <57BDB9F1.7020103@hisilicon.com> diff --git a/a/1.txt b/N1/1.txt index b67d8fe..bb5318f 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -11,8 +11,8 @@ On 22/08/2016 23:48, John Stultz wrote: > Cc: Mark Rutland <mark.rutland@arm.com> > Cc: Catalin Marinas <catalin.marinas@arm.com> > Cc: Will Deacon <will.deacon@arm.com> -> Cc: linux-arm-kernel at lists.infradead.org -> Cc: devicetree at vger.kernel.org +> Cc: linux-arm-kernel@lists.infradead.org +> Cc: devicetree@vger.kernel.org > Signed-off-by: Xinliang Liu <xinliang.liu@linaro.org> > Signed-off-by: John Stultz <john.stultz@linaro.org> > --- @@ -51,7 +51,7 @@ Wei > #clock-cells = <1>; > }; > -> + medianoc_ade: medianoc_ade at f4520000 { +> + medianoc_ade: medianoc_ade@f4520000 { > + compatible = "syscon"; > + reg = <0x0 0xf4520000 0x0 0x4000>; > + }; @@ -64,7 +64,7 @@ Wei > }; > }; > + -> + ade: ade at f4100000 { +> + ade: ade@f4100000 { > + compatible = "hisilicon,hi6220-ade"; > + reg = <0x0 0xf4100000 0x0 0x7800>; > + reg-names = "ade_base"; @@ -93,7 +93,7 @@ Wei > + }; > + }; > + -> + dsi: dsi at f4107800 { +> + dsi: dsi@f4107800 { > + compatible = "hisilicon,hi6220-dsi"; > + reg = <0x0 0xf4107800 0x0 0x100>; > + clocks = <&media_ctrl HI6220_DSI_PCLK>; @@ -105,7 +105,7 @@ Wei > + #size-cells = <0>; > + > + /* 0 for input port */ -> + port at 0 { +> + port@0 { > + reg = <0>; > + dsi_in: endpoint { > + remote-endpoint = <&ade_out>; diff --git a/a/content_digest b/N1/content_digest index 824e2ca..b301f46 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,17 @@ "ref\01471906085-16682-1-git-send-email-john.stultz@linaro.org\0" - "From\0xuwei5@hisilicon.com (Wei Xu)\0" - "Subject\0[PATCH 1/4] arm64: dts: Add display subsystem DT nodes for hi6220-hikey\0" + "From\0Wei Xu <xuwei5@hisilicon.com>\0" + "Subject\0Re: [PATCH 1/4] arm64: dts: Add display subsystem DT nodes for hi6220-hikey\0" "Date\0Wed, 24 Aug 2016 16:14:57 +0100\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0John Stultz <john.stultz@linaro.org>" + " lkml <linux-kernel@vger.kernel.org>\0" + "Cc\0Mark Rutland <mark.rutland@arm.com>" + devicetree@vger.kernel.org + Guodong Xu <guodong.xu@linaro.org> + Xinliang Liu <xinliang.liu@linaro.org> + Catalin Marinas <catalin.marinas@arm.com> + Will Deacon <will.deacon@arm.com> + Rob Herring <robh+dt@kernel.org> + " linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Hi John,\n" @@ -18,8 +27,8 @@ "> Cc: Mark Rutland <mark.rutland@arm.com>\n" "> Cc: Catalin Marinas <catalin.marinas@arm.com>\n" "> Cc: Will Deacon <will.deacon@arm.com>\n" - "> Cc: linux-arm-kernel at lists.infradead.org\n" - "> Cc: devicetree at vger.kernel.org\n" + "> Cc: linux-arm-kernel@lists.infradead.org\n" + "> Cc: devicetree@vger.kernel.org\n" "> Signed-off-by: Xinliang Liu <xinliang.liu@linaro.org>\n" "> Signed-off-by: John Stultz <john.stultz@linaro.org>\n" "> ---\n" @@ -58,7 +67,7 @@ "> \t\t\t#clock-cells = <1>;\n" "> \t\t};\n" "> \n" - "> +\t\tmedianoc_ade: medianoc_ade at f4520000 {\n" + "> +\t\tmedianoc_ade: medianoc_ade@f4520000 {\n" "> +\t\t\tcompatible = \"syscon\";\n" "> +\t\t\treg = <0x0 0xf4520000 0x0 0x4000>;\n" "> +\t\t};\n" @@ -71,7 +80,7 @@ "> \t\t\t};\n" "> \t\t};\n" "> +\n" - "> +\t\tade: ade at f4100000 {\n" + "> +\t\tade: ade@f4100000 {\n" "> +\t\t\tcompatible = \"hisilicon,hi6220-ade\";\n" "> +\t\t\treg = <0x0 0xf4100000 0x0 0x7800>;\n" "> +\t\t\treg-names = \"ade_base\";\n" @@ -100,7 +109,7 @@ "> +\t\t\t};\n" "> +\t\t};\n" "> +\n" - "> +\t\tdsi: dsi at f4107800 {\n" + "> +\t\tdsi: dsi@f4107800 {\n" "> +\t\t\tcompatible = \"hisilicon,hi6220-dsi\";\n" "> +\t\t\treg = <0x0 0xf4107800 0x0 0x100>;\n" "> +\t\t\tclocks = <&media_ctrl HI6220_DSI_PCLK>;\n" @@ -112,7 +121,7 @@ "> +\t\t\t\t#size-cells = <0>;\n" "> +\n" "> +\t\t\t\t/* 0 for input port */\n" - "> +\t\t\t\tport at 0 {\n" + "> +\t\t\t\tport@0 {\n" "> +\t\t\t\t\treg = <0>;\n" "> +\t\t\t\t\tdsi_in: endpoint {\n" "> +\t\t\t\t\t\tremote-endpoint = <&ade_out>;\n" @@ -124,4 +133,4 @@ "> };\n" > -f6436ed065fc20e3ef655e307d626d02c7a8ec8184dc365a4d958069aa036156 +64c7fcfab15a8b78d98f1b048b1d96e12a333bcaf2baaffac16f192432e486aa
diff --git a/a/1.txt b/N2/1.txt index b67d8fe..bb5318f 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -11,8 +11,8 @@ On 22/08/2016 23:48, John Stultz wrote: > Cc: Mark Rutland <mark.rutland@arm.com> > Cc: Catalin Marinas <catalin.marinas@arm.com> > Cc: Will Deacon <will.deacon@arm.com> -> Cc: linux-arm-kernel at lists.infradead.org -> Cc: devicetree at vger.kernel.org +> Cc: linux-arm-kernel@lists.infradead.org +> Cc: devicetree@vger.kernel.org > Signed-off-by: Xinliang Liu <xinliang.liu@linaro.org> > Signed-off-by: John Stultz <john.stultz@linaro.org> > --- @@ -51,7 +51,7 @@ Wei > #clock-cells = <1>; > }; > -> + medianoc_ade: medianoc_ade at f4520000 { +> + medianoc_ade: medianoc_ade@f4520000 { > + compatible = "syscon"; > + reg = <0x0 0xf4520000 0x0 0x4000>; > + }; @@ -64,7 +64,7 @@ Wei > }; > }; > + -> + ade: ade at f4100000 { +> + ade: ade@f4100000 { > + compatible = "hisilicon,hi6220-ade"; > + reg = <0x0 0xf4100000 0x0 0x7800>; > + reg-names = "ade_base"; @@ -93,7 +93,7 @@ Wei > + }; > + }; > + -> + dsi: dsi at f4107800 { +> + dsi: dsi@f4107800 { > + compatible = "hisilicon,hi6220-dsi"; > + reg = <0x0 0xf4107800 0x0 0x100>; > + clocks = <&media_ctrl HI6220_DSI_PCLK>; @@ -105,7 +105,7 @@ Wei > + #size-cells = <0>; > + > + /* 0 for input port */ -> + port at 0 { +> + port@0 { > + reg = <0>; > + dsi_in: endpoint { > + remote-endpoint = <&ade_out>; diff --git a/a/content_digest b/N2/content_digest index 824e2ca..92643f3 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,8 +1,17 @@ "ref\01471906085-16682-1-git-send-email-john.stultz@linaro.org\0" - "From\0xuwei5@hisilicon.com (Wei Xu)\0" - "Subject\0[PATCH 1/4] arm64: dts: Add display subsystem DT nodes for hi6220-hikey\0" + "From\0Wei Xu <xuwei5@hisilicon.com>\0" + "Subject\0Re: [PATCH 1/4] arm64: dts: Add display subsystem DT nodes for hi6220-hikey\0" "Date\0Wed, 24 Aug 2016 16:14:57 +0100\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0John Stultz <john.stultz@linaro.org>" + " lkml <linux-kernel@vger.kernel.org>\0" + "Cc\0Xinliang Liu <xinliang.liu@linaro.org>" + Guodong Xu <guodong.xu@linaro.org> + Rob Herring <robh+dt@kernel.org> + Mark Rutland <mark.rutland@arm.com> + Catalin Marinas <catalin.marinas@arm.com> + Will Deacon <will.deacon@arm.com> + <linux-arm-kernel@lists.infradead.org> + " <devicetree@vger.kernel.org>\0" "\00:1\0" "b\0" "Hi John,\n" @@ -18,8 +27,8 @@ "> Cc: Mark Rutland <mark.rutland@arm.com>\n" "> Cc: Catalin Marinas <catalin.marinas@arm.com>\n" "> Cc: Will Deacon <will.deacon@arm.com>\n" - "> Cc: linux-arm-kernel at lists.infradead.org\n" - "> Cc: devicetree at vger.kernel.org\n" + "> Cc: linux-arm-kernel@lists.infradead.org\n" + "> Cc: devicetree@vger.kernel.org\n" "> Signed-off-by: Xinliang Liu <xinliang.liu@linaro.org>\n" "> Signed-off-by: John Stultz <john.stultz@linaro.org>\n" "> ---\n" @@ -58,7 +67,7 @@ "> \t\t\t#clock-cells = <1>;\n" "> \t\t};\n" "> \n" - "> +\t\tmedianoc_ade: medianoc_ade at f4520000 {\n" + "> +\t\tmedianoc_ade: medianoc_ade@f4520000 {\n" "> +\t\t\tcompatible = \"syscon\";\n" "> +\t\t\treg = <0x0 0xf4520000 0x0 0x4000>;\n" "> +\t\t};\n" @@ -71,7 +80,7 @@ "> \t\t\t};\n" "> \t\t};\n" "> +\n" - "> +\t\tade: ade at f4100000 {\n" + "> +\t\tade: ade@f4100000 {\n" "> +\t\t\tcompatible = \"hisilicon,hi6220-ade\";\n" "> +\t\t\treg = <0x0 0xf4100000 0x0 0x7800>;\n" "> +\t\t\treg-names = \"ade_base\";\n" @@ -100,7 +109,7 @@ "> +\t\t\t};\n" "> +\t\t};\n" "> +\n" - "> +\t\tdsi: dsi at f4107800 {\n" + "> +\t\tdsi: dsi@f4107800 {\n" "> +\t\t\tcompatible = \"hisilicon,hi6220-dsi\";\n" "> +\t\t\treg = <0x0 0xf4107800 0x0 0x100>;\n" "> +\t\t\tclocks = <&media_ctrl HI6220_DSI_PCLK>;\n" @@ -112,7 +121,7 @@ "> +\t\t\t\t#size-cells = <0>;\n" "> +\n" "> +\t\t\t\t/* 0 for input port */\n" - "> +\t\t\t\tport at 0 {\n" + "> +\t\t\t\tport@0 {\n" "> +\t\t\t\t\treg = <0>;\n" "> +\t\t\t\t\tdsi_in: endpoint {\n" "> +\t\t\t\t\t\tremote-endpoint = <&ade_out>;\n" @@ -124,4 +133,4 @@ "> };\n" > -f6436ed065fc20e3ef655e307d626d02c7a8ec8184dc365a4d958069aa036156 +bb667660dd6da6c984bf914ebf2a4a23c8c83a70aa2ce7e8a0740413ed4596de
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.