All of lore.kernel.org
 help / color / mirror / Atom feed

diff for duplicates of <326baa8029706ba6fbba9dd40f2310f718bfab4b.1419812186.git.horms+renesas@verge.net.au>

diff --git a/a/1.txt b/N1/1.txt
index c0fa414..15afddd 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -35,13 +35,13 @@ index baca8f8..c98cd14 100644
 +		stdout-path = &scifa0;
  	};
  
- 	memory@40000000 {
+ 	memory at 40000000 {
 @@ -30,7 +35,27 @@
  		reg = <2 0x00000000 0 0x40000000>;
  	};
  
--	ape6evm_fixed_3v3: fixedregulator@0 {
-+	vcc_mmc0: regulator@0 {
+-	ape6evm_fixed_3v3: fixedregulator at 0 {
++	vcc_mmc0: regulator at 0 {
 +		compatible = "regulator-fixed";
 +		regulator-name = "MMC0 Vcc";
 +		regulator-min-microvolt = <2800000>;
@@ -49,7 +49,7 @@ index baca8f8..c98cd14 100644
 +		regulator-always-on;
 +	};
 +
-+	vcc_sdhi0: regulator@1 {
++	vcc_sdhi0: regulator at 1 {
 +		compatible = "regulator-fixed";
 +
 +		regulator-name = "SDHI0 Vcc";
@@ -61,7 +61,7 @@ index baca8f8..c98cd14 100644
 +	};
 +
 +	/* Common 3.3V rail, used by several devices on APE6EVM */
-+	ape6evm_fixed_3v3: regulator@2 {
++	ape6evm_fixed_3v3: regulator at 2 {
  		compatible = "regulator-fixed";
  		regulator-name = "3V3";
  		regulator-min-microvolt = <3300000>;
@@ -74,7 +74,7 @@ index baca8f8..c98cd14 100644
  		#size-cells = <1>;
 +		ranges = <0 0 0 0x20000000>;
  
- 		ethernet@8000000 {
+ 		ethernet at 8000000 {
  			compatible = "smsc,lan9220", "smsc,lan9115";
 @@ -79,3 +106,64 @@
  	>;
diff --git a/a/content_digest b/N1/content_digest
index 020dda8..9ab958f 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,13 +2,13 @@
   "ref\0cover.1419812185.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 24/30] ARM: shmobile: ape6evm: synchronize dts with reference platform\0"
 ]
 [
-  "Date\0Mon, 29 Dec 2014 01:43:55 +0000\0"
+  "Date\0Mon, 29 Dec 2014 10:43:55 +0900\0"
 ]
 [
   "To\0linux-arm-kernel\@lists.infradead.org\0"
@@ -57,13 +57,13 @@
   "+\t\tstdout-path = &scifa0;\n",
   " \t};\n",
   " \n",
-  " \tmemory\@40000000 {\n",
+  " \tmemory at 40000000 {\n",
   "\@\@ -30,7 +35,27 \@\@\n",
   " \t\treg = <2 0x00000000 0 0x40000000>;\n",
   " \t};\n",
   " \n",
-  "-\tape6evm_fixed_3v3: fixedregulator\@0 {\n",
-  "+\tvcc_mmc0: regulator\@0 {\n",
+  "-\tape6evm_fixed_3v3: fixedregulator at 0 {\n",
+  "+\tvcc_mmc0: regulator at 0 {\n",
   "+\t\tcompatible = \"regulator-fixed\";\n",
   "+\t\tregulator-name = \"MMC0 Vcc\";\n",
   "+\t\tregulator-min-microvolt = <2800000>;\n",
@@ -71,7 +71,7 @@
   "+\t\tregulator-always-on;\n",
   "+\t};\n",
   "+\n",
-  "+\tvcc_sdhi0: regulator\@1 {\n",
+  "+\tvcc_sdhi0: regulator at 1 {\n",
   "+\t\tcompatible = \"regulator-fixed\";\n",
   "+\n",
   "+\t\tregulator-name = \"SDHI0 Vcc\";\n",
@@ -83,7 +83,7 @@
   "+\t};\n",
   "+\n",
   "+\t/* Common 3.3V rail, used by several devices on APE6EVM */\n",
-  "+\tape6evm_fixed_3v3: regulator\@2 {\n",
+  "+\tape6evm_fixed_3v3: regulator at 2 {\n",
   " \t\tcompatible = \"regulator-fixed\";\n",
   " \t\tregulator-name = \"3V3\";\n",
   " \t\tregulator-min-microvolt = <3300000>;\n",
@@ -96,7 +96,7 @@
   " \t\t#size-cells = <1>;\n",
   "+\t\tranges = <0 0 0 0x20000000>;\n",
   " \n",
-  " \t\tethernet\@8000000 {\n",
+  " \t\tethernet at 8000000 {\n",
   " \t\t\tcompatible = \"smsc,lan9220\", \"smsc,lan9115\";\n",
   "\@\@ -79,3 +106,64 \@\@\n",
   " \t>;\n",
@@ -167,4 +167,4 @@
   "2.1.3"
 ]
 
-87e2a744a5b0ce99e06f07b4dfae871dc01c18602ed24eb4c939d1eb2ac5ca2e
+e0f64c1cdeefbf161dcd6eed21cc92149250fd394c53be3c2b3c041b7082b78b
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.