diff for duplicates of <2582481.JJAGzpNFcA@avalon> diff --git a/a/1.txt b/N1/1.txt index f14764b..b33a64b 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -49,7 +49,7 @@ On Tuesday 26 November 2013 16:32:06 Simon Horman wrote: > + ranges; > + > + /* Special CPG clocks */ -> + cpg_clocks: cpg_clocks@0xe6150000 { +> + cpg_clocks: cpg_clocks at 0xe6150000 { > + compatible = "renesas,r8a7779-cpg-clocks"; > + reg = <0 0xe6150000 0 0x1000>; > + #clock-cells = <1>; @@ -125,7 +125,8 @@ s/SCIF6/SCIF5/ (and in 04/17 as well) ? > + R8A7779_CLK_I2C3 R8A7779_CLK_I2C2 R8A7779_CLK_I2C1 > + R8A7779_CLK_I2C0 > + >; -> + clock-output-names > + "hspi0", "hspi1", "hspi2", +> + clock-output-names = +> + "hspi0", "hspi1", "hspi2", > + "tmu0", "tmu1", "tmu2", > + "scif6", "scif4", "scif3", @@ -156,7 +157,8 @@ R8A7779_CLK_P>, > + R8A7779_CLK_VIN1 R8A7779_CLK_VIN0 > + R8A7779_CLK_SATA R8A7779_CLK_VIN3 > + >; -> + clock-output-names > + "ehci0", "ohci0", +> + clock-output-names = +> + "ehci0", "ohci0", > + "ehci1", "ohci1", > + "du", "vin2", > + "vin1", "vin0", @@ -186,7 +188,8 @@ R8A7779_CLK_P>, That's for MSTP1, not MSTP3. > + >; -> + clock-output-names > + "ehci0", "ohci0", +> + clock-output-names = +> + "ehci0", "ohci0", > + "ehci1", "ohci1", > + "du", "vin2", > + "vin1", "vin0", diff --git a/a/content_digest b/N1/content_digest index d2b366f..c16c9b7 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,8 @@ "ref\01385451139-29686-1-git-send-email-horms+renesas@verge.net.au\0" "ref\01385451139-29686-5-git-send-email-horms+renesas@verge.net.au\0" - "From\0Laurent Pinchart <laurent.pinchart@ideasonboard.com>\0" - "Subject\0Re: [PATCH RFC v2 04/17] ARM: shmobile: r8a7779: Add clocks\0" - "Date\0Tue, 26 Nov 2013 14:48:45 +0000\0" + "From\0laurent.pinchart@ideasonboard.com (Laurent Pinchart)\0" + "Subject\0[PATCH RFC v2 04/17] ARM: shmobile: r8a7779: Add clocks\0" + "Date\0Tue, 26 Nov 2013 15:48:45 +0100\0" "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" @@ -57,7 +57,7 @@ "> +\t\tranges;\n" "> +\n" "> +\t\t/* Special CPG clocks */\n" - "> +\t\tcpg_clocks: cpg_clocks@0xe6150000 {\n" + "> +\t\tcpg_clocks: cpg_clocks at 0xe6150000 {\n" "> +\t\t\tcompatible = \"renesas,r8a7779-cpg-clocks\";\n" "> +\t\t\treg = <0 0xe6150000 0 0x1000>;\n" "> +\t\t\t#clock-cells = <1>;\n" @@ -133,7 +133,8 @@ "> +\t\t\t\tR8A7779_CLK_I2C3 R8A7779_CLK_I2C2 R8A7779_CLK_I2C1\n" "> +\t\t\t\tR8A7779_CLK_I2C0\n" "> +\t\t\t>;\n" - "> +\t\t\tclock-output-names > +\t\t\t\t\"hspi0\", \"hspi1\", \"hspi2\",\n" + "> +\t\t\tclock-output-names =\n" + "> +\t\t\t\t\"hspi0\", \"hspi1\", \"hspi2\",\n" "> +\t\t\t\t\"tmu0\", \"tmu1\", \"tmu2\",\n" "> +\t\t\t\t\"scif6\", \"scif4\", \"scif3\",\n" "\n" @@ -164,7 +165,8 @@ "> +\t\t\t\tR8A7779_CLK_VIN1 R8A7779_CLK_VIN0\n" "> +\t\t\t\tR8A7779_CLK_SATA R8A7779_CLK_VIN3\n" "> +\t\t\t>;\n" - "> +\t\t\tclock-output-names > +\t\t\t\t\"ehci0\", \"ohci0\",\n" + "> +\t\t\tclock-output-names =\n" + "> +\t\t\t\t\"ehci0\", \"ohci0\",\n" "> +\t\t\t\t\"ehci1\", \"ohci1\",\n" "> +\t\t\t\t\"du\", \"vin2\",\n" "> +\t\t\t\t\"vin1\", \"vin0\",\n" @@ -194,7 +196,8 @@ "That's for MSTP1, not MSTP3.\n" "\n" "> +\t\t\t>;\n" - "> +\t\t\tclock-output-names > +\t\t\t\t\"ehci0\", \"ohci0\",\n" + "> +\t\t\tclock-output-names =\n" + "> +\t\t\t\t\"ehci0\", \"ohci0\",\n" "> +\t\t\t\t\"ehci1\", \"ohci1\",\n" "> +\t\t\t\t\"du\", \"vin2\",\n" "> +\t\t\t\t\"vin1\", \"vin0\",\n" @@ -207,4 +210,4 @@ "\n" Laurent Pinchart -fb7b744fd13268fd012480ce6f60b257298e2b1f17e31155085fd2ce15be8e5b +f7d4c46b64559f1fedae52b832d73ffd984f3e35d3ab05aa59c5b635993624fe
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.