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

diff for duplicates of <e4d2fd9eb43d12e9b6a7ab842bf6986b4dd75a1d.1415059587.git.horms+renesas@verge.net.au>

diff --git a/a/1.txt b/N1/1.txt
index 6adb941..e7eb746 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -23,7 +23,7 @@ index 1c58ce0..98c1b8b 100644
   * Copyright (C) 2014 Cogent Embedded Inc.
   *
 @@ -977,17 +977,18 @@
- 		mstp1_clks: mstp1_clks@e6150134 {
+ 		mstp1_clks: mstp1_clks at e6150134 {
  			compatible = "renesas,r8a7791-mstp-clocks", "renesas,cpg-mstp-clocks";
  			reg = <0 0xe6150134 0 4>, <0 0xe6150038 0 4>;
 -			clocks = <&m2_clk>, <&p_clk>, <&p_clk>, <&p_clk>, <&rclk_clk>,
@@ -37,12 +37,13 @@ index 1c58ce0..98c1b8b 100644
  				R8A7791_CLK_CMT0 R8A7791_CLK_TMU0 R8A7791_CLK_VSP1_DU1
  				R8A7791_CLK_VSP1_DU0 R8A7791_CLK_VSP1_S
  			>;
- 			clock-output-names -				"jpu", "tmu1", "tmu3", "tmu2", "cmt0", "tmu0", "vsp1-du1",
+ 			clock-output-names =
+-				"jpu", "tmu1", "tmu3", "tmu2", "cmt0", "tmu0", "vsp1-du1",
 -				"vsp1-du0", "vsp1-sy";
 +				"jpu", "tmu1", "3dg", "tmu3", "tmu2", "cmt0", "tmu0",
 +				"vsp1-du1", "vsp1-du0", "vsp1-sy";
  		};
- 		mstp2_clks: mstp2_clks@e6150138 {
+ 		mstp2_clks: mstp2_clks at e6150138 {
  			compatible = "renesas,r8a7791-mstp-clocks", "renesas,cpg-mstp-clocks";
 diff --git a/include/dt-bindings/clock/r8a7791-clock.h b/include/dt-bindings/clock/r8a7791-clock.h
 index 58c3f49..9570b7c 100644
diff --git a/a/content_digest b/N1/content_digest
index e446f54..a4dd875 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,13 +2,13 @@
   "ref\0cover.1415059587.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 12/34] ARM: shmobile: r8a7791: Add SGX clock to device tree\0"
 ]
 [
-  "Date\0Tue, 04 Nov 2014 01:50:42 +0000\0"
+  "Date\0Tue,  4 Nov 2014 10:50:42 +0900\0"
 ]
 [
   "To\0linux-arm-kernel\@lists.infradead.org\0"
@@ -45,7 +45,7 @@
   "  * Copyright (C) 2014 Cogent Embedded Inc.\n",
   "  *\n",
   "\@\@ -977,17 +977,18 \@\@\n",
-  " \t\tmstp1_clks: mstp1_clks\@e6150134 {\n",
+  " \t\tmstp1_clks: mstp1_clks at e6150134 {\n",
   " \t\t\tcompatible = \"renesas,r8a7791-mstp-clocks\", \"renesas,cpg-mstp-clocks\";\n",
   " \t\t\treg = <0 0xe6150134 0 4>, <0 0xe6150038 0 4>;\n",
   "-\t\t\tclocks = <&m2_clk>, <&p_clk>, <&p_clk>, <&p_clk>, <&rclk_clk>,\n",
@@ -59,12 +59,13 @@
   " \t\t\t\tR8A7791_CLK_CMT0 R8A7791_CLK_TMU0 R8A7791_CLK_VSP1_DU1\n",
   " \t\t\t\tR8A7791_CLK_VSP1_DU0 R8A7791_CLK_VSP1_S\n",
   " \t\t\t>;\n",
-  " \t\t\tclock-output-names -\t\t\t\t\"jpu\", \"tmu1\", \"tmu3\", \"tmu2\", \"cmt0\", \"tmu0\", \"vsp1-du1\",\n",
+  " \t\t\tclock-output-names =\n",
+  "-\t\t\t\t\"jpu\", \"tmu1\", \"tmu3\", \"tmu2\", \"cmt0\", \"tmu0\", \"vsp1-du1\",\n",
   "-\t\t\t\t\"vsp1-du0\", \"vsp1-sy\";\n",
   "+\t\t\t\t\"jpu\", \"tmu1\", \"3dg\", \"tmu3\", \"tmu2\", \"cmt0\", \"tmu0\",\n",
   "+\t\t\t\t\"vsp1-du1\", \"vsp1-du0\", \"vsp1-sy\";\n",
   " \t\t};\n",
-  " \t\tmstp2_clks: mstp2_clks\@e6150138 {\n",
+  " \t\tmstp2_clks: mstp2_clks at e6150138 {\n",
   " \t\t\tcompatible = \"renesas,r8a7791-mstp-clocks\", \"renesas,cpg-mstp-clocks\";\n",
   "diff --git a/include/dt-bindings/clock/r8a7791-clock.h b/include/dt-bindings/clock/r8a7791-clock.h\n",
   "index 58c3f49..9570b7c 100644\n",
@@ -82,4 +83,4 @@
   "2.1.1"
 ]
 
-2903bfba4ac0d68ebe23c8dbe40257d9eef1472b6d18ec70e0176c0fd922e162
+6f55ba39ac264841ede81322d647bf13d13768fb41445b8e32946f4ab038f7e6
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.