diff for duplicates of <20200109205903.27036-10-eajames@linux.ibm.com> diff --git a/a/1.txt b/N1/1.txt index 15884c8..27428b8 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -17,11 +17,11 @@ index 1c40c8f5b431..f3fb65982cfc 100644 / { model = "Aspeed BMC"; -@@ -259,6 +260,17 @@ gfx: display at 1e6e6000 { +@@ -259,6 +260,17 @@ gfx: display@1e6e6000 { interrupts = <0x19>; }; -+ xdma: xdma at 1e6e7000 { ++ xdma: xdma@1e6e7000 { + compatible = "aspeed,ast2500-xdma"; + reg = <0x1e6e7000 0x100>; + clocks = <&syscon ASPEED_CLK_GATE_BCLK>; @@ -32,7 +32,7 @@ index 1c40c8f5b431..f3fb65982cfc 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 38a3d4b..708c72f 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,6 +3,16 @@ "Subject\0[PATCH v5 09/12] ARM: dts: aspeed: ast2500: Add XDMA Engine\0" "Date\0Thu, 9 Jan 2020 14:59:00 -0600\0" "To\0linux-aspeed@lists.ozlabs.org\0" + "Cc\0linux-kernel@vger.kernel.org" + devicetree@vger.kernel.org + mark.rutland@arm.com + jason@lakedaemon.net + maz@kernel.org + robh+dt@kernel.org + tglx@linutronix.de + joel@jms.id.au + andrew@aj.id.au + " eajames@linux.ibm.com\0" "\00:1\0" "b\0" "Add a node for the XDMA engine with all the necessary information.\n" @@ -24,11 +34,11 @@ " \n" " / {\n" " \tmodel = \"Aspeed BMC\";\n" - "@@ -259,6 +260,17 @@ gfx: display at 1e6e6000 {\n" + "@@ -259,6 +260,17 @@ gfx: display@1e6e6000 {\n" " \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" @@ -39,10 +49,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" 2.24.0 -07b505c8bca591c10f3747e297b3dd5776e7ad875fe91883f7470419b6cff82d +e916cfc6bb1907c92f56cd8374440481bbcbf9ba09a76313fbf1cf04aef96d89
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.