diff for duplicates of <ffa967e24c5817b48a3d5ecea2c12b9cdd807f0c.1536828567.git.horms+renesas@verge.net.au>
diff --git a/a/1.txt b/N1/1.txt
index 4089210..eb542c2 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -34,7 +34,7 @@ index c099053cf5fe..d58e9f2c9883 100644
status = "disabled";
};
-+ pcie_phy: pcie-phy@e65d0000 {
++ pcie_phy: pcie-phy at e65d0000 {
+ compatible = "renesas,r8a77980-pcie-phy";
+ reg = <0 0xe65d0000 0 0x8000>;
+ #phy-cells = <0>;
@@ -44,14 +44,14 @@ index c099053cf5fe..d58e9f2c9883 100644
+ status = "disabled";
+ };
+
- canfd: can@e66c0000 {
+ canfd: can at e66c0000 {
compatible = "renesas,r8a77980-canfd",
"renesas,rcar-gen3-canfd";
@@ -1047,6 +1064,38 @@
resets = <&cpg 408>;
};
-+ pciec: pcie@fe000000 {
++ pciec: pcie at fe000000 {
+ compatible = "renesas,pcie-r8a77980",
+ "renesas,pcie-rcar-gen3";
+ reg = <0 0xfe000000 0 0x80000>;
@@ -83,7 +83,7 @@ index c099053cf5fe..d58e9f2c9883 100644
+ status = "disabled";
+ };
+
- vspd0: vsp@fea20000 {
+ vspd0: vsp at fea20000 {
compatible = "renesas,vsp2";
reg = <0 0xfea20000 0 0x5000>;
--
diff --git a/a/content_digest b/N1/content_digest
index c62ef05..0ece30a 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,7 +2,7 @@
"ref\0cover.1536828567.git.horms+renesas\@verge.net.au\0"
]
[
- "From\0Simon Horman <horms+renesas\@verge.net.au>\0"
+ "From\0horms+renesas\@verge.net.au (Simon Horman)\0"
]
[
"Subject\0[PATCH 40/58] arm64: dts: renesas: r8a77980: add PCIe support\0"
@@ -11,14 +11,7 @@
"Date\0Thu, 13 Sep 2018 11:09:35 +0200\0"
]
[
- "To\0linux-renesas-soc\@vger.kernel.org\0"
-]
-[
- "Cc\0linux-arm-kernel\@lists.infradead.org",
- " Magnus Damm <magnus.damm\@gmail.com>",
- " Sergei Shtylyov <sergei.shtylyov\@cogentembedded.com>",
- " Vladimir Barinov <vladimir.barinov\@cogentembedded.com>",
- " Simon Horman <horms+renesas\@verge.net.au>\0"
+ "To\0linux-arm-kernel\@lists.infradead.org\0"
]
[
"\0000:1\0"
@@ -63,7 +56,7 @@
" \t\t\tstatus = \"disabled\";\n",
" \t\t};\n",
" \n",
- "+\t\tpcie_phy: pcie-phy\@e65d0000 {\n",
+ "+\t\tpcie_phy: pcie-phy at e65d0000 {\n",
"+\t\t\tcompatible = \"renesas,r8a77980-pcie-phy\";\n",
"+\t\t\treg = <0 0xe65d0000 0 0x8000>;\n",
"+\t\t\t#phy-cells = <0>;\n",
@@ -73,14 +66,14 @@
"+\t\t\tstatus = \"disabled\";\n",
"+\t\t};\n",
"+\n",
- " \t\tcanfd: can\@e66c0000 {\n",
+ " \t\tcanfd: can at e66c0000 {\n",
" \t\t\tcompatible = \"renesas,r8a77980-canfd\",\n",
" \t\t\t\t \"renesas,rcar-gen3-canfd\";\n",
"\@\@ -1047,6 +1064,38 \@\@\n",
" \t\t\tresets = <&cpg 408>;\n",
" \t\t};\n",
" \n",
- "+\t\tpciec: pcie\@fe000000 {\n",
+ "+\t\tpciec: pcie at fe000000 {\n",
"+\t\t\tcompatible = \"renesas,pcie-r8a77980\",\n",
"+\t\t\t\t \"renesas,pcie-rcar-gen3\";\n",
"+\t\t\treg = <0 0xfe000000 0 0x80000>;\n",
@@ -112,11 +105,11 @@
"+\t\t\tstatus = \"disabled\";\n",
"+\t\t};\n",
"+\n",
- " \t\tvspd0: vsp\@fea20000 {\n",
+ " \t\tvspd0: vsp at fea20000 {\n",
" \t\t\tcompatible = \"renesas,vsp2\";\n",
" \t\t\treg = <0 0xfea20000 0 0x5000>;\n",
"-- \n",
"2.11.0"
]
-71ae27ad88706c0ed8e64a4096f4061d91aa7cd43d56ceefab279275fbfaf261
+1837fcbed7c8ca4da3f01eb7f31b5fa1971343fea01cd205e65becdf9f30157c
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.