diff for duplicates of <2b06f1087062c516ac2851ce5038fdb035b19d4d.1447981420.git.horms+renesas@verge.net.au>
diff --git a/a/1.txt b/N1/1.txt
index 6568971..283e5f4 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -59,17 +59,17 @@ index 655d1804e5e9..000000000000
- stdout-path = &scif0;
- };
-
-- memory@40000000 {
+- memory at 40000000 {
- device_type = "memory";
- reg = <0 0x40000000 0 0x40000000>;
- };
-
-- memory@200000000 {
+- memory at 200000000 {
- device_type = "memory";
- reg = <2 0x00000000 0 0x40000000>;
- };
-
-- vcc_sdhi0: regulator@0 {
+- vcc_sdhi0: regulator at 0 {
- compatible = "regulator-fixed";
-
- regulator-name = "SDHI0 Vcc";
@@ -78,7 +78,7 @@ index 655d1804e5e9..000000000000
- regulator-always-on;
- };
-
-- vccq_sdhi0: regulator@1 {
+- vccq_sdhi0: regulator at 1 {
- compatible = "regulator-gpio";
-
- regulator-name = "SDHI0 VccQ";
@@ -91,7 +91,7 @@ index 655d1804e5e9..000000000000
- 1800000 0>;
- };
-
-- vcc_sdhi2: regulator@2 {
+- vcc_sdhi2: regulator at 2 {
- compatible = "regulator-fixed";
-
- regulator-name = "SDHI2 Vcc";
@@ -100,7 +100,7 @@ index 655d1804e5e9..000000000000
- regulator-always-on;
- };
-
-- vccq_sdhi2: regulator@3 {
+- vccq_sdhi2: regulator at 3 {
- compatible = "regulator-gpio";
-
- regulator-name = "SDHI2 VccQ";
@@ -196,7 +196,7 @@ index 655d1804e5e9..000000000000
- renesas,ether-link-active-low;
- status = "okay";
-
-- phy1: ethernet-phy@1 {
+- phy1: ethernet-phy at 1 {
- reg = <1>;
- interrupt-parent = <&irqc0>;
- interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
@@ -236,7 +236,7 @@ index 655d1804e5e9..000000000000
- status = "okay";
- clock-frequency = <400000>;
-
-- composite-in@20 {
+- composite-in at 20 {
- compatible = "adi,adv7180";
- reg = <0x20>;
- remote = <&vin0>;
@@ -256,7 +256,7 @@ index 655d1804e5e9..000000000000
-
- status = "okay";
-
-- flash@0 {
+- flash at 0 {
- #address-cells = <1>;
- #size-cells = <1>;
- compatible = "spansion,s25fl512s", "jedec,spi-nor";
@@ -266,17 +266,17 @@ index 655d1804e5e9..000000000000
- spi-rx-bus-width = <4>;
- m25p,fast-read;
-
-- partition@0 {
+- partition at 0 {
- label = "loader_prg";
- reg = <0x00000000 0x00040000>;
- read-only;
- };
-- partition@40000 {
+- partition at 40000 {
- label = "user_prg";
- reg = <0x00040000 0x00400000>;
- read-only;
- };
-- partition@440000 {
+- partition at 440000 {
- label = "flash_fs";
- reg = <0x00440000 0x03bc0000>;
- };
@@ -289,7 +289,7 @@ index 655d1804e5e9..000000000000
-
- status = "okay";
-
-- pmic@0 {
+- pmic at 0 {
- compatible = "renesas,r2a11302ft";
- reg = <0>;
- spi-max-frequency = <6000000>;
diff --git a/a/content_digest b/N1/content_digest
index 6641505..735b9d0 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,13 +2,13 @@
"ref\0cover.1447981420.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 11/29] ARM: shmobile: henninger: remove board DT\0"
]
[
- "Date\0Fri, 20 Nov 2015 01:05:18 +0000\0"
+ "Date\0Thu, 19 Nov 2015 17:05:18 -0800\0"
]
[
"To\0linux-arm-kernel\@lists.infradead.org\0"
@@ -81,17 +81,17 @@
"-\t\tstdout-path = &scif0;\n",
"-\t};\n",
"-\n",
- "-\tmemory\@40000000 {\n",
+ "-\tmemory at 40000000 {\n",
"-\t\tdevice_type = \"memory\";\n",
"-\t\treg = <0 0x40000000 0 0x40000000>;\n",
"-\t};\n",
"-\n",
- "-\tmemory\@200000000 {\n",
+ "-\tmemory at 200000000 {\n",
"-\t\tdevice_type = \"memory\";\n",
"-\t\treg = <2 0x00000000 0 0x40000000>;\n",
"-\t};\n",
"-\n",
- "-\tvcc_sdhi0: regulator\@0 {\n",
+ "-\tvcc_sdhi0: regulator at 0 {\n",
"-\t\tcompatible = \"regulator-fixed\";\n",
"-\n",
"-\t\tregulator-name = \"SDHI0 Vcc\";\n",
@@ -100,7 +100,7 @@
"-\t\tregulator-always-on;\n",
"-\t};\n",
"-\n",
- "-\tvccq_sdhi0: regulator\@1 {\n",
+ "-\tvccq_sdhi0: regulator at 1 {\n",
"-\t\tcompatible = \"regulator-gpio\";\n",
"-\n",
"-\t\tregulator-name = \"SDHI0 VccQ\";\n",
@@ -113,7 +113,7 @@
"-\t\t\t 1800000 0>;\n",
"-\t};\n",
"-\n",
- "-\tvcc_sdhi2: regulator\@2 {\n",
+ "-\tvcc_sdhi2: regulator at 2 {\n",
"-\t\tcompatible = \"regulator-fixed\";\n",
"-\n",
"-\t\tregulator-name = \"SDHI2 Vcc\";\n",
@@ -122,7 +122,7 @@
"-\t\tregulator-always-on;\n",
"-\t};\n",
"-\n",
- "-\tvccq_sdhi2: regulator\@3 {\n",
+ "-\tvccq_sdhi2: regulator at 3 {\n",
"-\t\tcompatible = \"regulator-gpio\";\n",
"-\n",
"-\t\tregulator-name = \"SDHI2 VccQ\";\n",
@@ -218,7 +218,7 @@
"-\trenesas,ether-link-active-low;\n",
"-\tstatus = \"okay\";\n",
"-\n",
- "-\tphy1: ethernet-phy\@1 {\n",
+ "-\tphy1: ethernet-phy at 1 {\n",
"-\t\treg = <1>;\n",
"-\t\tinterrupt-parent = <&irqc0>;\n",
"-\t\tinterrupts = <0 IRQ_TYPE_LEVEL_LOW>;\n",
@@ -258,7 +258,7 @@
"-\tstatus = \"okay\";\n",
"-\tclock-frequency = <400000>;\n",
"-\n",
- "-\tcomposite-in\@20 {\n",
+ "-\tcomposite-in at 20 {\n",
"-\t\tcompatible = \"adi,adv7180\";\n",
"-\t\treg = <0x20>;\n",
"-\t\tremote = <&vin0>;\n",
@@ -278,7 +278,7 @@
"-\n",
"-\tstatus = \"okay\";\n",
"-\n",
- "-\tflash\@0 {\n",
+ "-\tflash at 0 {\n",
"-\t\t#address-cells = <1>;\n",
"-\t\t#size-cells = <1>;\n",
"-\t\tcompatible = \"spansion,s25fl512s\", \"jedec,spi-nor\";\n",
@@ -288,17 +288,17 @@
"-\t\tspi-rx-bus-width = <4>;\n",
"-\t\tm25p,fast-read;\n",
"-\n",
- "-\t\tpartition\@0 {\n",
+ "-\t\tpartition at 0 {\n",
"-\t\t\tlabel = \"loader_prg\";\n",
"-\t\t\treg = <0x00000000 0x00040000>;\n",
"-\t\t\tread-only;\n",
"-\t\t};\n",
- "-\t\tpartition\@40000 {\n",
+ "-\t\tpartition at 40000 {\n",
"-\t\t\tlabel = \"user_prg\";\n",
"-\t\t\treg = <0x00040000 0x00400000>;\n",
"-\t\t\tread-only;\n",
"-\t\t};\n",
- "-\t\tpartition\@440000 {\n",
+ "-\t\tpartition at 440000 {\n",
"-\t\t\tlabel = \"flash_fs\";\n",
"-\t\t\treg = <0x00440000 0x03bc0000>;\n",
"-\t\t};\n",
@@ -311,7 +311,7 @@
"-\n",
"-\tstatus = \"okay\";\n",
"-\n",
- "-\tpmic\@0 {\n",
+ "-\tpmic at 0 {\n",
"-\t\tcompatible = \"renesas,r2a11302ft\";\n",
"-\t\treg = <0>;\n",
"-\t\tspi-max-frequency = <6000000>;\n",
@@ -377,4 +377,4 @@
"2.1.4"
]
-fec139faa6bdae600567dd961b0827f7171ea88fcdec55055882e7683bf7626e
+b75913d85302d3b04563efb85c214b8d1cb1683367826a254dd238d5cad4f1de
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.