diff for duplicates of <20180608214946.GI30587@xps15> diff --git a/a/1.txt b/N1/1.txt index 0511af8..a6b322a 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -22,7 +22,7 @@ Reviewed-by: Mathieu Poirier <mathieu.poirier@linaro.org> > --- a/arch/arm64/boot/dts/arm/juno-base.dtsi > +++ b/arch/arm64/boot/dts/arm/juno-base.dtsi > @@ -122,15 +122,18 @@ -> port at 0 { +> port@0 { > reg = <0>; > etf0_in_port: endpoint { > - slave-mode; @@ -33,7 +33,7 @@ Reviewed-by: Mathieu Poirier <mathieu.poirier@linaro.org> > }; > > /* output port */ -> port at 1 { +> port@1 { > - reg = <0>; > + reg = <1>; > etf0_out_port: endpoint { @@ -63,7 +63,7 @@ Reviewed-by: Mathieu Poirier <mathieu.poirier@linaro.org> > }; > > /* input ports */ -> port at 1 { +> port@1 { > - reg = <0>; > + reg = <1>; > main_funnel_in_port0: endpoint { @@ -74,7 +74,7 @@ Reviewed-by: Mathieu Poirier <mathieu.poirier@linaro.org> > }; > }; > -> port at 2 { +> port@2 { > - reg = <1>; > + reg = <2>; > main_funnel_in_port1: endpoint { @@ -123,7 +123,7 @@ Reviewed-by: Mathieu Poirier <mathieu.poirier@linaro.org> > }; > }; > -> port at 1 { +> port@1 { > - reg = <0>; > + reg = <1>; > cluster0_funnel_in_port0: endpoint { @@ -134,7 +134,7 @@ Reviewed-by: Mathieu Poirier <mathieu.poirier@linaro.org> > }; > }; > -> port at 2 { +> port@2 { > - reg = <1>; > + reg = <2>; > cluster0_funnel_in_port1: endpoint { @@ -172,7 +172,7 @@ Reviewed-by: Mathieu Poirier <mathieu.poirier@linaro.org> > }; > }; > -> port at 1 { +> port@1 { > - reg = <0>; > + reg = <1>; > cluster1_funnel_in_port0: endpoint { @@ -183,7 +183,7 @@ Reviewed-by: Mathieu Poirier <mathieu.poirier@linaro.org> > }; > }; > -> port at 2 { +> port@2 { > - reg = <1>; > + reg = <2>; > cluster1_funnel_in_port1: endpoint { @@ -193,7 +193,7 @@ Reviewed-by: Mathieu Poirier <mathieu.poirier@linaro.org> > + coresight,hwid = <1>; > }; > }; -> port at 3 { +> port@3 { > - reg = <2>; > + reg = <3>; > cluster1_funnel_in_port2: endpoint { @@ -203,7 +203,7 @@ Reviewed-by: Mathieu Poirier <mathieu.poirier@linaro.org> > + coresight,hwid = <2>; > }; > }; -> port at 4 { +> port@4 { > - reg = <3>; > + reg = <4>; > cluster1_funnel_in_port3: endpoint { @@ -260,7 +260,7 @@ Reviewed-by: Mathieu Poirier <mathieu.poirier@linaro.org> > }; > > /* replicator input port */ -> port at 2 { +> port@2 { > - reg = <0>; > + reg = <2>; > replicator_in_port0: endpoint { @@ -275,7 +275,7 @@ Reviewed-by: Mathieu Poirier <mathieu.poirier@linaro.org> > --- a/arch/arm64/boot/dts/arm/juno-cs-r1r2.dtsi > +++ b/arch/arm64/boot/dts/arm/juno-cs-r1r2.dtsi > @@ -15,15 +15,18 @@ -> port at 0 { +> port@0 { > reg = <0>; > csys1_funnel_out_port: endpoint { > + coresight,hwid = <0>; @@ -285,7 +285,7 @@ Reviewed-by: Mathieu Poirier <mathieu.poirier@linaro.org> > }; > > /* input port */ -> port at 1 { +> port@1 { > - reg = <0>; > + reg = <1>; > csys1_funnel_in_port0: endpoint { @@ -296,7 +296,7 @@ Reviewed-by: Mathieu Poirier <mathieu.poirier@linaro.org> > }; > > @@ -45,15 +48,18 @@ -> port at 0 { +> port@0 { > reg = <0>; > etf1_in_port: endpoint { > - slave-mode; @@ -307,7 +307,7 @@ Reviewed-by: Mathieu Poirier <mathieu.poirier@linaro.org> > }; > > /* output port */ -> port at 1 { +> port@1 { > - reg = <0>; > + reg = <1>; > etf1_out_port: endpoint { @@ -317,7 +317,7 @@ Reviewed-by: Mathieu Poirier <mathieu.poirier@linaro.org> > }; > }; > @@ -75,23 +81,27 @@ -> port at 0 { +> port@0 { > reg = <0>; > csys2_funnel_out_port: endpoint { > + coresight,hwid = <0>; @@ -327,7 +327,7 @@ Reviewed-by: Mathieu Poirier <mathieu.poirier@linaro.org> > }; > > /* input ports */ -> port at 1 { +> port@1 { > - reg = <0>; > + reg = <1>; > csys2_funnel_in_port0: endpoint { @@ -338,7 +338,7 @@ Reviewed-by: Mathieu Poirier <mathieu.poirier@linaro.org> > }; > }; > -> port at 2 { +> port@2 { > - reg = <1>; > + reg = <2>; > csys2_funnel_in_port1: endpoint { @@ -355,7 +355,7 @@ Reviewed-by: Mathieu Poirier <mathieu.poirier@linaro.org> > @@ -260,10 +260,11 @@ > &main_funnel { > ports { -> port at 3 { +> port@3 { > - reg = <2>; > + reg = <3>; > main_funnel_in_port2: endpoint { diff --git a/a/content_digest b/N1/content_digest index 1a22491..0a6b763 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,9 +1,23 @@ "ref\01528235011-30691-1-git-send-email-suzuki.poulose@arm.com\0" "ref\01528235011-30691-11-git-send-email-suzuki.poulose@arm.com\0" - "From\0mathieu.poirier@linaro.org (Mathieu Poirier)\0" - "Subject\0[PATCH 10/20] dts: juno: Update coresight bindings for hw port\0" + "From\0Mathieu Poirier <mathieu.poirier@linaro.org>\0" + "Subject\0Re: [PATCH 10/20] dts: juno: Update coresight bindings for hw port\0" "Date\0Fri, 8 Jun 2018 15:49:46 -0600\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Suzuki K Poulose <suzuki.poulose@arm.com>\0" + "Cc\0linux-arm-kernel@lists.infradead.org" + robh@kernel.org + frowand.list@gmail.com + mark.rutland@arm.com + sudeep.holla@arm.com + arm@kernel.org + linux-kernel@vger.kernel.org + matt.sealey@arm.com + john.horley@arm.com + charles.garcia-tobin@arm.com + coresight@lists.linaro.org + devicetree@vger.kernel.org + mike.leach@linaro.org + " Liviu Dudau <liviu.dudau@arm.com>\0" "\00:1\0" "b\0" "On Tue, Jun 05, 2018 at 10:43:21PM +0100, Suzuki K Poulose wrote:\n" @@ -30,7 +44,7 @@ "> --- a/arch/arm64/boot/dts/arm/juno-base.dtsi\n" "> +++ b/arch/arm64/boot/dts/arm/juno-base.dtsi\n" "> @@ -122,15 +122,18 @@\n" - "> \t\t\tport at 0 {\n" + "> \t\t\tport@0 {\n" "> \t\t\t\treg = <0>;\n" "> \t\t\t\tetf0_in_port: endpoint {\n" "> -\t\t\t\t\tslave-mode;\n" @@ -41,7 +55,7 @@ "> \t\t\t};\n" "> \n" "> \t\t\t/* output port */\n" - "> \t\t\tport at 1 {\n" + "> \t\t\tport@1 {\n" "> -\t\t\t\treg = <0>;\n" "> +\t\t\t\treg = <1>;\n" "> \t\t\t\tetf0_out_port: endpoint {\n" @@ -71,7 +85,7 @@ "> \t\t\t};\n" "> \n" "> \t\t\t/* input ports */\n" - "> \t\t\tport at 1 {\n" + "> \t\t\tport@1 {\n" "> -\t\t\t\treg = <0>;\n" "> +\t\t\t\treg = <1>;\n" "> \t\t\t\tmain_funnel_in_port0: endpoint {\n" @@ -82,7 +96,7 @@ "> \t\t\t\t};\n" "> \t\t\t};\n" "> \n" - "> \t\t\tport at 2 {\n" + "> \t\t\tport@2 {\n" "> -\t\t\t\treg = <1>;\n" "> +\t\t\t\treg = <2>;\n" "> \t\t\t\tmain_funnel_in_port1: endpoint {\n" @@ -131,7 +145,7 @@ "> \t\t\t\t};\n" "> \t\t\t};\n" "> \n" - "> \t\t\tport at 1 {\n" + "> \t\t\tport@1 {\n" "> -\t\t\t\treg = <0>;\n" "> +\t\t\t\treg = <1>;\n" "> \t\t\t\tcluster0_funnel_in_port0: endpoint {\n" @@ -142,7 +156,7 @@ "> \t\t\t\t};\n" "> \t\t\t};\n" "> \n" - "> \t\t\tport at 2 {\n" + "> \t\t\tport@2 {\n" "> -\t\t\t\treg = <1>;\n" "> +\t\t\t\treg = <2>;\n" "> \t\t\t\tcluster0_funnel_in_port1: endpoint {\n" @@ -180,7 +194,7 @@ "> \t\t\t\t};\n" "> \t\t\t};\n" "> \n" - "> \t\t\tport at 1 {\n" + "> \t\t\tport@1 {\n" "> -\t\t\t\treg = <0>;\n" "> +\t\t\t\treg = <1>;\n" "> \t\t\t\tcluster1_funnel_in_port0: endpoint {\n" @@ -191,7 +205,7 @@ "> \t\t\t\t};\n" "> \t\t\t};\n" "> \n" - "> \t\t\tport at 2 {\n" + "> \t\t\tport@2 {\n" "> -\t\t\t\treg = <1>;\n" "> +\t\t\t\treg = <2>;\n" "> \t\t\t\tcluster1_funnel_in_port1: endpoint {\n" @@ -201,7 +215,7 @@ "> +\t\t\t\t\tcoresight,hwid = <1>;\n" "> \t\t\t\t};\n" "> \t\t\t};\n" - "> \t\t\tport at 3 {\n" + "> \t\t\tport@3 {\n" "> -\t\t\t\treg = <2>;\n" "> +\t\t\t\treg = <3>;\n" "> \t\t\t\tcluster1_funnel_in_port2: endpoint {\n" @@ -211,7 +225,7 @@ "> +\t\t\t\t\tcoresight,hwid = <2>;\n" "> \t\t\t\t};\n" "> \t\t\t};\n" - "> \t\t\tport at 4 {\n" + "> \t\t\tport@4 {\n" "> -\t\t\t\treg = <3>;\n" "> +\t\t\t\treg = <4>;\n" "> \t\t\t\tcluster1_funnel_in_port3: endpoint {\n" @@ -268,7 +282,7 @@ "> \t\t\t};\n" "> \n" "> \t\t\t/* replicator input port */\n" - "> \t\t\tport at 2 {\n" + "> \t\t\tport@2 {\n" "> -\t\t\t\treg = <0>;\n" "> +\t\t\t\treg = <2>;\n" "> \t\t\t\treplicator_in_port0: endpoint {\n" @@ -283,7 +297,7 @@ "> --- a/arch/arm64/boot/dts/arm/juno-cs-r1r2.dtsi\n" "> +++ b/arch/arm64/boot/dts/arm/juno-cs-r1r2.dtsi\n" "> @@ -15,15 +15,18 @@\n" - "> \t\t\tport at 0 {\n" + "> \t\t\tport@0 {\n" "> \t\t\t\treg = <0>;\n" "> \t\t\t\tcsys1_funnel_out_port: endpoint {\n" "> +\t\t\t\t\tcoresight,hwid = <0>;\n" @@ -293,7 +307,7 @@ "> \t\t\t};\n" "> \n" "> \t\t\t/* input port */\n" - "> \t\t\tport at 1 {\n" + "> \t\t\tport@1 {\n" "> -\t\t\t\treg = <0>;\n" "> +\t\t\t\treg = <1>;\n" "> \t\t\t\tcsys1_funnel_in_port0: endpoint {\n" @@ -304,7 +318,7 @@ "> \t\t\t};\n" "> \n" "> @@ -45,15 +48,18 @@\n" - "> \t\t\tport at 0 {\n" + "> \t\t\tport@0 {\n" "> \t\t\t\treg = <0>;\n" "> \t\t\t\tetf1_in_port: endpoint {\n" "> -\t\t\t\t\tslave-mode;\n" @@ -315,7 +329,7 @@ "> \t\t\t};\n" "> \n" "> \t\t\t/* output port */\n" - "> \t\t\tport at 1 {\n" + "> \t\t\tport@1 {\n" "> -\t\t\t\treg = <0>;\n" "> +\t\t\t\treg = <1>;\n" "> \t\t\t\tetf1_out_port: endpoint {\n" @@ -325,7 +339,7 @@ "> \t\t\t\t};\n" "> \t\t\t};\n" "> @@ -75,23 +81,27 @@\n" - "> \t\t\tport at 0 {\n" + "> \t\t\tport@0 {\n" "> \t\t\t\treg = <0>;\n" "> \t\t\t\tcsys2_funnel_out_port: endpoint {\n" "> +\t\t\t\t\tcoresight,hwid = <0>;\n" @@ -335,7 +349,7 @@ "> \t\t\t};\n" "> \n" "> \t\t\t/* input ports */\n" - "> \t\t\tport at 1 {\n" + "> \t\t\tport@1 {\n" "> -\t\t\t\treg = <0>;\n" "> +\t\t\t\treg = <1>;\n" "> \t\t\t\tcsys2_funnel_in_port0: endpoint {\n" @@ -346,7 +360,7 @@ "> \t\t\t\t};\n" "> \t\t\t};\n" "> \n" - "> \t\t\tport at 2 {\n" + "> \t\t\tport@2 {\n" "> -\t\t\t\treg = <1>;\n" "> +\t\t\t\treg = <2>;\n" "> \t\t\t\tcsys2_funnel_in_port1: endpoint {\n" @@ -363,7 +377,7 @@ "> @@ -260,10 +260,11 @@\n" "> &main_funnel {\n" "> \tports {\n" - "> \t\tport at 3 {\n" + "> \t\tport@3 {\n" "> -\t\t\treg = <2>;\n" "> +\t\t\treg = <3>;\n" "> \t\t\tmain_funnel_in_port2: endpoint {\n" @@ -378,4 +392,4 @@ "> 2.7.4\n" > -37fcdc51b0a3b492f16229d4ec487e23b423aac3ff942c9b861089f8fb816f4c +eabea36fbb1584f943054e9ac25b8c17e5856713247706bb67d9412b95699bfd
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.