diff for duplicates of <538D711B.1060402@renesas.com> diff --git a/a/1.txt b/N1/1.txt index c39ccbf..92dd340 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -20,12 +20,13 @@ index cd8b7cc..e06c486 100644 - R8A7790_CLK_IIC0 R8A7790_CLK_IIC1 R8A7790_CLK_CMT1 + R8A7790_CLK_IIC0 R8A7790_CLK_IIC1 R8A7790_CLK_SSUSB R8A7790_CLK_CMT1 >; - clock-output-names "iic2", "tpu0", "mmcif1", "sdhi3", + clock-output-names = + "iic2", "tpu0", "mmcif1", "sdhi3", "sdhi2", "sdhi1", "sdhi0", "mmcif0", - "iic0", "iic1", "cmt1"; + "iic0", "iic1", "ssusb", "cmt1"; }; - mstp5_clks: mstp5_clks@e6150144 { + mstp5_clks: mstp5_clks at e6150144 { compatible = "renesas,r8a7790-mstp-clocks", "renesas,cpg-mstp-clocks"; -- 1.7.9.5 diff --git a/a/content_digest b/N1/content_digest index e82fd65..580f219 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,6 @@ - "ref\01372236040-16737-2-git-send-email-horms+renesas@verge.net.au\0" - "From\0Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>\0" + "From\0yoshihiro.shimoda.uh@renesas.com (Yoshihiro Shimoda)\0" "Subject\0[PATCH v2 1/2] arm: shmobile: r8a7790: add USB3.0 clocks to device tree\0" - "Date\0Tue, 03 Jun 2014 06:54:19 +0000\0" + "Date\0Tue, 3 Jun 2014 15:54:19 +0900\0" "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" @@ -27,14 +26,15 @@ "-\t\t\t\tR8A7790_CLK_IIC0 R8A7790_CLK_IIC1 R8A7790_CLK_CMT1\n" "+\t\t\t\tR8A7790_CLK_IIC0 R8A7790_CLK_IIC1 R8A7790_CLK_SSUSB R8A7790_CLK_CMT1\n" " \t\t\t>;\n" - " \t\t\tclock-output-names \t\t\t\t\"iic2\", \"tpu0\", \"mmcif1\", \"sdhi3\",\n" + " \t\t\tclock-output-names =\n" + " \t\t\t\t\"iic2\", \"tpu0\", \"mmcif1\", \"sdhi3\",\n" " \t\t\t\t\"sdhi2\", \"sdhi1\", \"sdhi0\", \"mmcif0\",\n" "-\t\t\t\t\"iic0\", \"iic1\", \"cmt1\";\n" "+\t\t\t\t\"iic0\", \"iic1\", \"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,r8a7790-mstp-clocks\", \"renesas,cpg-mstp-clocks\";\n" "-- \n" 1.7.9.5 -3edb698b6f5cb508d45fa27f7d9910b6454674cac8994635484dd41a1baf6fe0 +a12e1b38e72f33164af620847b19108b7c15cd3aac6353e3d1b8f9a7be1416cf
diff --git a/a/1.txt b/N2/1.txt index c39ccbf..f75e121 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -20,7 +20,8 @@ index cd8b7cc..e06c486 100644 - R8A7790_CLK_IIC0 R8A7790_CLK_IIC1 R8A7790_CLK_CMT1 + R8A7790_CLK_IIC0 R8A7790_CLK_IIC1 R8A7790_CLK_SSUSB R8A7790_CLK_CMT1 >; - clock-output-names "iic2", "tpu0", "mmcif1", "sdhi3", + clock-output-names = + "iic2", "tpu0", "mmcif1", "sdhi3", "sdhi2", "sdhi1", "sdhi0", "mmcif0", - "iic0", "iic1", "cmt1"; + "iic0", "iic1", "ssusb", "cmt1"; diff --git a/a/content_digest b/N2/content_digest index e82fd65..667951f 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,8 +1,16 @@ - "ref\01372236040-16737-2-git-send-email-horms+renesas@verge.net.au\0" "From\0Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>\0" "Subject\0[PATCH v2 1/2] arm: shmobile: r8a7790: add USB3.0 clocks to device tree\0" - "Date\0Tue, 03 Jun 2014 06:54:19 +0000\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "Date\0Tue, 3 Jun 2014 15:54:19 +0900\0" + "To\0Simon Horman <horms@verge.net.au>" + SH-Linux <linux-sh@vger.kernel.org> + Rob Herring <robh+dt@kernel.org> + pawel.moll@arm.com <pawel.moll@arm.com> + mark.rutland@arm.com <mark.rutland@arm.com> + ijc+devicetree@hellion.org.uk <ijc+devicetree@hellion.org.uk> + galak@codeaurora.org <galak@codeaurora.org> + " devicetree@vger.kernel.org <devicetree@vger.kernel.org>\0" + "Cc\0Magnus Damm <magnus.damm@gmail.com>" + " linux-arm-kernel@lists.infradead.org <linux-arm-kernel@lists.infradead.org>\0" "\00:1\0" "b\0" "Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>\n" @@ -27,7 +35,8 @@ "-\t\t\t\tR8A7790_CLK_IIC0 R8A7790_CLK_IIC1 R8A7790_CLK_CMT1\n" "+\t\t\t\tR8A7790_CLK_IIC0 R8A7790_CLK_IIC1 R8A7790_CLK_SSUSB R8A7790_CLK_CMT1\n" " \t\t\t>;\n" - " \t\t\tclock-output-names \t\t\t\t\"iic2\", \"tpu0\", \"mmcif1\", \"sdhi3\",\n" + " \t\t\tclock-output-names =\n" + " \t\t\t\t\"iic2\", \"tpu0\", \"mmcif1\", \"sdhi3\",\n" " \t\t\t\t\"sdhi2\", \"sdhi1\", \"sdhi0\", \"mmcif0\",\n" "-\t\t\t\t\"iic0\", \"iic1\", \"cmt1\";\n" "+\t\t\t\t\"iic0\", \"iic1\", \"ssusb\", \"cmt1\";\n" @@ -37,4 +46,4 @@ "-- \n" 1.7.9.5 -3edb698b6f5cb508d45fa27f7d9910b6454674cac8994635484dd41a1baf6fe0 +42d1b1ab2f6c3685ecd8f248e00ac5c8dd9c33e9db27748b62f465751bb7e5fc
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.