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

diff for duplicates of <ee9141522dcf13f861ed3cef6490c6cbfaafefb9.1403487225.git.horms+renesas@verge.net.au>

diff --git a/a/1.txt b/N1/1.txt
index e1e148d..8ba2bd8 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -16,7 +16,7 @@ index f3b6219..380d058 100644
  				"rcan1", "rcan0", "qspi_mod", "i2c5", "i2c6", "i2c4", "i2c3", "i2c2",
  				"i2c1", "i2c0";
  		};
-+		mstp10_clks: mstp10_clks@e6150998 {
++		mstp10_clks: mstp10_clks at e6150998 {
 +			compatible = "renesas,r8a7791-mstp-clocks", "renesas,cpg-mstp-clocks";
 +			reg = <0 0xe6150998 0 4>, <0 0xe61509a8 0 4>;
 +			clocks = <&p_clk>,
@@ -40,7 +40,8 @@ index f3b6219..380d058 100644
 +				R8A7791_CLK_SCU_SRC9 R8A7791_CLK_SCU_SRC8 R8A7791_CLK_SCU_SRC7 R8A7791_CLK_SCU_SRC6 R8A7791_CLK_SCU_SRC5
 +				R8A7791_CLK_SCU_SRC4 R8A7791_CLK_SCU_SRC3 R8A7791_CLK_SCU_SRC2 R8A7791_CLK_SCU_SRC1 R8A7791_CLK_SCU_SRC0
 +			>;
-+			clock-output-names +				"ssi-all",
++			clock-output-names =
++				"ssi-all",
 +				"ssi9", "ssi8", "ssi7", "ssi6", "ssi5",
 +				"ssi4", "ssi3", "ssi2", "ssi1", "ssi0",
 +				"scu-all",
@@ -48,7 +49,7 @@ index f3b6219..380d058 100644
 +				"scu-src9", "scu-src8", "scu-src7", "scu-src6", "scu-src5",
 +				"scu-src4", "scu-src3", "scu-src2", "scu-src1", "scu-src0";
 +		};
- 		mstp11_clks: mstp11_clks@e615099c {
+ 		mstp11_clks: mstp11_clks at e615099c {
  			compatible = "renesas,r8a7791-mstp-clocks", "renesas,cpg-mstp-clocks";
  			reg = <0 0xe615099c 0 4>, <0 0xe61509ac 0 4>;
 diff --git a/include/dt-bindings/clock/r8a7791-clock.h b/include/dt-bindings/clock/r8a7791-clock.h
diff --git a/a/content_digest b/N1/content_digest
index 95c64e6..d494483 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,13 +2,13 @@
   "ref\0cover.1403487225.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 20/29] ARM: shmobile: r8a7791: add MSTP10 support on DTSI\0"
 ]
 [
-  "Date\0Mon, 23 Jun 2014 02:28:29 +0000\0"
+  "Date\0Mon, 23 Jun 2014 11:28:29 +0900\0"
 ]
 [
   "To\0linux-arm-kernel\@lists.infradead.org\0"
@@ -38,7 +38,7 @@
   " \t\t\t\t\"rcan1\", \"rcan0\", \"qspi_mod\", \"i2c5\", \"i2c6\", \"i2c4\", \"i2c3\", \"i2c2\",\n",
   " \t\t\t\t\"i2c1\", \"i2c0\";\n",
   " \t\t};\n",
-  "+\t\tmstp10_clks: mstp10_clks\@e6150998 {\n",
+  "+\t\tmstp10_clks: mstp10_clks at e6150998 {\n",
   "+\t\t\tcompatible = \"renesas,r8a7791-mstp-clocks\", \"renesas,cpg-mstp-clocks\";\n",
   "+\t\t\treg = <0 0xe6150998 0 4>, <0 0xe61509a8 0 4>;\n",
   "+\t\t\tclocks = <&p_clk>,\n",
@@ -62,7 +62,8 @@
   "+\t\t\t\tR8A7791_CLK_SCU_SRC9 R8A7791_CLK_SCU_SRC8 R8A7791_CLK_SCU_SRC7 R8A7791_CLK_SCU_SRC6 R8A7791_CLK_SCU_SRC5\n",
   "+\t\t\t\tR8A7791_CLK_SCU_SRC4 R8A7791_CLK_SCU_SRC3 R8A7791_CLK_SCU_SRC2 R8A7791_CLK_SCU_SRC1 R8A7791_CLK_SCU_SRC0\n",
   "+\t\t\t>;\n",
-  "+\t\t\tclock-output-names +\t\t\t\t\"ssi-all\",\n",
+  "+\t\t\tclock-output-names =\n",
+  "+\t\t\t\t\"ssi-all\",\n",
   "+\t\t\t\t\"ssi9\", \"ssi8\", \"ssi7\", \"ssi6\", \"ssi5\",\n",
   "+\t\t\t\t\"ssi4\", \"ssi3\", \"ssi2\", \"ssi1\", \"ssi0\",\n",
   "+\t\t\t\t\"scu-all\",\n",
@@ -70,7 +71,7 @@
   "+\t\t\t\t\"scu-src9\", \"scu-src8\", \"scu-src7\", \"scu-src6\", \"scu-src5\",\n",
   "+\t\t\t\t\"scu-src4\", \"scu-src3\", \"scu-src2\", \"scu-src1\", \"scu-src0\";\n",
   "+\t\t};\n",
-  " \t\tmstp11_clks: mstp11_clks\@e615099c {\n",
+  " \t\tmstp11_clks: mstp11_clks at e615099c {\n",
   " \t\t\tcompatible = \"renesas,r8a7791-mstp-clocks\", \"renesas,cpg-mstp-clocks\";\n",
   " \t\t\treg = <0 0xe615099c 0 4>, <0 0xe61509ac 0 4>;\n",
   "diff --git a/include/dt-bindings/clock/r8a7791-clock.h b/include/dt-bindings/clock/r8a7791-clock.h\n",
@@ -114,4 +115,4 @@
   "2.0.0.rc2"
 ]
 
-1d3e163ac9ff2c57861ac7ff872e6f53e3cc8c2149c8ed4815e3ec512b2d53c3
+4a1f4d17e6fa1d554a662f16d393b5fcf1afd39001061c559641162fbf841454
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.