diff for duplicates of <3ab84ee95ba4e28b30fd8ec7c38f5e9f72c4b4b7.1415059587.git.horms+renesas@verge.net.au>
diff --git a/a/1.txt b/N1/1.txt
index 3b15338..b949ca8 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -4,7 +4,7 @@ This clock drives the INTCA irqpin controller modules.
Before, it was assumed enabled by the bootloader or reset state.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
-Cc: devicetree@vger.kernel.org
+Cc: devicetree at vger.kernel.org
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7740.dtsi | 14 ++++++++++----
@@ -46,9 +46,9 @@ index d46c213..502483f 100644
+ clocks = <&mstp2_clks R8A7740_CLK_INTCA>;
};
- ether: ethernet@e9a00000 {
+ ether: ethernet at e9a00000 {
@@ -448,8 +452,8 @@
- mstp2_clks: mstp2_clks@e6150138 {
+ mstp2_clks: mstp2_clks at e6150138 {
compatible = "renesas,r8a7740-mstp-clocks", "renesas,cpg-mstp-clocks";
reg = <0xe6150138 4>, <0xe6150040 4>;
- clocks = <&sub_clk>, <&sub_clk>,
@@ -71,7 +71,8 @@ index d46c213..502483f 100644
@@ -467,7 +472,8 @@
R8A7740_CLK_SCIFA4
>;
- clock-output-names - "scifa6", "scifa7", "dmac1", "dmac2", "dmac3",
+ clock-output-names =
+- "scifa6", "scifa7", "dmac1", "dmac2", "dmac3",
+ "scifa6", "intca",
+ "scifa7", "dmac1", "dmac2", "dmac3",
"usbdmac", "scifa5", "scifb", "scifa0", "scifa1",
diff --git a/a/content_digest b/N1/content_digest
index 294885c..64065e5 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 01/34] ARM: shmobile: r8a7740 dtsi: Add missing INTCA clock for irqpin module\0"
]
[
- "Date\0Tue, 04 Nov 2014 01:50:31 +0000\0"
+ "Date\0Tue, 4 Nov 2014 10:50:31 +0900\0"
]
[
"To\0linux-arm-kernel\@lists.infradead.org\0"
@@ -26,7 +26,7 @@
"Before, it was assumed enabled by the bootloader or reset state.\n",
"\n",
"Signed-off-by: Geert Uytterhoeven <geert+renesas\@glider.be>\n",
- "Cc: devicetree\@vger.kernel.org\n",
+ "Cc: devicetree at vger.kernel.org\n",
"Signed-off-by: Simon Horman <horms+renesas\@verge.net.au>\n",
"---\n",
" arch/arm/boot/dts/r8a7740.dtsi | 14 ++++++++++----\n",
@@ -68,9 +68,9 @@
"+\t\tclocks = <&mstp2_clks R8A7740_CLK_INTCA>;\n",
" \t};\n",
" \n",
- " \tether: ethernet\@e9a00000 {\n",
+ " \tether: ethernet at e9a00000 {\n",
"\@\@ -448,8 +452,8 \@\@\n",
- " \t\tmstp2_clks: mstp2_clks\@e6150138 {\n",
+ " \t\tmstp2_clks: mstp2_clks at e6150138 {\n",
" \t\t\tcompatible = \"renesas,r8a7740-mstp-clocks\", \"renesas,cpg-mstp-clocks\";\n",
" \t\t\treg = <0xe6150138 4>, <0xe6150040 4>;\n",
"-\t\t\tclocks = <&sub_clk>, <&sub_clk>,\n",
@@ -93,7 +93,8 @@
"\@\@ -467,7 +472,8 \@\@\n",
" \t\t\t\tR8A7740_CLK_SCIFA4\n",
" \t\t\t>;\n",
- " \t\t\tclock-output-names -\t\t\t\t\"scifa6\", \"scifa7\", \"dmac1\", \"dmac2\", \"dmac3\",\n",
+ " \t\t\tclock-output-names =\n",
+ "-\t\t\t\t\"scifa6\", \"scifa7\", \"dmac1\", \"dmac2\", \"dmac3\",\n",
"+\t\t\t\t\"scifa6\", \"intca\",\n",
"+\t\t\t\t\"scifa7\", \"dmac1\", \"dmac2\", \"dmac3\",\n",
" \t\t\t\t\"usbdmac\", \"scifa5\", \"scifb\", \"scifa0\", \"scifa1\",\n",
@@ -115,4 +116,4 @@
"2.1.1"
]
-487033cf9ff827b34f07923b827dab4f61f99333f194a13c1dff9c2136580a0e
+cdf9cde863e15eb5e687f669ddb8e6d141068e9a7fc4ce68161132f5420ce8f9
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.