diff for duplicates of <1507159910.5452.34.camel@aj.id.au> diff --git a/a/1.txt b/N1/1.txt index dd892f6..8c9c5b9 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,28 +1,28 @@ On Wed, 2017-10-04 at 17:19 +1030, Joel Stanley wrote: > We try to keep the nodes in address order. The ADC node was out of > place. -> +>? > Signed-off-by: Joel Stanley <joel@jms.id.au> Reviewed-by: Andrew Jeffery <andrew@aj.id.au> -> +>? > --- > v2: -> - Don't introduce new clk bindings +> ?- Don't introduce new clk bindings > --- -> arch/arm/boot/dts/aspeed-g4.dtsi | 16 ++++++++-------- -> arch/arm/boot/dts/aspeed-g5.dtsi | 16 ++++++++-------- -> 2 files changed, 16 insertions(+), 16 deletions(-) -> +> ?arch/arm/boot/dts/aspeed-g4.dtsi | 16 ++++++++-------- +> ?arch/arm/boot/dts/aspeed-g5.dtsi | 16 ++++++++-------- +> ?2 files changed, 16 insertions(+), 16 deletions(-) +>? > diff --git a/arch/arm/boot/dts/aspeed-g4.dtsi b/arch/arm/boot/dts/aspeed-g4.dtsi > index 1edd0cee6221..c2d96b8a5065 100644 > --- a/arch/arm/boot/dts/aspeed-g4.dtsi > +++ b/arch/arm/boot/dts/aspeed-g4.dtsi > @@ -129,6 +129,14 @@ -> }; -> }; -> +> ? }; +> ? }; +> ? > + adc: adc at 1e6e9000 { > + compatible = "aspeed,ast2400-adc"; > + reg = <0x1e6e9000 0xb0>; @@ -31,13 +31,13 @@ Reviewed-by: Andrew Jeffery <andrew@aj.id.au> > + status = "disabled"; > + }; > + -> sram at 1e720000 { -> compatible = "mmio-sram"; -> reg = <0x1e720000 0x8000>; // 32K +> ? sram at 1e720000 { +> ? compatible = "mmio-sram"; +> ? reg = <0x1e720000 0x8000>; // 32K > @@ -227,14 +235,6 @@ -> no-loopback-test; -> status = "disabled"; -> }; +> ? no-loopback-test; +> ? status = "disabled"; +> ? }; > - > - adc: adc at 1e6e9000 { > - compatible = "aspeed,ast2400-adc"; @@ -46,17 +46,17 @@ Reviewed-by: Andrew Jeffery <andrew@aj.id.au> > - #io-channel-cells = <1>; > - status = "disabled"; > - }; -> }; -> }; -> }; +> ? }; +> ? }; +> ?}; > diff --git a/arch/arm/boot/dts/aspeed-g5.dtsi b/arch/arm/boot/dts/aspeed-g5.dtsi > index f56dd67efa50..9e71c2dac0ba 100644 > --- a/arch/arm/boot/dts/aspeed-g5.dtsi > +++ b/arch/arm/boot/dts/aspeed-g5.dtsi > @@ -173,6 +173,14 @@ -> reg-io-width = <4>; -> }; -> +> ? reg-io-width = <4>; +> ? }; +> ? > + adc: adc at 1e6e9000 { > + compatible = "aspeed,ast2500-adc"; > + reg = <0x1e6e9000 0xb0>; @@ -65,13 +65,13 @@ Reviewed-by: Andrew Jeffery <andrew@aj.id.au> > + status = "disabled"; > + }; > + -> sram at 1e720000 { -> compatible = "mmio-sram"; -> reg = <0x1e720000 0x9000>; // 36K +> ? sram at 1e720000 { +> ? compatible = "mmio-sram"; +> ? reg = <0x1e720000 0x9000>; // 36K > @@ -307,14 +315,6 @@ -> no-loopback-test; -> status = "disabled"; -> }; +> ? no-loopback-test; +> ? status = "disabled"; +> ? }; > - > - adc: adc at 1e6e9000 { > - compatible = "aspeed,ast2500-adc"; @@ -80,13 +80,13 @@ Reviewed-by: Andrew Jeffery <andrew@aj.id.au> > - #io-channel-cells = <1>; > - status = "disabled"; > - }; -> }; -> }; -> }; +> ? }; +> ? }; +> ?}; -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 801 bytes Desc: This is a digitally signed message part -URL: <http://lists.ozlabs.org/pipermail/linux-aspeed/attachments/20171005/39023557/attachment.sig> +URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20171005/39023557/attachment.sig> diff --git a/a/content_digest b/N1/content_digest index 7be6fa7..176fd51 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,36 +1,36 @@ "ref\020171004064917.2498-1-joel@jms.id.au\0" "ref\020171004064917.2498-3-joel@jms.id.au\0" - "From\0Andrew Jeffery <andrew@aj.id.au>\0" + "From\0andrew@aj.id.au (Andrew Jeffery)\0" "Subject\0[PATCH v2 2/9] ARM: dts: aspeed: Reorder ADC node\0" "Date\0Thu, 05 Oct 2017 10:01:50 +1030\0" - "To\0linux-aspeed@lists.ozlabs.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On Wed, 2017-10-04 at 17:19 +1030, Joel Stanley wrote:\n" "> We try to keep the nodes in address order. The ADC node was out of\n" "> place.\n" - ">\302\240\n" + ">?\n" "> Signed-off-by: Joel Stanley <joel@jms.id.au>\n" "\n" "Reviewed-by: Andrew Jeffery <andrew@aj.id.au>\n" "\n" - ">\302\240\n" + ">?\n" "> ---\n" "> v2:\n" - "> \302\240- Don't introduce new clk bindings\n" + "> ?- Don't introduce new clk bindings\n" "> ---\n" - "> \302\240arch/arm/boot/dts/aspeed-g4.dtsi | 16 ++++++++--------\n" - "> \302\240arch/arm/boot/dts/aspeed-g5.dtsi | 16 ++++++++--------\n" - "> \302\2402 files changed, 16 insertions(+), 16 deletions(-)\n" - ">\302\240\n" + "> ?arch/arm/boot/dts/aspeed-g4.dtsi | 16 ++++++++--------\n" + "> ?arch/arm/boot/dts/aspeed-g5.dtsi | 16 ++++++++--------\n" + "> ?2 files changed, 16 insertions(+), 16 deletions(-)\n" + ">?\n" "> diff --git a/arch/arm/boot/dts/aspeed-g4.dtsi b/arch/arm/boot/dts/aspeed-g4.dtsi\n" "> index 1edd0cee6221..c2d96b8a5065 100644\n" "> --- a/arch/arm/boot/dts/aspeed-g4.dtsi\n" "> +++ b/arch/arm/boot/dts/aspeed-g4.dtsi\n" "> @@ -129,6 +129,14 @@\n" - "> \302\240\t\t\t\t};\n" - "> \302\240\t\t\t};\n" - "> \302\240\n" + "> ?\t\t\t\t};\n" + "> ?\t\t\t};\n" + "> ?\n" "> +\t\t\tadc: adc at 1e6e9000 {\n" "> +\t\t\t\tcompatible = \"aspeed,ast2400-adc\";\n" "> +\t\t\t\treg = <0x1e6e9000 0xb0>;\n" @@ -39,13 +39,13 @@ "> +\t\t\t\tstatus = \"disabled\";\n" "> +\t\t\t};\n" "> +\n" - "> \302\240\t\t\tsram at 1e720000 {\n" - "> \302\240\t\t\t\tcompatible = \"mmio-sram\";\n" - "> \302\240\t\t\t\treg = <0x1e720000 0x8000>;\t// 32K\n" + "> ?\t\t\tsram at 1e720000 {\n" + "> ?\t\t\t\tcompatible = \"mmio-sram\";\n" + "> ?\t\t\t\treg = <0x1e720000 0x8000>;\t// 32K\n" "> @@ -227,14 +235,6 @@\n" - "> \302\240\t\t\t\tno-loopback-test;\n" - "> \302\240\t\t\t\tstatus = \"disabled\";\n" - "> \302\240\t\t\t};\n" + "> ?\t\t\t\tno-loopback-test;\n" + "> ?\t\t\t\tstatus = \"disabled\";\n" + "> ?\t\t\t};\n" "> -\n" "> -\t\t\tadc: adc at 1e6e9000 {\n" "> -\t\t\t\tcompatible = \"aspeed,ast2400-adc\";\n" @@ -54,17 +54,17 @@ "> -\t\t\t\t#io-channel-cells = <1>;\n" "> -\t\t\t\tstatus = \"disabled\";\n" "> -\t\t\t};\n" - "> \302\240\t\t};\n" - "> \302\240\t};\n" - "> \302\240};\n" + "> ?\t\t};\n" + "> ?\t};\n" + "> ?};\n" "> diff --git a/arch/arm/boot/dts/aspeed-g5.dtsi b/arch/arm/boot/dts/aspeed-g5.dtsi\n" "> index f56dd67efa50..9e71c2dac0ba 100644\n" "> --- a/arch/arm/boot/dts/aspeed-g5.dtsi\n" "> +++ b/arch/arm/boot/dts/aspeed-g5.dtsi\n" "> @@ -173,6 +173,14 @@\n" - "> \302\240\t\t\t\treg-io-width = <4>;\n" - "> \302\240\t\t\t};\n" - "> \302\240\n" + "> ?\t\t\t\treg-io-width = <4>;\n" + "> ?\t\t\t};\n" + "> ?\n" "> +\t\t\tadc: adc at 1e6e9000 {\n" "> +\t\t\t\tcompatible = \"aspeed,ast2500-adc\";\n" "> +\t\t\t\treg = <0x1e6e9000 0xb0>;\n" @@ -73,13 +73,13 @@ "> +\t\t\t\tstatus = \"disabled\";\n" "> +\t\t\t};\n" "> +\n" - "> \302\240\t\t\tsram at 1e720000 {\n" - "> \302\240\t\t\t\tcompatible = \"mmio-sram\";\n" - "> \302\240\t\t\t\treg = <0x1e720000 0x9000>;\t// 36K\n" + "> ?\t\t\tsram at 1e720000 {\n" + "> ?\t\t\t\tcompatible = \"mmio-sram\";\n" + "> ?\t\t\t\treg = <0x1e720000 0x9000>;\t// 36K\n" "> @@ -307,14 +315,6 @@\n" - "> \302\240\t\t\t\tno-loopback-test;\n" - "> \302\240\t\t\t\tstatus = \"disabled\";\n" - "> \302\240\t\t\t};\n" + "> ?\t\t\t\tno-loopback-test;\n" + "> ?\t\t\t\tstatus = \"disabled\";\n" + "> ?\t\t\t};\n" "> -\n" "> -\t\t\tadc: adc at 1e6e9000 {\n" "> -\t\t\t\tcompatible = \"aspeed,ast2500-adc\";\n" @@ -88,15 +88,15 @@ "> -\t\t\t\t#io-channel-cells = <1>;\n" "> -\t\t\t\tstatus = \"disabled\";\n" "> -\t\t\t};\n" - "> \302\240\t\t};\n" - "> \302\240\t};\n" - "> \302\240};\n" + "> ?\t\t};\n" + "> ?\t};\n" + "> ?};\n" "-------------- next part --------------\n" "A non-text attachment was scrubbed...\n" "Name: signature.asc\n" "Type: application/pgp-signature\n" "Size: 801 bytes\n" "Desc: This is a digitally signed message part\n" - URL: <http://lists.ozlabs.org/pipermail/linux-aspeed/attachments/20171005/39023557/attachment.sig> + URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20171005/39023557/attachment.sig> -768fbe97da21ca5feb7709a72a666235ee30a1b99d4cff0c32932ba46fedc856 +2f701b540ff246aeaf5692f0ac085098c3a8ad8dfd53bccb7530d94a9d438a39
diff --git a/a/1.txt b/N2/1.txt index dd892f6..fcad3e6 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -23,7 +23,7 @@ Reviewed-by: Andrew Jeffery <andrew@aj.id.au> > }; > }; > -> + adc: adc at 1e6e9000 { +> + adc: adc@1e6e9000 { > + compatible = "aspeed,ast2400-adc"; > + reg = <0x1e6e9000 0xb0>; > + clocks = <&clk_apb>; @@ -31,7 +31,7 @@ Reviewed-by: Andrew Jeffery <andrew@aj.id.au> > + status = "disabled"; > + }; > + -> sram at 1e720000 { +> sram@1e720000 { > compatible = "mmio-sram"; > reg = <0x1e720000 0x8000>; // 32K > @@ -227,14 +235,6 @@ @@ -39,7 +39,7 @@ Reviewed-by: Andrew Jeffery <andrew@aj.id.au> > status = "disabled"; > }; > - -> - adc: adc at 1e6e9000 { +> - adc: adc@1e6e9000 { > - compatible = "aspeed,ast2400-adc"; > - reg = <0x1e6e9000 0xb0>; > - clocks = <&clk_apb>; @@ -57,7 +57,7 @@ Reviewed-by: Andrew Jeffery <andrew@aj.id.au> > reg-io-width = <4>; > }; > -> + adc: adc at 1e6e9000 { +> + adc: adc@1e6e9000 { > + compatible = "aspeed,ast2500-adc"; > + reg = <0x1e6e9000 0xb0>; > + clocks = <&clk_apb>; @@ -65,7 +65,7 @@ Reviewed-by: Andrew Jeffery <andrew@aj.id.au> > + status = "disabled"; > + }; > + -> sram at 1e720000 { +> sram@1e720000 { > compatible = "mmio-sram"; > reg = <0x1e720000 0x9000>; // 36K > @@ -307,14 +315,6 @@ @@ -73,7 +73,7 @@ Reviewed-by: Andrew Jeffery <andrew@aj.id.au> > status = "disabled"; > }; > - -> - adc: adc at 1e6e9000 { +> - adc: adc@1e6e9000 { > - compatible = "aspeed,ast2500-adc"; > - reg = <0x1e6e9000 0xb0>; > - clocks = <&clk_apb>; @@ -83,10 +83,3 @@ Reviewed-by: Andrew Jeffery <andrew@aj.id.au> > }; > }; > }; --------------- next part -------------- -A non-text attachment was scrubbed... -Name: signature.asc -Type: application/pgp-signature -Size: 801 bytes -Desc: This is a digitally signed message part -URL: <http://lists.ozlabs.org/pipermail/linux-aspeed/attachments/20171005/39023557/attachment.sig> diff --git a/N2/2.bin b/N2/2.bin new file mode 100644 index 0000000..fa4eae9 --- /dev/null +++ b/N2/2.bin @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIcBAABCgAGBQJZ1W9mAAoJEJ0dnzgO5LT5XNcP/1gAkOUWm+H2ZBnOF2oAuoSF +vDpNSiLjFv+URWVJ/YNyj1UiT+OPW0dTyJ0P69cp0pP6ty4RBhd3Huk2K16AMirE +zY9QBUsWfUvNhwuX5Tqb38Lcb2UNRdM2FqpkSb96thCOsANtSyfxq7sH9tdC2HGB +b2FV35jS0+uyYaJcN5+AzeuZt7OZPVN5W2zZmoacKAuTvokeql6j1Tot/02KG20c +X/r6z/g8jhXssmkMDDxuR+lxqLwI3+vesbUS5EW1MOF3K2HsUBs7WG+2l4dln/8G +YMKS4aBDL3xxgV8mRgq6fP2v98bf9SmHXtkxNEp2I08gGfs0ZCEnkVPZxVmHGHhb +Uw3SIOl6Zmi0E35fJCL1EwVBRaTcYj8LHXXk2Zu29oYAuvVvmr+W/0QgQhzqWSVw +EQWQmqQVKTvUgvlXgjvry1UcCHAs50CnhOhkuh+lLw08hWbglaKkj9Qzu5OWWHAz +bBI4BCF9RZfxl4hqTKf+1HyaKgYM41agQiOtG2LcXk/Of8AZRq8hmaUeiawU9so3 +L/5njvNfpJgVaNV4GhugXdPryGTtncgoXn1a98NKaIwKP7v3oRG8g+VJzUOzF0F3 +NLUrHtLXger/G2uWdm4DHWLpGdsWZk2v6ZeyJ5fH14cYgWBPLUpbxzy9YiWob7wf +OHZLbQuVb796rTNlPL9n +=x8fF +-----END PGP SIGNATURE----- diff --git a/N2/2.hdr b/N2/2.hdr new file mode 100644 index 0000000..da6d245 --- /dev/null +++ b/N2/2.hdr @@ -0,0 +1,3 @@ +Content-Type: application/pgp-signature; name="signature.asc" +Content-Description: This is a digitally signed message part +Content-Transfer-Encoding: 7bit diff --git a/a/content_digest b/N2/content_digest index 7be6fa7..f1a055b 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,10 +1,20 @@ "ref\020171004064917.2498-1-joel@jms.id.au\0" "ref\020171004064917.2498-3-joel@jms.id.au\0" "From\0Andrew Jeffery <andrew@aj.id.au>\0" - "Subject\0[PATCH v2 2/9] ARM: dts: aspeed: Reorder ADC node\0" + "Subject\0Re: [PATCH v2 2/9] ARM: dts: aspeed: Reorder ADC node\0" "Date\0Thu, 05 Oct 2017 10:01:50 +1030\0" - "To\0linux-aspeed@lists.ozlabs.org\0" - "\00:1\0" + "To\0Joel Stanley <joel@jms.id.au>" + Rob Herring <robh+dt@kernel.org> + " Mark Rutland <mark.rutland@arm.com>\0" + "Cc\0Russell King <linux@armlinux.org.uk>" + devicetree@vger.kernel.org + linux-arm-kernel@lists.infradead.org + linux-kernel@vger.kernel.org + Rick Altherr <raltherr@google.com> + Brendan Higgins <brendanhiggins@google.com> + " C\303\251dric Le Goater <clg@kaod.org>" + " linux-aspeed@lists.ozlabs.org\0" + "\01:1\0" "b\0" "On Wed, 2017-10-04 at 17:19 +1030, Joel Stanley wrote:\n" "> We try to keep the nodes in address order. The ADC node was out of\n" @@ -31,7 +41,7 @@ "> \302\240\t\t\t\t};\n" "> \302\240\t\t\t};\n" "> \302\240\n" - "> +\t\t\tadc: adc at 1e6e9000 {\n" + "> +\t\t\tadc: adc@1e6e9000 {\n" "> +\t\t\t\tcompatible = \"aspeed,ast2400-adc\";\n" "> +\t\t\t\treg = <0x1e6e9000 0xb0>;\n" "> +\t\t\t\tclocks = <&clk_apb>;\n" @@ -39,7 +49,7 @@ "> +\t\t\t\tstatus = \"disabled\";\n" "> +\t\t\t};\n" "> +\n" - "> \302\240\t\t\tsram at 1e720000 {\n" + "> \302\240\t\t\tsram@1e720000 {\n" "> \302\240\t\t\t\tcompatible = \"mmio-sram\";\n" "> \302\240\t\t\t\treg = <0x1e720000 0x8000>;\t// 32K\n" "> @@ -227,14 +235,6 @@\n" @@ -47,7 +57,7 @@ "> \302\240\t\t\t\tstatus = \"disabled\";\n" "> \302\240\t\t\t};\n" "> -\n" - "> -\t\t\tadc: adc at 1e6e9000 {\n" + "> -\t\t\tadc: adc@1e6e9000 {\n" "> -\t\t\t\tcompatible = \"aspeed,ast2400-adc\";\n" "> -\t\t\t\treg = <0x1e6e9000 0xb0>;\n" "> -\t\t\t\tclocks = <&clk_apb>;\n" @@ -65,7 +75,7 @@ "> \302\240\t\t\t\treg-io-width = <4>;\n" "> \302\240\t\t\t};\n" "> \302\240\n" - "> +\t\t\tadc: adc at 1e6e9000 {\n" + "> +\t\t\tadc: adc@1e6e9000 {\n" "> +\t\t\t\tcompatible = \"aspeed,ast2500-adc\";\n" "> +\t\t\t\treg = <0x1e6e9000 0xb0>;\n" "> +\t\t\t\tclocks = <&clk_apb>;\n" @@ -73,7 +83,7 @@ "> +\t\t\t\tstatus = \"disabled\";\n" "> +\t\t\t};\n" "> +\n" - "> \302\240\t\t\tsram at 1e720000 {\n" + "> \302\240\t\t\tsram@1e720000 {\n" "> \302\240\t\t\t\tcompatible = \"mmio-sram\";\n" "> \302\240\t\t\t\treg = <0x1e720000 0x9000>;\t// 36K\n" "> @@ -307,14 +315,6 @@\n" @@ -81,7 +91,7 @@ "> \302\240\t\t\t\tstatus = \"disabled\";\n" "> \302\240\t\t\t};\n" "> -\n" - "> -\t\t\tadc: adc at 1e6e9000 {\n" + "> -\t\t\tadc: adc@1e6e9000 {\n" "> -\t\t\t\tcompatible = \"aspeed,ast2500-adc\";\n" "> -\t\t\t\treg = <0x1e6e9000 0xb0>;\n" "> -\t\t\t\tclocks = <&clk_apb>;\n" @@ -90,13 +100,26 @@ "> -\t\t\t};\n" "> \302\240\t\t};\n" "> \302\240\t};\n" - "> \302\240};\n" - "-------------- next part --------------\n" - "A non-text attachment was scrubbed...\n" - "Name: signature.asc\n" - "Type: application/pgp-signature\n" - "Size: 801 bytes\n" - "Desc: This is a digitally signed message part\n" - URL: <http://lists.ozlabs.org/pipermail/linux-aspeed/attachments/20171005/39023557/attachment.sig> + "> \302\240};" + "\01:2\0" + "fn\0signature.asc\0" + "d\0This is a digitally signed message part\0" + "b\0" + "-----BEGIN PGP SIGNATURE-----\n" + "\n" + "iQIcBAABCgAGBQJZ1W9mAAoJEJ0dnzgO5LT5XNcP/1gAkOUWm+H2ZBnOF2oAuoSF\n" + "vDpNSiLjFv+URWVJ/YNyj1UiT+OPW0dTyJ0P69cp0pP6ty4RBhd3Huk2K16AMirE\n" + "zY9QBUsWfUvNhwuX5Tqb38Lcb2UNRdM2FqpkSb96thCOsANtSyfxq7sH9tdC2HGB\n" + "b2FV35jS0+uyYaJcN5+AzeuZt7OZPVN5W2zZmoacKAuTvokeql6j1Tot/02KG20c\n" + "X/r6z/g8jhXssmkMDDxuR+lxqLwI3+vesbUS5EW1MOF3K2HsUBs7WG+2l4dln/8G\n" + "YMKS4aBDL3xxgV8mRgq6fP2v98bf9SmHXtkxNEp2I08gGfs0ZCEnkVPZxVmHGHhb\n" + "Uw3SIOl6Zmi0E35fJCL1EwVBRaTcYj8LHXXk2Zu29oYAuvVvmr+W/0QgQhzqWSVw\n" + "EQWQmqQVKTvUgvlXgjvry1UcCHAs50CnhOhkuh+lLw08hWbglaKkj9Qzu5OWWHAz\n" + "bBI4BCF9RZfxl4hqTKf+1HyaKgYM41agQiOtG2LcXk/Of8AZRq8hmaUeiawU9so3\n" + "L/5njvNfpJgVaNV4GhugXdPryGTtncgoXn1a98NKaIwKP7v3oRG8g+VJzUOzF0F3\n" + "NLUrHtLXger/G2uWdm4DHWLpGdsWZk2v6ZeyJ5fH14cYgWBPLUpbxzy9YiWob7wf\n" + "OHZLbQuVb796rTNlPL9n\n" + "=x8fF\n" + "-----END PGP SIGNATURE-----\n" -768fbe97da21ca5feb7709a72a666235ee30a1b99d4cff0c32932ba46fedc856 +f35d4fbd6d9de456606d4be646a40b8be4a98901f63bca5451d8485b5aba04c2
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.