diff for duplicates of <20180618045902.11453-4-benh@kernel.crashing.org> diff --git a/a/content_digest b/N1/content_digest index ed0e00d..626c8ce 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,8 @@ "ref\020180618045902.11453-1-benh@kernel.crashing.org\0" - "From\0Benjamin Herrenschmidt <benh@kernel.crashing.org>\0" + "From\0benh@kernel.crashing.org (Benjamin Herrenschmidt)\0" "Subject\0[PATCH v2 3/4] arm: dts: Update AST2500 device-tree\0" "Date\0Mon, 18 Jun 2018 14:59:01 +1000\0" - "To\0linux-aspeed@lists.ozlabs.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Add the missing node for the CVIC (the coprocessor interrupt\n" @@ -44,4 +44,4 @@ "-- \n" 2.17.1 -83153939b88e8775af659a58e9cb535f71b7917b73ad0f8b7d52720e9d9fabfb +2f9b93daaab33c8968b9e466c631de34323297fe9f649509a7acf8e3a00b308a
diff --git a/a/1.txt b/N2/1.txt index 5dbd2d9..327fd85 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -15,22 +15,22 @@ index 17f2714d18a7..21141ca1bfa4 100644 reg = <0x1e6c0080 0x80>; }; -+ cvic: copro-interrupt-controller at 1e6c2000 { ++ cvic: copro-interrupt-controller@1e6c2000 { + compatible = "aspeed,ast2500-cvic", "aspeed-cvic"; + valid-sources = <0xffffffff>; + copro-sw-interrupts = <1>; + reg = <0x1e6c2000 0x80>; + }; + - mac0: ethernet at 1e660000 { + mac0: ethernet@1e660000 { compatible = "aspeed,ast2500-mac", "faraday,ftgmac100"; reg = <0x1e660000 0x180>; @@ -211,7 +218,7 @@ status = "disabled"; }; -- sram at 1e720000 { -+ sram: sram at 1e720000 { +- sram@1e720000 { ++ sram: sram@1e720000 { compatible = "mmio-sram"; reg = <0x1e720000 0x9000>; // 36K }; diff --git a/a/content_digest b/N2/content_digest index ed0e00d..ed8a09b 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -2,7 +2,12 @@ "From\0Benjamin Herrenschmidt <benh@kernel.crashing.org>\0" "Subject\0[PATCH v2 3/4] arm: dts: Update AST2500 device-tree\0" "Date\0Mon, 18 Jun 2018 14:59:01 +1000\0" - "To\0linux-aspeed@lists.ozlabs.org\0" + "To\0Joel Stanley <joel@jms.id.au>\0" + "Cc\0Andrew Jeffery <andrew@aj.id.au>" + devicetree@vger.kernel.org + linux-arm-kernel@lists.infradead.org + linux-aspeed@lists.ozlabs.org + " Benjamin Herrenschmidt <benh@kernel.crashing.org>\0" "\00:1\0" "b\0" "Add the missing node for the CVIC (the coprocessor interrupt\n" @@ -22,26 +27,26 @@ " \t\t\treg = <0x1e6c0080 0x80>;\n" " \t\t};\n" " \n" - "+\t\tcvic: copro-interrupt-controller at 1e6c2000 {\n" + "+\t\tcvic: copro-interrupt-controller@1e6c2000 {\n" "+\t\t\tcompatible = \"aspeed,ast2500-cvic\", \"aspeed-cvic\";\n" "+\t\t\tvalid-sources = <0xffffffff>;\n" "+\t\t\tcopro-sw-interrupts = <1>;\n" "+\t\t\treg = <0x1e6c2000 0x80>;\n" "+\t\t};\n" "+\n" - " \t\tmac0: ethernet at 1e660000 {\n" + " \t\tmac0: ethernet@1e660000 {\n" " \t\t\tcompatible = \"aspeed,ast2500-mac\", \"faraday,ftgmac100\";\n" " \t\t\treg = <0x1e660000 0x180>;\n" "@@ -211,7 +218,7 @@\n" " \t\t\t\tstatus = \"disabled\";\n" " \t\t\t};\n" " \n" - "-\t\t\tsram at 1e720000 {\n" - "+\t\t\tsram: sram at 1e720000 {\n" + "-\t\t\tsram@1e720000 {\n" + "+\t\t\tsram: sram@1e720000 {\n" " \t\t\t\tcompatible = \"mmio-sram\";\n" " \t\t\t\treg = <0x1e720000 0x9000>;\t// 36K\n" " \t\t\t};\n" "-- \n" 2.17.1 -83153939b88e8775af659a58e9cb535f71b7917b73ad0f8b7d52720e9d9fabfb +50613ac85a6b5f9234c2b58f5a47fe9f15734be36cf9a129221cdd8a8cf458cb
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.