diff for duplicates of <20171004064917.2498-3-joel@jms.id.au> diff --git a/a/content_digest b/N1/content_digest index cd81b81..35355e2 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,8 @@ "ref\020171004064917.2498-1-joel@jms.id.au\0" - "From\0Joel Stanley <joel@jms.id.au>\0" + "From\0joel@jms.id.au (Joel Stanley)\0" "Subject\0[PATCH v2 2/9] ARM: dts: aspeed: Reorder ADC node\0" "Date\0Wed, 4 Oct 2017 17:19:10 +1030\0" - "To\0linux-aspeed@lists.ozlabs.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "We try to keep the nodes in address order. The ADC node was out of\n" @@ -89,4 +89,4 @@ "-- \n" 2.14.1 -34a3276cc4b7e1ce0372f7f4d0f5accab86c4ae8b8cde8a93028b9e671c3c0a4 +00813331e29941100b573d56d4cb2115651c6ba9573fd3dede7c7ad90cb8ae00
diff --git a/a/1.txt b/N2/1.txt index 3b33355..7e5f79c 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -19,7 +19,7 @@ index 1edd0cee6221..c2d96b8a5065 100644 }; }; -+ adc: adc at 1e6e9000 { ++ adc: adc@1e6e9000 { + compatible = "aspeed,ast2400-adc"; + reg = <0x1e6e9000 0xb0>; + clocks = <&clk_apb>; @@ -27,7 +27,7 @@ index 1edd0cee6221..c2d96b8a5065 100644 + status = "disabled"; + }; + - sram at 1e720000 { + sram@1e720000 { compatible = "mmio-sram"; reg = <0x1e720000 0x8000>; // 32K @@ -227,14 +235,6 @@ @@ -35,7 +35,7 @@ index 1edd0cee6221..c2d96b8a5065 100644 status = "disabled"; }; - -- adc: adc at 1e6e9000 { +- adc: adc@1e6e9000 { - compatible = "aspeed,ast2400-adc"; - reg = <0x1e6e9000 0xb0>; - clocks = <&clk_apb>; @@ -53,7 +53,7 @@ index f56dd67efa50..9e71c2dac0ba 100644 reg-io-width = <4>; }; -+ adc: adc at 1e6e9000 { ++ adc: adc@1e6e9000 { + compatible = "aspeed,ast2500-adc"; + reg = <0x1e6e9000 0xb0>; + clocks = <&clk_apb>; @@ -61,7 +61,7 @@ index f56dd67efa50..9e71c2dac0ba 100644 + status = "disabled"; + }; + - sram at 1e720000 { + sram@1e720000 { compatible = "mmio-sram"; reg = <0x1e720000 0x9000>; // 36K @@ -307,14 +315,6 @@ @@ -69,7 +69,7 @@ index f56dd67efa50..9e71c2dac0ba 100644 status = "disabled"; }; - -- adc: adc at 1e6e9000 { +- adc: adc@1e6e9000 { - compatible = "aspeed,ast2500-adc"; - reg = <0x1e6e9000 0xb0>; - clocks = <&clk_apb>; diff --git a/a/content_digest b/N2/content_digest index cd81b81..22a4cbb 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -2,7 +2,18 @@ "From\0Joel Stanley <joel@jms.id.au>\0" "Subject\0[PATCH v2 2/9] ARM: dts: aspeed: Reorder ADC node\0" "Date\0Wed, 4 Oct 2017 17:19:10 +1030\0" - "To\0linux-aspeed@lists.ozlabs.org\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 + Andrew Jeffery <andrew@aj.id.au> + Rick Altherr <raltherr@google.com> + Brendan Higgins <brendanhiggins@google.com> + " C\303\251dric Le Goater <clg@kaod.org>" + " linux-aspeed@lists.ozlabs.org\0" "\00:1\0" "b\0" "We try to keep the nodes in address order. The ADC node was out of\n" @@ -26,7 +37,7 @@ " \t\t\t\t};\n" " \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" @@ -34,7 +45,7 @@ "+\t\t\t\tstatus = \"disabled\";\n" "+\t\t\t};\n" "+\n" - " \t\t\tsram at 1e720000 {\n" + " \t\t\tsram@1e720000 {\n" " \t\t\t\tcompatible = \"mmio-sram\";\n" " \t\t\t\treg = <0x1e720000 0x8000>;\t// 32K\n" "@@ -227,14 +235,6 @@\n" @@ -42,7 +53,7 @@ " \t\t\t\tstatus = \"disabled\";\n" " \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" @@ -60,7 +71,7 @@ " \t\t\t\treg-io-width = <4>;\n" " \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" @@ -68,7 +79,7 @@ "+\t\t\t\tstatus = \"disabled\";\n" "+\t\t\t};\n" "+\n" - " \t\t\tsram at 1e720000 {\n" + " \t\t\tsram@1e720000 {\n" " \t\t\t\tcompatible = \"mmio-sram\";\n" " \t\t\t\treg = <0x1e720000 0x9000>;\t// 36K\n" "@@ -307,14 +315,6 @@\n" @@ -76,7 +87,7 @@ " \t\t\t\tstatus = \"disabled\";\n" " \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" @@ -89,4 +100,4 @@ "-- \n" 2.14.1 -34a3276cc4b7e1ce0372f7f4d0f5accab86c4ae8b8cde8a93028b9e671c3c0a4 +4d195a95c54d2c1e185155e2a3cd0741f78a73705385c92030121d40fd1ecbf3
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.