diff for duplicates of <3639732.t6IJBqd63T@avalon> diff --git a/a/1.txt b/N1/1.txt index 715b287..901a131 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -36,11 +36,12 @@ R8A7791_CLK_SSUSB > R8A7791_CLK_CMT1 > >; > -> clock-output-names > "tpu0", "sdhi2", "sdhi1", "sdhi0", +> clock-output-names = +> "tpu0", "sdhi2", "sdhi1", "sdhi0", > - "mmcif0", "i2c7", "i2c8", "cmt1"; > + "mmcif0", "i2c7", "i2c8", "ssusb", "cmt1"; > }; -> mstp5_clks: mstp5_clks@e6150144 { +> mstp5_clks: mstp5_clks at e6150144 { > compatible = "renesas,r8a7791-mstp-clocks", "renesas,cpg-mstp- clocks"; diff --git a/a/content_digest b/N1/content_digest index 89d7765..3086243 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\0538D71C1.3010900@renesas.com\0" - "From\0Laurent Pinchart <laurent.pinchart@ideasonboard.com>\0" - "Subject\0Re: [PATCH v2 1/2] arm: shmobile: r8a7791: add USB3.0 clocks to device tree\0" - "Date\0Tue, 03 Jun 2014 17:59:17 +0000\0" + "From\0laurent.pinchart@ideasonboard.com (Laurent Pinchart)\0" + "Subject\0[PATCH v2 1/2] arm: shmobile: r8a7791: add USB3.0 clocks to device tree\0" + "Date\0Tue, 03 Jun 2014 19:59:17 +0200\0" "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" @@ -43,11 +43,12 @@ "> R8A7791_CLK_CMT1\n" "> \t\t\t>;\n" "> \n" - "> \t\t\tclock-output-names > \t\t\t\t\"tpu0\", \"sdhi2\", \"sdhi1\", \"sdhi0\",\n" + "> \t\t\tclock-output-names =\n" + "> \t\t\t\t\"tpu0\", \"sdhi2\", \"sdhi1\", \"sdhi0\",\n" "> -\t\t\t\t\"mmcif0\", \"i2c7\", \"i2c8\", \"cmt1\";\n" "> +\t\t\t\t\"mmcif0\", \"i2c7\", \"i2c8\", \"ssusb\", \"cmt1\";\n" "> \t\t};\n" - "> \t\tmstp5_clks: mstp5_clks@e6150144 {\n" + "> \t\tmstp5_clks: mstp5_clks at e6150144 {\n" "> \t\t\tcompatible = \"renesas,r8a7791-mstp-clocks\", \"renesas,cpg-mstp-\n" "clocks\";\n" "\n" @@ -56,4 +57,4 @@ "\n" Laurent Pinchart -b9fe149b61a9ee0e4b8592675bef862ccfad9d392879ac9c787d8c988783adff +b444024f229b2fedd8520fe185dfaf76463fc6ecf8e536077cf34710d06274d1
diff --git a/a/1.txt b/N2/1.txt index 715b287..8185149 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -36,7 +36,8 @@ R8A7791_CLK_SSUSB > R8A7791_CLK_CMT1 > >; > -> clock-output-names > "tpu0", "sdhi2", "sdhi1", "sdhi0", +> clock-output-names = +> "tpu0", "sdhi2", "sdhi1", "sdhi0", > - "mmcif0", "i2c7", "i2c8", "cmt1"; > + "mmcif0", "i2c7", "i2c8", "ssusb", "cmt1"; > }; diff --git a/a/content_digest b/N2/content_digest index 89d7765..8199e04 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,8 +1,18 @@ "ref\0538D71C1.3010900@renesas.com\0" "From\0Laurent Pinchart <laurent.pinchart@ideasonboard.com>\0" "Subject\0Re: [PATCH v2 1/2] arm: shmobile: r8a7791: add USB3.0 clocks to device tree\0" - "Date\0Tue, 03 Jun 2014 17:59:17 +0000\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "Date\0Tue, 03 Jun 2014 19:59:17 +0200\0" + "To\0Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>\0" + "Cc\0mark.rutland@arm.com <mark.rutland@arm.com>" + devicetree@vger.kernel.org <devicetree@vger.kernel.org> + pawel.moll@arm.com <pawel.moll@arm.com> + ijc+devicetree@hellion.org.uk <ijc+devicetree@hellion.org.uk> + SH-Linux <linux-sh@vger.kernel.org> + Magnus Damm <magnus.damm@gmail.com> + Rob Herring <robh+dt@kernel.org> + Simon Horman <horms@verge.net.au> + galak@codeaurora.org <galak@codeaurora.org> + " linux-arm-kernel@lists.infradead.org <linux-arm-kernel@lists.infradead.org>\0" "\00:1\0" "b\0" "Hi Shimoda-san,\n" @@ -43,7 +53,8 @@ "> R8A7791_CLK_CMT1\n" "> \t\t\t>;\n" "> \n" - "> \t\t\tclock-output-names > \t\t\t\t\"tpu0\", \"sdhi2\", \"sdhi1\", \"sdhi0\",\n" + "> \t\t\tclock-output-names =\n" + "> \t\t\t\t\"tpu0\", \"sdhi2\", \"sdhi1\", \"sdhi0\",\n" "> -\t\t\t\t\"mmcif0\", \"i2c7\", \"i2c8\", \"cmt1\";\n" "> +\t\t\t\t\"mmcif0\", \"i2c7\", \"i2c8\", \"ssusb\", \"cmt1\";\n" "> \t\t};\n" @@ -56,4 +67,4 @@ "\n" Laurent Pinchart -b9fe149b61a9ee0e4b8592675bef862ccfad9d392879ac9c787d8c988783adff +752eca3dbd7621227abe4ca79824fef89fefce7f21f0a19361b8d9024660f23d
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.