diff for duplicates of <20180618045902.11453-5-benh@kernel.crashing.org> diff --git a/a/content_digest b/N1/content_digest index 4d8d0f0..90212bd 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 4/4] arm: dts: Update AST2400 device-tree\0" "Date\0Mon, 18 Jun 2018 14:59:02 +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" @@ -43,4 +43,4 @@ "-- \n" 2.17.1 -06446b6985fdc177a457658144c884e32a078288c399ccf843de40d00d14ad57 +ae314a9c4de8ee9c422e1c2a4ae910ae94f8aeb59fce6356477e1bb091cae6cd
diff --git a/a/1.txt b/N2/1.txt index fbf8b66..0993a95 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -15,21 +15,21 @@ index 75df1573380e..b1a19f99a4c9 100644 reg = <0x1e6c0080 0x80>; }; -+ cvic: copro-interrupt-controller at 1e6c2000 { ++ cvic: copro-interrupt-controller@1e6c2000 { + compatible = "aspeed,ast2400-cvic", "aspeed-cvic"; + valid-sources = <0x7fffffff>; + reg = <0x1e6c2000 0x80>; + }; + - mac0: ethernet at 1e660000 { + mac0: ethernet@1e660000 { compatible = "aspeed,ast2400-mac", "faraday,ftgmac100"; reg = <0x1e660000 0x180>; @@ -161,7 +167,7 @@ status = "disabled"; }; -- sram at 1e720000 { -+ sram: sram at 1e720000 { +- sram@1e720000 { ++ sram: sram@1e720000 { compatible = "mmio-sram"; reg = <0x1e720000 0x8000>; // 32K }; diff --git a/a/content_digest b/N2/content_digest index 4d8d0f0..e28329d 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 4/4] arm: dts: Update AST2400 device-tree\0" "Date\0Mon, 18 Jun 2018 14:59:02 +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,25 +27,25 @@ " \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,ast2400-cvic\", \"aspeed-cvic\";\n" "+\t\t\tvalid-sources = <0x7fffffff>;\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,ast2400-mac\", \"faraday,ftgmac100\";\n" " \t\t\treg = <0x1e660000 0x180>;\n" "@@ -161,7 +167,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 0x8000>;\t// 32K\n" " \t\t\t};\n" "-- \n" 2.17.1 -06446b6985fdc177a457658144c884e32a078288c399ccf843de40d00d14ad57 +b747731d348be2468d4a3712fad5b027a37b50269272f42a718cb9bf6ad749d1
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.