diff for duplicates of <20180716144206.30985-21-miquel.raynal@bootlin.com>
diff --git a/a/1.txt b/N1/1.txt
index 2b93f1e..cb96122 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -14,17 +14,17 @@ index 4f2a704615b0..45662fc09d18 100644
};
};
-- ap_thermal: thermal@6f808c {
+- ap_thermal: thermal at 6f808c {
- compatible = "marvell,armada-ap806-thermal";
- reg = <0x6f808c 0x4>,
- <0x6f8084 0x8>;
-+ ap_syscon1: system-controller@6f8000 {
++ ap_syscon1: system-controller at 6f8000 {
+ compatible = "syscon", "simple-mfd";
+ reg = <0x6f8000 0x1000>;
+ #address-cells = <1>;
+ #size-cells = <1>;
+
-+ ap_thermal: thermal-sensor@80 {
++ ap_thermal: thermal-sensor at 80 {
+ compatible = "marvell,armada-ap806-thermal";
+ reg = <0x80 0x10>;
+ };
@@ -39,32 +39,32 @@ index ab31ba20aa2a..1b813a95149c 100644
interrupts = <77 IRQ_TYPE_LEVEL_HIGH>;
};
-- CP110_LABEL(thermal): thermal@400078 {
+- CP110_LABEL(thermal): thermal at 400078 {
- compatible = "marvell,armada-cp110-thermal";
- reg = <0x400078 0x4>,
- <0x400070 0x8>;
- };
-
- CP110_LABEL(syscon0): system-controller@440000 {
+ CP110_LABEL(syscon0): system-controller at 440000 {
compatible = "syscon", "simple-mfd";
reg = <0x440000 0x2000>;
@@ -223,6 +217,18 @@
};
};
-+ CP110_LABEL(syscon1): system-controller@400000 {
++ CP110_LABEL(syscon1): system-controller at 400000 {
+ compatible = "syscon", "simple-mfd";
+ reg = <0x400000 0x1000>;
+ #address-cells = <1>;
+ #size-cells = <1>;
+
-+ CP110_LABEL(thermal): thermal-sensor@70 {
++ CP110_LABEL(thermal): thermal-sensor at 70 {
+ compatible = "marvell,armada-cp110-thermal";
+ reg = <0x70 0x10>;
+ };
+ };
+
- CP110_LABEL(usb3_0): usb3@500000 {
+ CP110_LABEL(usb3_0): usb3 at 500000 {
compatible = "marvell,armada-8k-xhci",
"generic-xhci";
--
diff --git a/a/content_digest b/N1/content_digest
index 23715e1..c60d751 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,7 +2,7 @@
"ref\00020180716144206.30985-1-miquel.raynal\@bootlin.com\0"
]
[
- "From\0Miquel Raynal <miquel.raynal\@bootlin.com>\0"
+ "From\0miquel.raynal\@bootlin.com (Miquel Raynal)\0"
]
[
"Subject\0[PATCH v3 20/23] arm64: dts: marvell: move AP806/CP110 thermal nodes into a new syscon\0"
@@ -11,27 +11,7 @@
"Date\0Mon, 16 Jul 2018 16:42:03 +0200\0"
]
[
- "To\0Gregory Clement <gregory.clement\@bootlin.com>",
- " Jason Cooper <jason\@lakedaemon.net>",
- " Andrew Lunn <andrew\@lunn.ch>",
- " Sebastian Hesselbarth <sebastian.hesselbarth\@gmail.com>",
- " Zhang Rui <rui.zhang\@intel.com>",
- " Eduardo Valentin <edubezval\@gmail.com>\0"
-]
-[
- "Cc\0Mark Rutland <mark.rutland\@arm.com>",
- " devicetree\@vger.kernel.org",
- " linux-pm\@vger.kernel.org",
- " Antoine Tenart <antoine.tenart\@bootlin.com>",
- " Catalin Marinas <catalin.marinas\@arm.com>",
- " Will Deacon <will.deacon\@arm.com>",
- " Maxime Chevallier <maxime.chevallier\@bootlin.com>",
- " Nadav Haklai <nadavh\@marvell.com>",
- " David Sniatkiwicz <davidsn\@marvell.com>",
- " Rob Herring <robh+dt\@kernel.org>",
- " Thomas Petazzoni <thomas.petazzoni\@bootlin.com>",
- " Miquel Raynal <miquel.raynal\@bootlin.com>",
- " linux-arm-kernel\@lists.infradead.org\0"
+ "To\0linux-arm-kernel\@lists.infradead.org\0"
]
[
"\0000:1\0"
@@ -56,17 +36,17 @@
" \t\t\t\t};\n",
" \t\t\t};\n",
" \n",
- "-\t\t\tap_thermal: thermal\@6f808c {\n",
+ "-\t\t\tap_thermal: thermal at 6f808c {\n",
"-\t\t\t\tcompatible = \"marvell,armada-ap806-thermal\";\n",
"-\t\t\t\treg = <0x6f808c 0x4>,\n",
"-\t\t\t\t <0x6f8084 0x8>;\n",
- "+\t\t\tap_syscon1: system-controller\@6f8000 {\n",
+ "+\t\t\tap_syscon1: system-controller at 6f8000 {\n",
"+\t\t\t\tcompatible = \"syscon\", \"simple-mfd\";\n",
"+\t\t\t\treg = <0x6f8000 0x1000>;\n",
"+\t\t\t\t#address-cells = <1>;\n",
"+\t\t\t\t#size-cells = <1>;\n",
"+\n",
- "+\t\t\t\tap_thermal: thermal-sensor\@80 {\n",
+ "+\t\t\t\tap_thermal: thermal-sensor at 80 {\n",
"+\t\t\t\t\tcompatible = \"marvell,armada-ap806-thermal\";\n",
"+\t\t\t\t\treg = <0x80 0x10>;\n",
"+\t\t\t\t};\n",
@@ -81,36 +61,36 @@
" \t\t\tinterrupts = <77 IRQ_TYPE_LEVEL_HIGH>;\n",
" \t\t};\n",
" \n",
- "-\t\tCP110_LABEL(thermal): thermal\@400078 {\n",
+ "-\t\tCP110_LABEL(thermal): thermal at 400078 {\n",
"-\t\t\tcompatible = \"marvell,armada-cp110-thermal\";\n",
"-\t\t\treg = <0x400078 0x4>,\n",
"-\t\t\t<0x400070 0x8>;\n",
"-\t\t};\n",
"-\n",
- " \t\tCP110_LABEL(syscon0): system-controller\@440000 {\n",
+ " \t\tCP110_LABEL(syscon0): system-controller at 440000 {\n",
" \t\t\tcompatible = \"syscon\", \"simple-mfd\";\n",
" \t\t\treg = <0x440000 0x2000>;\n",
"\@\@ -223,6 +217,18 \@\@\n",
" \t\t\t};\n",
" \t\t};\n",
" \n",
- "+\t\tCP110_LABEL(syscon1): system-controller\@400000 {\n",
+ "+\t\tCP110_LABEL(syscon1): system-controller at 400000 {\n",
"+\t\t\tcompatible = \"syscon\", \"simple-mfd\";\n",
"+\t\t\treg = <0x400000 0x1000>;\n",
"+\t\t\t#address-cells = <1>;\n",
"+\t\t\t#size-cells = <1>;\n",
"+\n",
- "+\t\t\tCP110_LABEL(thermal): thermal-sensor\@70 {\n",
+ "+\t\t\tCP110_LABEL(thermal): thermal-sensor at 70 {\n",
"+\t\t\t\tcompatible = \"marvell,armada-cp110-thermal\";\n",
"+\t\t\t\treg = <0x70 0x10>;\n",
"+\t\t\t};\n",
"+\t\t};\n",
"+\n",
- " \t\tCP110_LABEL(usb3_0): usb3\@500000 {\n",
+ " \t\tCP110_LABEL(usb3_0): usb3 at 500000 {\n",
" \t\t\tcompatible = \"marvell,armada-8k-xhci\",\n",
" \t\t\t\"generic-xhci\";\n",
"-- \n",
"2.14.1"
]
-fabe6005b3d053016a25cc64937914e2b45eae467e48e6612faf05fde9f46b79
+84a95333444e4d91c7344739391845277bbbeeef1b54e4699ab0287246bf19ac
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.