diff for duplicates of <20200402194955.16643-6-eajames@linux.ibm.com> diff --git a/a/1.txt b/N1/1.txt index 635e203..939914f 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -10,7 +10,7 @@ diff --git a/arch/arm/boot/dts/aspeed-g6.dtsi b/arch/arm/boot/dts/aspeed-g6.dtsi index 1ffc15177b79..65e2826fddb6 100644 --- a/arch/arm/boot/dts/aspeed-g6.dtsi +++ b/arch/arm/boot/dts/aspeed-g6.dtsi -@@ -342,7 +342,8 @@ xdma: xdma at 1e6e7000 { +@@ -342,7 +342,8 @@ xdma: xdma@1e6e7000 { compatible = "aspeed,ast2600-xdma"; reg = <0x1e6e7000 0x100>; clocks = <&syscon ASPEED_CLK_GATE_BCLK>; diff --git a/a/content_digest b/N1/content_digest index b19942e..70eb7ef 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,6 +3,12 @@ "Subject\0[PATCH v7 5/5] ARM: dts: Aspeed: AST2600: Add XDMA PCI-E root control reset\0" "Date\0Thu, 2 Apr 2020 14:49:55 -0500\0" "To\0linux-aspeed@lists.ozlabs.org\0" + "Cc\0linux-kernel@vger.kernel.org" + devicetree@vger.kernel.org + robh+dt@kernel.org + joel@jms.id.au + andrew@aj.id.au + " eajames@linux.ibm.com\0" "\00:1\0" "b\0" "The AST2600 XDMA engine requires the PCI-E root control reset be cleared\n" @@ -17,7 +23,7 @@ "index 1ffc15177b79..65e2826fddb6 100644\n" "--- a/arch/arm/boot/dts/aspeed-g6.dtsi\n" "+++ b/arch/arm/boot/dts/aspeed-g6.dtsi\n" - "@@ -342,7 +342,8 @@ xdma: xdma at 1e6e7000 {\n" + "@@ -342,7 +342,8 @@ xdma: xdma@1e6e7000 {\n" " \t\t\t\tcompatible = \"aspeed,ast2600-xdma\";\n" " \t\t\t\treg = <0x1e6e7000 0x100>;\n" " \t\t\t\tclocks = <&syscon ASPEED_CLK_GATE_BCLK>;\n" @@ -30,4 +36,4 @@ "-- \n" 2.24.0 -23af6b797e933c4949b0c5f807b1a786b6c7463fcca780962d8ad907005f398d +aa243d851479690525ca0606a981b6b1eacec69756bcf70eeb5373cfca8f2670
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.