diff for duplicates of <1575566112-11658-9-git-send-email-eajames@linux.ibm.com> diff --git a/a/1.txt b/N1/1.txt index 1a0b2a7..14ad1e9 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -25,7 +25,7 @@ index df44022..6a83cd2 100644 @@ -48,7 +49,7 @@ }; - edac: sdram at 1e6e0000 { + edac: sdram@1e6e0000 { - compatible = "aspeed,ast2500-sdram-edac"; + compatible = "aspeed,ast2500-sdram-edac", "syscon"; reg = <0x1e6e0000 0x174>; @@ -35,7 +35,7 @@ index df44022..6a83cd2 100644 interrupts = <0x19>; }; -+ xdma: xdma at 1e6e7000 { ++ xdma: xdma@1e6e7000 { + compatible = "aspeed,ast2500-xdma"; + reg = <0x1e6e7000 0x100>; + clocks = <&syscon ASPEED_CLK_GATE_BCLK>; @@ -47,7 +47,7 @@ index df44022..6a83cd2 100644 + status = "disabled"; + }; + - adc: adc at 1e6e9000 { + adc: adc@1e6e9000 { compatible = "aspeed,ast2500-adc"; reg = <0x1e6e9000 0xb0>; -- diff --git a/a/content_digest b/N1/content_digest index 8ca6845..d970cb0 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,16 @@ "From\0Eddie James <eajames@linux.ibm.com>\0" "Subject\0[PATCH v2 08/12] ARM: dts: aspeed: ast2500: Add XDMA Engine\0" "Date\0Thu, 5 Dec 2019 11:15:08 -0600\0" - "To\0linux-aspeed@lists.ozlabs.org\0" + "To\0linux-kernel@vger.kernel.org\0" + "Cc\0devicetree@vger.kernel.org" + jason@lakedaemon.net + linux-aspeed@lists.ozlabs.org + maz@kernel.org + robh+dt@kernel.org + tglx@linutronix.de + mark.rutland@arm.com + joel@jms.id.au + " andrew@aj.id.au\0" "\00:1\0" "b\0" "Add a node for the XDMA engine with all the necessary information. Also\n" @@ -32,7 +41,7 @@ "@@ -48,7 +49,7 @@\n" " \t};\n" " \n" - " \tedac: sdram at 1e6e0000 {\n" + " \tedac: sdram@1e6e0000 {\n" "-\t\tcompatible = \"aspeed,ast2500-sdram-edac\";\n" "+\t\tcompatible = \"aspeed,ast2500-sdram-edac\", \"syscon\";\n" " \t\treg = <0x1e6e0000 0x174>;\n" @@ -42,7 +51,7 @@ " \t\t\t\tinterrupts = <0x19>;\n" " \t\t\t};\n" " \n" - "+\t\t\txdma: xdma at 1e6e7000 {\n" + "+\t\t\txdma: xdma@1e6e7000 {\n" "+\t\t\t\tcompatible = \"aspeed,ast2500-xdma\";\n" "+\t\t\t\treg = <0x1e6e7000 0x100>;\n" "+\t\t\t\tclocks = <&syscon ASPEED_CLK_GATE_BCLK>;\n" @@ -54,10 +63,10 @@ "+\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" "-- \n" 1.8.3.1 -f6a1e3c9510f9090f865d3a8cec9082f548b4860fa912b80be5ddfcf1e136952 +529a9aea3aaadf92049a67a36f3a91cdcdf7971136e2faa8818fc2fb700067e0
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.