diff for duplicates of <1494503934-23367-2-git-send-email-geert+renesas@glider.be>
diff --git a/a/1.txt b/N1/1.txt
index d75fa8b..dde0b02 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -67,7 +67,7 @@ index 0000000000000000..a0ba7bd21ea3aa18
+#include "r8a7795.dtsi"
+
+&soc {
-+ xhci1: usb@ee0400000 {
++ xhci1: usb at ee0400000 {
+ compatible = "renesas,xhci-r8a7795", "renesas,rcar-gen3-xhci";
+ reg = <0 0xee040000 0 0xc00>;
+ interrupts = <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>;
@@ -77,7 +77,7 @@ index 0000000000000000..a0ba7bd21ea3aa18
+ status = "disabled";
+ };
+
-+ fcpf2: fcp@fe952000 {
++ fcpf2: fcp at fe952000 {
+ compatible = "renesas,fcpf";
+ reg = <0 0xfe952000 0 0x200>;
+ clocks = <&cpg CPG_MOD 613>;
@@ -85,7 +85,7 @@ index 0000000000000000..a0ba7bd21ea3aa18
+ resets = <&cpg 613>;
+ };
+
-+ vspi2: vsp@fe9c0000 {
++ vspi2: vsp at fe9c0000 {
+ compatible = "renesas,vsp2";
+ reg = <0 0xfe9c0000 0 0x8000>;
+ interrupts = <GIC_SPI 446 IRQ_TYPE_LEVEL_HIGH>;
@@ -96,7 +96,7 @@ index 0000000000000000..a0ba7bd21ea3aa18
+ renesas,fcp = <&fcpvi2>;
+ };
+
-+ fcpvi2: fcp@fe9cf000 {
++ fcpvi2: fcp at fe9cf000 {
+ compatible = "renesas,fcpv";
+ reg = <0 0xfe9cf000 0 0x200>;
+ clocks = <&cpg CPG_MOD 609>;
@@ -104,7 +104,7 @@ index 0000000000000000..a0ba7bd21ea3aa18
+ resets = <&cpg 609>;
+ };
+
-+ vspd3: vsp@fea38000 {
++ vspd3: vsp at fea38000 {
+ compatible = "renesas,vsp2";
+ reg = <0 0xfea38000 0 0x4000>;
+ interrupts = <GIC_SPI 469 IRQ_TYPE_LEVEL_HIGH>;
@@ -115,7 +115,7 @@ index 0000000000000000..a0ba7bd21ea3aa18
+ renesas,fcp = <&fcpvd3>;
+ };
+
-+ fcpvd3: fcp@fea3f000 {
++ fcpvd3: fcp at fea3f000 {
+ compatible = "renesas,fcpv";
+ reg = <0 0xfea3f000 0 0x200>;
+ clocks = <&cpg CPG_MOD 600>;
@@ -123,7 +123,7 @@ index 0000000000000000..a0ba7bd21ea3aa18
+ resets = <&cpg 600>;
+ };
+
-+ fdp1@fe948000 {
++ fdp1 at fe948000 {
+ compatible = "renesas,fdp1";
+ reg = <0 0xfe948000 0 0x2400>;
+ interrupts = <GIC_SPI 264 IRQ_TYPE_LEVEL_HIGH>;
@@ -155,7 +155,7 @@ index a1fbf0ab8ad8e425..95fe207cb6a3fd2f 100644
+ model = "Renesas H3ULCB board based on r8a7795 ES1.x";
compatible = "renesas,h3ulcb", "renesas,r8a7795";
- memory@48000000 {
+ memory at 48000000 {
diff --git a/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts b/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts
index 52fce67df3413f1f..be5b2e966ea1700e 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts
@@ -173,7 +173,7 @@ index 52fce67df3413f1f..be5b2e966ea1700e 100644
+ model = "Renesas Salvator-X board based on r8a7795 ES1.x";
compatible = "renesas,salvator-x", "renesas,r8a7795";
- memory@48000000 {
+ memory at 48000000 {
diff --git a/arch/arm64/boot/dts/renesas/r8a7795.dtsi b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
index 7d87dff70ac84c40..e2c447cc12fe7f3a 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795.dtsi
@@ -191,7 +191,7 @@ index 7d87dff70ac84c40..e2c447cc12fe7f3a 100644
status = "disabled";
};
-- xhci1: usb@ee0400000 {
+- xhci1: usb at ee0400000 {
- compatible = "renesas,xhci-r8a7795", "renesas,rcar-gen3-xhci";
- reg = <0 0xee040000 0 0xc00>;
- interrupts = <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>;
@@ -201,14 +201,14 @@ index 7d87dff70ac84c40..e2c447cc12fe7f3a 100644
- status = "disabled";
- };
-
- usb_dmac0: dma-controller@e65a0000 {
+ usb_dmac0: dma-controller at e65a0000 {
compatible = "renesas,r8a7795-usb-dmac",
"renesas,usb-dmac";
@@ -1568,14 +1558,6 @@
resets = <&cpg 614>;
};
-- fcpf2: fcp@fe952000 {
+- fcpf2: fcp at fe952000 {
- compatible = "renesas,fcpf";
- reg = <0 0xfe952000 0 0x200>;
- clocks = <&cpg CPG_MOD 613>;
@@ -216,14 +216,14 @@ index 7d87dff70ac84c40..e2c447cc12fe7f3a 100644
- resets = <&cpg 613>;
- };
-
- vspbd: vsp@fe960000 {
+ vspbd: vsp at fe960000 {
compatible = "renesas,vsp2";
reg = <0 0xfe960000 0 0x8000>;
@@ -1633,25 +1615,6 @@
resets = <&cpg 610>;
};
-- vspi2: vsp@fe9c0000 {
+- vspi2: vsp at fe9c0000 {
- compatible = "renesas,vsp2";
- reg = <0 0xfe9c0000 0 0x8000>;
- interrupts = <GIC_SPI 446 IRQ_TYPE_LEVEL_HIGH>;
@@ -234,7 +234,7 @@ index 7d87dff70ac84c40..e2c447cc12fe7f3a 100644
- renesas,fcp = <&fcpvi2>;
- };
-
-- fcpvi2: fcp@fe9cf000 {
+- fcpvi2: fcp at fe9cf000 {
- compatible = "renesas,fcpv";
- reg = <0 0xfe9cf000 0 0x200>;
- clocks = <&cpg CPG_MOD 609>;
@@ -242,14 +242,14 @@ index 7d87dff70ac84c40..e2c447cc12fe7f3a 100644
- resets = <&cpg 609>;
- };
-
- vspd0: vsp@fea20000 {
+ vspd0: vsp at fea20000 {
compatible = "renesas,vsp2";
reg = <0 0xfea20000 0 0x4000>;
@@ -1709,25 +1672,6 @@
resets = <&cpg 601>;
};
-- vspd3: vsp@fea38000 {
+- vspd3: vsp at fea38000 {
- compatible = "renesas,vsp2";
- reg = <0 0xfea38000 0 0x4000>;
- interrupts = <GIC_SPI 469 IRQ_TYPE_LEVEL_HIGH>;
@@ -260,7 +260,7 @@ index 7d87dff70ac84c40..e2c447cc12fe7f3a 100644
- renesas,fcp = <&fcpvd3>;
- };
-
-- fcpvd3: fcp@fea3f000 {
+- fcpvd3: fcp at fea3f000 {
- compatible = "renesas,fcpv";
- reg = <0 0xfea3f000 0 0x200>;
- clocks = <&cpg CPG_MOD 600>;
@@ -268,14 +268,14 @@ index 7d87dff70ac84c40..e2c447cc12fe7f3a 100644
- resets = <&cpg 600>;
- };
-
- fdp1@fe940000 {
+ fdp1 at fe940000 {
compatible = "renesas,fdp1";
reg = <0 0xfe940000 0 0x2400>;
@@ -1748,18 +1692,7 @@
renesas,fcp = <&fcpf1>;
};
-- fdp1@fe948000 {
+- fdp1 at fe948000 {
- compatible = "renesas,fdp1";
- reg = <0 0xfe948000 0 0x2400>;
- interrupts = <GIC_SPI 264 IRQ_TYPE_LEVEL_HIGH>;
@@ -285,7 +285,7 @@ index 7d87dff70ac84c40..e2c447cc12fe7f3a 100644
- renesas,fcp = <&fcpf2>;
- };
-
- du: display@feb00000 {
+ du: display at feb00000 {
- compatible = "renesas,du-r8a7795";
reg = <0 0xfeb00000 0 0x80000>,
<0 0xfeb90000 0 0x14>;
diff --git a/a/content_digest b/N1/content_digest
index 1eed252..218443c 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,7 +2,7 @@
"ref\0001494503934-23367-1-git-send-email-geert+renesas\@glider.be\0"
]
[
- "From\0Geert Uytterhoeven <geert+renesas\@glider.be>\0"
+ "From\0geert+renesas\@glider.be (Geert Uytterhoeven)\0"
]
[
"Subject\0[PATCH v3 1/3] arm64: dts: r8a7795: Add support for R-Car H3 ES2.0\0"
@@ -11,18 +11,7 @@
"Date\0Thu, 11 May 2017 13:58:52 +0200\0"
]
[
- "To\0Simon Horman <horms\@verge.net.au>",
- " Magnus Damm <magnus.damm\@gmail.com>\0"
-]
-[
- "Cc\0Yoshihiro Shimoda <yoshihiro.shimoda.uh\@renesas.com>",
- " Kuninori Morimoto <kuninori.morimoto.gx\@renesas.com>",
- " Laurent Pinchart <laurent.pinchart\@ideasonboard.com>",
- " Wolfram Sang <wsa+renesas\@sang-engineering.com>",
- " Sjoerd Simons <sjoerd.simons\@collabora.co.uk>",
- " linux-renesas-soc\@vger.kernel.org",
- " linux-arm-kernel\@lists.infradead.org",
- " Geert Uytterhoeven <geert+renesas\@glider.be>\0"
+ "To\0linux-arm-kernel\@lists.infradead.org\0"
]
[
"\0000:1\0"
@@ -100,7 +89,7 @@
"+#include \"r8a7795.dtsi\"\n",
"+\n",
"+&soc {\n",
- "+\txhci1: usb\@ee0400000 {\n",
+ "+\txhci1: usb at ee0400000 {\n",
"+\t\tcompatible = \"renesas,xhci-r8a7795\", \"renesas,rcar-gen3-xhci\";\n",
"+\t\treg = <0 0xee040000 0 0xc00>;\n",
"+\t\tinterrupts = <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>;\n",
@@ -110,7 +99,7 @@
"+\t\tstatus = \"disabled\";\n",
"+\t};\n",
"+\n",
- "+\tfcpf2: fcp\@fe952000 {\n",
+ "+\tfcpf2: fcp at fe952000 {\n",
"+\t\tcompatible = \"renesas,fcpf\";\n",
"+\t\treg = <0 0xfe952000 0 0x200>;\n",
"+\t\tclocks = <&cpg CPG_MOD 613>;\n",
@@ -118,7 +107,7 @@
"+\t\tresets = <&cpg 613>;\n",
"+\t};\n",
"+\n",
- "+\tvspi2: vsp\@fe9c0000 {\n",
+ "+\tvspi2: vsp at fe9c0000 {\n",
"+\t\tcompatible = \"renesas,vsp2\";\n",
"+\t\treg = <0 0xfe9c0000 0 0x8000>;\n",
"+\t\tinterrupts = <GIC_SPI 446 IRQ_TYPE_LEVEL_HIGH>;\n",
@@ -129,7 +118,7 @@
"+\t\trenesas,fcp = <&fcpvi2>;\n",
"+\t};\n",
"+\n",
- "+\tfcpvi2: fcp\@fe9cf000 {\n",
+ "+\tfcpvi2: fcp at fe9cf000 {\n",
"+\t\tcompatible = \"renesas,fcpv\";\n",
"+\t\treg = <0 0xfe9cf000 0 0x200>;\n",
"+\t\tclocks = <&cpg CPG_MOD 609>;\n",
@@ -137,7 +126,7 @@
"+\t\tresets = <&cpg 609>;\n",
"+\t};\n",
"+\n",
- "+\tvspd3: vsp\@fea38000 {\n",
+ "+\tvspd3: vsp at fea38000 {\n",
"+\t\tcompatible = \"renesas,vsp2\";\n",
"+\t\treg = <0 0xfea38000 0 0x4000>;\n",
"+\t\tinterrupts = <GIC_SPI 469 IRQ_TYPE_LEVEL_HIGH>;\n",
@@ -148,7 +137,7 @@
"+\t\trenesas,fcp = <&fcpvd3>;\n",
"+\t};\n",
"+\n",
- "+\tfcpvd3: fcp\@fea3f000 {\n",
+ "+\tfcpvd3: fcp at fea3f000 {\n",
"+\t\tcompatible = \"renesas,fcpv\";\n",
"+\t\treg = <0 0xfea3f000 0 0x200>;\n",
"+\t\tclocks = <&cpg CPG_MOD 600>;\n",
@@ -156,7 +145,7 @@
"+\t\tresets = <&cpg 600>;\n",
"+\t};\n",
"+\n",
- "+\tfdp1\@fe948000 {\n",
+ "+\tfdp1 at fe948000 {\n",
"+\t\tcompatible = \"renesas,fdp1\";\n",
"+\t\treg = <0 0xfe948000 0 0x2400>;\n",
"+\t\tinterrupts = <GIC_SPI 264 IRQ_TYPE_LEVEL_HIGH>;\n",
@@ -188,7 +177,7 @@
"+\tmodel = \"Renesas H3ULCB board based on r8a7795 ES1.x\";\n",
" \tcompatible = \"renesas,h3ulcb\", \"renesas,r8a7795\";\n",
" \n",
- " \tmemory\@48000000 {\n",
+ " \tmemory at 48000000 {\n",
"diff --git a/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts b/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts\n",
"index 52fce67df3413f1f..be5b2e966ea1700e 100644\n",
"--- a/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts\n",
@@ -206,7 +195,7 @@
"+\tmodel = \"Renesas Salvator-X board based on r8a7795 ES1.x\";\n",
" \tcompatible = \"renesas,salvator-x\", \"renesas,r8a7795\";\n",
" \n",
- " \tmemory\@48000000 {\n",
+ " \tmemory at 48000000 {\n",
"diff --git a/arch/arm64/boot/dts/renesas/r8a7795.dtsi b/arch/arm64/boot/dts/renesas/r8a7795.dtsi\n",
"index 7d87dff70ac84c40..e2c447cc12fe7f3a 100644\n",
"--- a/arch/arm64/boot/dts/renesas/r8a7795.dtsi\n",
@@ -224,7 +213,7 @@
" \t\t\tstatus = \"disabled\";\n",
" \t\t};\n",
" \n",
- "-\t\txhci1: usb\@ee0400000 {\n",
+ "-\t\txhci1: usb at ee0400000 {\n",
"-\t\t\tcompatible = \"renesas,xhci-r8a7795\", \"renesas,rcar-gen3-xhci\";\n",
"-\t\t\treg = <0 0xee040000 0 0xc00>;\n",
"-\t\t\tinterrupts = <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>;\n",
@@ -234,14 +223,14 @@
"-\t\t\tstatus = \"disabled\";\n",
"-\t\t};\n",
"-\n",
- " \t\tusb_dmac0: dma-controller\@e65a0000 {\n",
+ " \t\tusb_dmac0: dma-controller at e65a0000 {\n",
" \t\t\tcompatible = \"renesas,r8a7795-usb-dmac\",\n",
" \t\t\t\t \"renesas,usb-dmac\";\n",
"\@\@ -1568,14 +1558,6 \@\@\n",
" \t\t\tresets = <&cpg 614>;\n",
" \t\t};\n",
" \n",
- "-\t\tfcpf2: fcp\@fe952000 {\n",
+ "-\t\tfcpf2: fcp at fe952000 {\n",
"-\t\t\tcompatible = \"renesas,fcpf\";\n",
"-\t\t\treg = <0 0xfe952000 0 0x200>;\n",
"-\t\t\tclocks = <&cpg CPG_MOD 613>;\n",
@@ -249,14 +238,14 @@
"-\t\t\tresets = <&cpg 613>;\n",
"-\t\t};\n",
"-\n",
- " \t\tvspbd: vsp\@fe960000 {\n",
+ " \t\tvspbd: vsp at fe960000 {\n",
" \t\t\tcompatible = \"renesas,vsp2\";\n",
" \t\t\treg = <0 0xfe960000 0 0x8000>;\n",
"\@\@ -1633,25 +1615,6 \@\@\n",
" \t\t\tresets = <&cpg 610>;\n",
" \t\t};\n",
" \n",
- "-\t\tvspi2: vsp\@fe9c0000 {\n",
+ "-\t\tvspi2: vsp at fe9c0000 {\n",
"-\t\t\tcompatible = \"renesas,vsp2\";\n",
"-\t\t\treg = <0 0xfe9c0000 0 0x8000>;\n",
"-\t\t\tinterrupts = <GIC_SPI 446 IRQ_TYPE_LEVEL_HIGH>;\n",
@@ -267,7 +256,7 @@
"-\t\t\trenesas,fcp = <&fcpvi2>;\n",
"-\t\t};\n",
"-\n",
- "-\t\tfcpvi2: fcp\@fe9cf000 {\n",
+ "-\t\tfcpvi2: fcp at fe9cf000 {\n",
"-\t\t\tcompatible = \"renesas,fcpv\";\n",
"-\t\t\treg = <0 0xfe9cf000 0 0x200>;\n",
"-\t\t\tclocks = <&cpg CPG_MOD 609>;\n",
@@ -275,14 +264,14 @@
"-\t\t\tresets = <&cpg 609>;\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 0x4000>;\n",
"\@\@ -1709,25 +1672,6 \@\@\n",
" \t\t\tresets = <&cpg 601>;\n",
" \t\t};\n",
" \n",
- "-\t\tvspd3: vsp\@fea38000 {\n",
+ "-\t\tvspd3: vsp at fea38000 {\n",
"-\t\t\tcompatible = \"renesas,vsp2\";\n",
"-\t\t\treg = <0 0xfea38000 0 0x4000>;\n",
"-\t\t\tinterrupts = <GIC_SPI 469 IRQ_TYPE_LEVEL_HIGH>;\n",
@@ -293,7 +282,7 @@
"-\t\t\trenesas,fcp = <&fcpvd3>;\n",
"-\t\t};\n",
"-\n",
- "-\t\tfcpvd3: fcp\@fea3f000 {\n",
+ "-\t\tfcpvd3: fcp at fea3f000 {\n",
"-\t\t\tcompatible = \"renesas,fcpv\";\n",
"-\t\t\treg = <0 0xfea3f000 0 0x200>;\n",
"-\t\t\tclocks = <&cpg CPG_MOD 600>;\n",
@@ -301,14 +290,14 @@
"-\t\t\tresets = <&cpg 600>;\n",
"-\t\t};\n",
"-\n",
- " \t\tfdp1\@fe940000 {\n",
+ " \t\tfdp1 at fe940000 {\n",
" \t\t\tcompatible = \"renesas,fdp1\";\n",
" \t\t\treg = <0 0xfe940000 0 0x2400>;\n",
"\@\@ -1748,18 +1692,7 \@\@\n",
" \t\t\trenesas,fcp = <&fcpf1>;\n",
" \t\t};\n",
" \n",
- "-\t\tfdp1\@fe948000 {\n",
+ "-\t\tfdp1 at fe948000 {\n",
"-\t\t\tcompatible = \"renesas,fdp1\";\n",
"-\t\t\treg = <0 0xfe948000 0 0x2400>;\n",
"-\t\t\tinterrupts = <GIC_SPI 264 IRQ_TYPE_LEVEL_HIGH>;\n",
@@ -318,7 +307,7 @@
"-\t\t\trenesas,fcp = <&fcpf2>;\n",
"-\t\t};\n",
"-\n",
- " \t\tdu: display\@feb00000 {\n",
+ " \t\tdu: display at feb00000 {\n",
"-\t\t\tcompatible = \"renesas,du-r8a7795\";\n",
" \t\t\treg = <0 0xfeb00000 0 0x80000>,\n",
" \t\t\t <0 0xfeb90000 0 0x14>;\n",
@@ -336,4 +325,4 @@
"2.7.4"
]
-58cb94b872da93d2af346828cca7ea9a50e8370fa98f44add0cc19732f74df0a
+288b67703879da1730c75544812befc2137b6517aa940ea2b09bb129bbcd519d
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.