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

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

diff --git a/a/1.txt b/N1/1.txt
index f439526..728cdf3 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -16,7 +16,7 @@ index c376676..8f78da5 100644
  			#clock-cells = <0>;
  			clock-output-names = "sd2";
  		};
-+		mmc0_clk: mmc0_clk@e6150240 {
++		mmc0_clk: mmc0_clk at e6150240 {
 +			compatible = "renesas,r8a7794-div6-clock", "renesas,cpg-div6-clock";
 +			reg = <0 0xe6150240 0 4>;
 +			clocks = <&pll1_div2_clk>;
@@ -40,11 +40,12 @@ index c376676..8f78da5 100644
 +				R8A7794_CLK_MMCIF0 R8A7794_CLK_CMT1
 +				R8A7794_CLK_USBDMAC0 R8A7794_CLK_USBDMAC1
  			>;
- 			clock-output-names  			        "sdhi2", "sdhi1", "sdhi0",
+ 			clock-output-names =
+ 			        "sdhi2", "sdhi1", "sdhi0",
 -				"cmt1", "usbdmac0", "usbdmac1";
 +				"mmcif0", "cmt1", "usbdmac0", "usbdmac1";
  		};
- 		mstp7_clks: mstp7_clks@e615014c {
+ 		mstp7_clks: mstp7_clks at e615014c {
  			compatible = "renesas,r8a7794-mstp-clocks", "renesas,cpg-mstp-clocks";
 diff --git a/include/dt-bindings/clock/r8a7794-clock.h b/include/dt-bindings/clock/r8a7794-clock.h
 index ccd5667..d633230 100644
diff --git a/a/content_digest b/N1/content_digest
index 5d4f762..8002bfd 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 22/30] ARM: shmobile: r8a7794: Add MMCIF clock to device tree\0"
 ]
 [
-  "Date\0Mon, 29 Dec 2014 01:43:53 +0000\0"
+  "Date\0Mon, 29 Dec 2014 10:43:53 +0900\0"
 ]
 [
   "To\0linux-arm-kernel\@lists.infradead.org\0"
@@ -38,7 +38,7 @@
   " \t\t\t#clock-cells = <0>;\n",
   " \t\t\tclock-output-names = \"sd2\";\n",
   " \t\t};\n",
-  "+\t\tmmc0_clk: mmc0_clk\@e6150240 {\n",
+  "+\t\tmmc0_clk: mmc0_clk at e6150240 {\n",
   "+\t\t\tcompatible = \"renesas,r8a7794-div6-clock\", \"renesas,cpg-div6-clock\";\n",
   "+\t\t\treg = <0 0xe6150240 0 4>;\n",
   "+\t\t\tclocks = <&pll1_div2_clk>;\n",
@@ -62,11 +62,12 @@
   "+\t\t\t\tR8A7794_CLK_MMCIF0 R8A7794_CLK_CMT1\n",
   "+\t\t\t\tR8A7794_CLK_USBDMAC0 R8A7794_CLK_USBDMAC1\n",
   " \t\t\t>;\n",
-  " \t\t\tclock-output-names  \t\t\t        \"sdhi2\", \"sdhi1\", \"sdhi0\",\n",
+  " \t\t\tclock-output-names =\n",
+  " \t\t\t        \"sdhi2\", \"sdhi1\", \"sdhi0\",\n",
   "-\t\t\t\t\"cmt1\", \"usbdmac0\", \"usbdmac1\";\n",
   "+\t\t\t\t\"mmcif0\", \"cmt1\", \"usbdmac0\", \"usbdmac1\";\n",
   " \t\t};\n",
-  " \t\tmstp7_clks: mstp7_clks\@e615014c {\n",
+  " \t\tmstp7_clks: mstp7_clks at e615014c {\n",
   " \t\t\tcompatible = \"renesas,r8a7794-mstp-clocks\", \"renesas,cpg-mstp-clocks\";\n",
   "diff --git a/include/dt-bindings/clock/r8a7794-clock.h b/include/dt-bindings/clock/r8a7794-clock.h\n",
   "index ccd5667..d633230 100644\n",
@@ -84,4 +85,4 @@
   "2.1.3"
 ]
 
-3e7b99075ebea338a7531dbc00ec366212841b18153456eafadc28d170ad0e72
+6480a2f46f02f33b0c5cc80e07a1461735c6f05f21155f192bb875377087f64c
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.