diff for duplicates of <1467516.9721qlt3iV@avalon> diff --git a/a/1.txt b/N1/1.txt index 548ae51..0165283 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -22,7 +22,7 @@ Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > --- 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>; @@ -47,17 +47,18 @@ R8A7790_CLK_CMT1 > > >; > -> clock-output-names > - "tpu0", "mmcif1", "sdhi3", "sdhi2", +> clock-output-names = +> - "tpu0", "mmcif1", "sdhi3", "sdhi2", > - "sdhi1", "sdhi0", "mmcif0", "cmt1"; > + "iic2", "tpu0", "mmcif1", "sdhi3", > + "sdhi2", "sdhi1", "sdhi0", "mmcif0", > + "iic0", "iic1", "cmt1"; > }; -> 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>; @@ -76,7 +77,8 @@ R8A7790_CLK_I2C1 > 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", "iic3", > + "i2c3", "i2c2", "i2c1", "i2c0"; > }; diff --git a/a/content_digest b/N1/content_digest index 416ec44..476ab52 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,8 @@ "ref\01395773789-17249-1-git-send-email-wsa@the-dreams.de\0" "ref\01395773789-17249-5-git-send-email-wsa@the-dreams.de\0" - "From\0Laurent Pinchart <laurent.pinchart@ideasonboard.com>\0" - "Subject\0Re: [PATCH v2 4/5] ARM: shmobile: r8a7790: add IIC(B) clocks to dtsi\0" - "Date\0Wed, 26 Mar 2014 14:04:41 +0000\0" + "From\0laurent.pinchart@ideasonboard.com (Laurent Pinchart)\0" + "Subject\0[PATCH v2 4/5] ARM: shmobile: r8a7790: add IIC(B) clocks to dtsi\0" + "Date\0Wed, 26 Mar 2014 15:04:41 +0100\0" "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" @@ -30,7 +30,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\", \"renesas,cpg-mstp-\n" "clocks\";\n" "> \t\t\treg = <0 0xe615013c 0 4>, <0 0xe6150048 0 4>;\n" @@ -55,17 +55,18 @@ "> \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\"iic2\", \"tpu0\", \"mmcif1\", \"sdhi3\",\n" "> +\t\t\t\t\"sdhi2\", \"sdhi1\", \"sdhi0\", \"mmcif0\",\n" "> +\t\t\t\t\"iic0\", \"iic1\", \"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-\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" @@ -84,7 +85,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\", \"iic3\",\n" "> +\t\t\t\t\"i2c3\",\t\"i2c2\", \"i2c1\", \"i2c0\";\n" "> \t\t};\n" @@ -95,4 +97,4 @@ "\n" Laurent Pinchart -2f8481cf917d8428226e214e7d4493695231bf54c8d6c52ed79fbe2f7bf3c1e2 +4b21a82189d546808d08e283b2b8382b9dc2309ddb38b913947e543c5f856291
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.