diff for duplicates of <4320193.ARaogSuUJi@avalon> diff --git a/a/1.txt b/N1/1.txt index 9bb2c3f..75c9190 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -27,7 +27,7 @@ On Tuesday 11 March 2014 22:24:37 Wolfram Sang wrote: > --- a/arch/arm/boot/dts/r8a7790.dtsi > +++ b/arch/arm/boot/dts/r8a7790.dtsi > @@ -702,18 +702,19 @@ -> mstp3_clks: mstp3_clks@e615013c { +> mstp3_clks: mstp3_clks at e615013c { > compatible = "renesas,r8a7790-mstp-clocks", > "renesas,cpg-mstp-clocks"; > reg = <0 0xe615013c 0 4>, <0 0xe6150048 0 4>; @@ -52,7 +52,8 @@ On Tuesday 11 March 2014 22:24:37 Wolfram Sang wrote: > > >; > -> clock-output-names > - "tpu0", "mmcif1", "sdhi3", "sdhi2", +> clock-output-names = +> - "tpu0", "mmcif1", "sdhi3", "sdhi2", > - "sdhi1", "sdhi0", "mmcif0", "cmt1"; > + "i2c6", "tpu0", "mmcif1", "sdhi3", > + "sdhi2", "sdhi1", "sdhi0", "mmcif0", @@ -61,11 +62,11 @@ On Tuesday 11 March 2014 22:24:37 Wolfram Sang wrote: What about calling the clocks iic0-iic2 ? > }; -> mstp5_clks: mstp5_clks@e6150144 { +> mstp5_clks: mstp5_clks at e6150144 { > compatible = "renesas,r8a7790-mstp-clocks", "renesas,cpg-mstp- clocks"; > @@ -757,16 +758,16 @@ -> mstp9_clks: mstp9_clks@e6150994 { +> mstp9_clks: mstp9_clks at e6150994 { > compatible = "renesas,r8a7790-mstp-clocks", "renesas,cpg-mstp- clocks"; > reg = <0 0xe6150994 0 4>, <0 0xe61509a4 0 4>; @@ -84,7 +85,8 @@ clocks"; > R8A7790_CLK_I2C0 > >; > -> clock-output-names > - "rcan1", "rcan0", "qspi_mod", "i2c3", "i2c2", "i2c1", "i2c0"; +> clock-output-names = +> - "rcan1", "rcan0", "qspi_mod", "i2c3", "i2c2", "i2c1", "i2c0"; > + "rcan1", "rcan0", "qspi_mod", "i2c7", And iic3 ? diff --git a/a/content_digest b/N1/content_digest index 41c548a..cef6f97 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,8 @@ "ref\01394573078-20767-1-git-send-email-wsa@the-dreams.de\0" "ref\01394573078-20767-5-git-send-email-wsa@the-dreams.de\0" - "From\0Laurent Pinchart <laurent.pinchart@ideasonboard.com>\0" - "Subject\0Re: [PATCH 4/5] ARM: shmobile: r8a7790: add IIC(B) clocks to dtsi\0" - "Date\0Wed, 12 Mar 2014 10:37:26 +0000\0" + "From\0laurent.pinchart@ideasonboard.com (Laurent Pinchart)\0" + "Subject\0[PATCH 4/5] ARM: shmobile: r8a7790: add IIC(B) clocks to dtsi\0" + "Date\0Wed, 12 Mar 2014 11:37:26 +0100\0" "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" @@ -35,7 +35,7 @@ "> --- a/arch/arm/boot/dts/r8a7790.dtsi\n" "> +++ b/arch/arm/boot/dts/r8a7790.dtsi\n" "> @@ -702,18 +702,19 @@\n" - "> \t\tmstp3_clks: mstp3_clks@e615013c {\n" + "> \t\tmstp3_clks: mstp3_clks at e615013c {\n" "> \t\t\tcompatible = \"renesas,r8a7790-mstp-clocks\",\n" "> \"renesas,cpg-mstp-clocks\";\n" "> \t\t\treg = <0 0xe615013c 0 4>, <0 0xe6150048 0 4>;\n" @@ -60,7 +60,8 @@ "> \n" "> \t\t\t>;\n" "> \n" - "> \t\t\tclock-output-names > -\t\t\t\t\"tpu0\", \"mmcif1\", \"sdhi3\", \"sdhi2\",\n" + "> \t\t\tclock-output-names =\n" + "> -\t\t\t\t\"tpu0\", \"mmcif1\", \"sdhi3\", \"sdhi2\",\n" "> -\t\t\t\t\"sdhi1\", \"sdhi0\", \"mmcif0\", \"cmt1\";\n" "> +\t\t\t\t\"i2c6\", \"tpu0\", \"mmcif1\", \"sdhi3\",\n" "> +\t\t\t\t\"sdhi2\", \"sdhi1\", \"sdhi0\", \"mmcif0\",\n" @@ -69,11 +70,11 @@ "What about calling the clocks iic0-iic2 ?\n" "\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-\n" "clocks\";\n" "> @@ -757,16 +758,16 @@\n" - "> \t\tmstp9_clks: mstp9_clks@e6150994 {\n" + "> \t\tmstp9_clks: mstp9_clks at e6150994 {\n" "> \t\t\tcompatible = \"renesas,r8a7790-mstp-clocks\", \"renesas,cpg-mstp-\n" "clocks\";\n" "> \t\t\treg = <0 0xe6150994 0 4>, <0 0xe61509a4 0 4>;\n" @@ -92,7 +93,8 @@ "> R8A7790_CLK_I2C0\n" "> \t\t\t>;\n" "> \n" - "> \t\t\tclock-output-names > -\t\t\t\t\"rcan1\", \"rcan0\", \"qspi_mod\", \"i2c3\", \"i2c2\", \"i2c1\", \"i2c0\";\n" + "> \t\t\tclock-output-names =\n" + "> -\t\t\t\t\"rcan1\", \"rcan0\", \"qspi_mod\", \"i2c3\", \"i2c2\", \"i2c1\", \"i2c0\";\n" "> +\t\t\t\t\"rcan1\", \"rcan0\", \"qspi_mod\", \"i2c7\",\n" "\n" "And iic3 ?\n" @@ -106,4 +108,4 @@ "\n" Laurent Pinchart -c743809320b8f2c90bf1893f023a855bb0e322d4e8dd2de52a686749f06cd6c3 +d3fee32157d06ecd23bf3e673af6ebbba33cebcee3979ff91e5e55a4ad4cea1e
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.