diff for duplicates of <5469BEF9.4010504@renesas.com> diff --git a/a/1.txt b/N1/1.txt index 3907b60..085c4c9 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -24,13 +24,14 @@ index 14df425..d4ac978 100644 R8A7790_CLK_IIC0 R8A7790_CLK_PCIEC R8A7790_CLK_IIC1 R8A7790_CLK_SSUSB R8A7790_CLK_CMT1 + R8A7790_CLK_USBDMAC0 R8A7790_CLK_USBDMAC1 >; - clock-output-names "iic2", "tpu0", "mmcif1", "sdhi3", + clock-output-names = + "iic2", "tpu0", "mmcif1", "sdhi3", "sdhi2", "sdhi1", "sdhi0", "mmcif0", - "iic0", "pciec", "iic1", "ssusb", "cmt1"; + "iic0", "pciec", "iic1", "ssusb", "cmt1", + "usbdmac0", "usbdmac1"; }; - 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 099e327..2fdbb3b 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ - "From\0Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>\0" + "From\0yoshihiro.shimoda.uh@renesas.com (Yoshihiro Shimoda)\0" "Subject\0[PATCH] ARM: shmobile: r8a7790: add USBDMAC{0,1} clocks to device tree\0" - "Date\0Mon, 17 Nov 2014 09:25:13 +0000\0" + "Date\0Mon, 17 Nov 2014 18:25:13 +0900\0" "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" @@ -30,15 +30,16 @@ " \t\t\t\tR8A7790_CLK_IIC0 R8A7790_CLK_PCIEC R8A7790_CLK_IIC1 R8A7790_CLK_SSUSB R8A7790_CLK_CMT1\n" "+\t\t\t\tR8A7790_CLK_USBDMAC0 R8A7790_CLK_USBDMAC1\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\", \"pciec\", \"iic1\", \"ssusb\", \"cmt1\";\n" "+\t\t\t\t\"iic0\", \"pciec\", \"iic1\", \"ssusb\", \"cmt1\",\n" "+\t\t\t\t\"usbdmac0\", \"usbdmac1\";\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 -b6dee059b4ccf902f59b21be65dc65883a9e2c4cab9ae80ce301c8886abebd0f +29f0e70ed8955893461c73d444c3cdeb4501ee7942c57174b9d2b32a21e6c953
diff --git a/a/1.txt b/N2/1.txt index 3907b60..24e4d70 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -24,7 +24,8 @@ index 14df425..d4ac978 100644 R8A7790_CLK_IIC0 R8A7790_CLK_PCIEC R8A7790_CLK_IIC1 R8A7790_CLK_SSUSB R8A7790_CLK_CMT1 + R8A7790_CLK_USBDMAC0 R8A7790_CLK_USBDMAC1 >; - clock-output-names "iic2", "tpu0", "mmcif1", "sdhi3", + clock-output-names = + "iic2", "tpu0", "mmcif1", "sdhi3", "sdhi2", "sdhi1", "sdhi0", "mmcif0", - "iic0", "pciec", "iic1", "ssusb", "cmt1"; + "iic0", "pciec", "iic1", "ssusb", "cmt1", diff --git a/a/content_digest b/N2/content_digest index 099e327..a176216 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,7 +1,16 @@ "From\0Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>\0" "Subject\0[PATCH] ARM: shmobile: r8a7790: add USBDMAC{0,1} clocks to device tree\0" - "Date\0Mon, 17 Nov 2014 09:25:13 +0000\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "Date\0Mon, 17 Nov 2014 18:25:13 +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" @@ -30,7 +39,8 @@ " \t\t\t\tR8A7790_CLK_IIC0 R8A7790_CLK_PCIEC R8A7790_CLK_IIC1 R8A7790_CLK_SSUSB R8A7790_CLK_CMT1\n" "+\t\t\t\tR8A7790_CLK_USBDMAC0 R8A7790_CLK_USBDMAC1\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\", \"pciec\", \"iic1\", \"ssusb\", \"cmt1\";\n" "+\t\t\t\t\"iic0\", \"pciec\", \"iic1\", \"ssusb\", \"cmt1\",\n" @@ -41,4 +51,4 @@ "-- \n" 1.7.9.5 -b6dee059b4ccf902f59b21be65dc65883a9e2c4cab9ae80ce301c8886abebd0f +0a18389aa9940ede14973741106eaf58ace3bde82f6a400c4b33fe6f651f2725
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.