From mboxrd@z Thu Jan 1 00:00:00 1970 From: Laurent Pinchart Date: Thu, 10 Apr 2014 09:06:21 +0000 Subject: Re: [PATCH v2 4/5] ARM: shmobile: r8a7790: add IIC(B) clocks to dtsi Message-Id: <1469546.BhG9x3Qly1@avalon> List-Id: References: <1395773789-17249-1-git-send-email-wsa@the-dreams.de> <1467516.9721qlt3iV@avalon> <20140410085746.GC16758@verge.net.au> In-Reply-To: <20140410085746.GC16758@verge.net.au> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: linux-arm-kernel@lists.infradead.org Hi Simon, On Thursday 10 April 2014 17:57:46 Simon Horman wrote: > On Wed, Mar 26, 2014 at 03:04:41PM +0100, Laurent Pinchart wrote: > > Hi Wolfram, > > > > Thank you for the patch. > > > > On Tuesday 25 March 2014 19:56:28 Wolfram Sang wrote: > > > From: Wolfram Sang > > > > > > Signed-off-by: Wolfram Sang > > > > Acked-by: Laurent Pinchart > > Thanks. > > I had to resolve a minor conflict when queueing this up. > And I also replaced a tab with a whitspace as a separator > on the line that (now) contains ""i2c3", "i2c2", "i2c1", "i2c0";". > > Please check the result to make sure I didn't introduce errors. It still looks good to me. > From: Wolfram Sang > > ARM: shmobile: r8a7790: add IIC(B) clocks to dtsi > > Signed-off-by: Wolfram Sang > [horms+renesas@verge.net.au resolved conflicts] > [horms+renesas@verge.net.au consistently use space as separator] > Signed-off-by: Simon Horman > --- > arch/arm/boot/dts/r8a7790.dtsi | 27 ++++++++++++++------------- > 1 file changed, 14 insertions(+), 13 deletions(-) > > diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi > index b74631e..903efe7 100644 > --- a/arch/arm/boot/dts/r8a7790.dtsi > +++ b/arch/arm/boot/dts/r8a7790.dtsi > @@ -679,18 +679,19 @@ > mstp3_clks: mstp3_clks@e615013c { > compatible = "renesas,r8a7790-mstp-clocks", "renesas,cpg-mstp- clocks"; > reg = <0 0xe615013c 0 4>, <0 0xe6150048 0 4>; > - clocks = <&cp_clk>, <&mmc1_clk>, <&sd3_clk>, <&sd2_clk>, > - <&cpg_clocks R8A7790_CLK_SD1>, <&cpg_clocks R8A7790_CLK_SD0>, > - <&mmc0_clk>, <&rclk_clk>; > + clocks = <&hp_clk>, <&cp_clk>, <&mmc1_clk>, <&sd3_clk>, > + <&sd2_clk>, <&cpg_clocks R8A7790_CLK_SD1>, <&cpg_clocks > R8A7790_CLK_SD0>, <&mmc0_clk>, + <&hp_clk>, <&hp_clk>, <&rclk_clk>; > #clock-cells = <1>; > renesas,clock-indices = < > - R8A7790_CLK_TPU0 R8A7790_CLK_MMCIF1 R8A7790_CLK_SDHI3 > - R8A7790_CLK_SDHI2 R8A7790_CLK_SDHI1 R8A7790_CLK_SDHI0 > - R8A7790_CLK_MMCIF0 R8A7790_CLK_CMT1 > + R8A7790_CLK_IIC2 R8A7790_CLK_TPU0 R8A7790_CLK_MMCIF1 R8A7790_CLK_SDHI3 > + R8A7790_CLK_SDHI2 R8A7790_CLK_SDHI1 R8A7790_CLK_SDHI0 > R8A7790_CLK_MMCIF0 + R8A7790_CLK_IIC0 R8A7790_CLK_IIC1 R8A7790_CLK_CMT1 > > >; > > 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 { > compatible = "renesas,r8a7790-mstp-clocks", "renesas,cpg-mstp- clocks"; > @@ -734,16 +735,16 @@ > mstp9_clks: mstp9_clks@e6150994 { > compatible = "renesas,r8a7790-mstp-clocks", "renesas,cpg-mstp- clocks"; > reg = <0 0xe6150994 0 4>, <0 0xe61509a4 0 4>; > - clocks = <&p_clk>, <&p_clk>, <&cpg_clocks R8A7790_CLK_QSPI>, > + clocks = <&p_clk>, <&p_clk>, <&cpg_clocks R8A7790_CLK_QSPI>, <&cp_clk>, > <&hp_clk>, <&hp_clk>, <&hp_clk>, <&hp_clk>; > #clock-cells = <1>; > renesas,clock-indices = < > - R8A7790_CLK_RCAN1 R8A7790_CLK_RCAN0 R8A7790_CLK_QSPI_MOD > - R8A7790_CLK_I2C3 R8A7790_CLK_I2C2 R8A7790_CLK_I2C1 > - R8A7790_CLK_I2C0 > + R8A7790_CLK_RCAN1 R8A7790_CLK_RCAN0 R8A7790_CLK_QSPI_MOD > R8A7790_CLK_IICDVFS + R8A7790_CLK_I2C3 R8A7790_CLK_I2C2 R8A7790_CLK_I2C1 > R8A7790_CLK_I2C0 > >; > > clock-output-names > - "rcan1", "rcan0", "qspi_mod", "i2c3", "i2c2", "i2c1", "i2c0"; > + "rcan1", "rcan0", "qspi_mod", "iic3", > + "i2c3", "i2c2", "i2c1", "i2c0"; > }; > }; -- Regards, Laurent Pinchart