[PATCH v2 0/1] ARM: shmobile: r8a7790: add I2C support

[PATCH v2 0/1] ARM: shmobile: r8a7790: add I2C support

[Nguyen Viet Dung]

From: Nguyen Viet Dung <nv-dung-HEF513clHfp3+QwDJ9on6Q@public.gmane.org>

Hello,
CC Morimoto

Please consider the following patch for the r8a7790 Soc.
This patch modify I2C driver of rcar-H1 to usable on both rcar-H1 and rcar-H2.
It was developed base on the renesas-next-20130528 branch and 
have tested on the Lager board.
Input clock of I2C is peripheral module clock that is named peripheral_clk.

V2: dropped patches 2,3,4 from the previous version.

Thanks,
Nguyen viet Dung

Nguyen Viet Dung (1):
  i2c: rcar: modify I2C driver

 drivers/i2c/busses/i2c-rcar.c |   17 +++++++++++++++--
 include/linux/i2c/i2c-rcar.h  |    4 ++++
 2 files changed, 19 insertions(+), 2 deletions(-)

-- 
1.7.9.5

[PATCH v2 1/1] i2c: rcar: modify I2C driver

[Nguyen Viet Dung]

From: Nguyen Viet Dung <nv-dung-HEF513clHfp3+QwDJ9on6Q@public.gmane.org>

This patch modify calculate for clock in I2C driver.

Signed-off-by: Nguyen Viet Dung <nv-dung-HEF513clHfp3+QwDJ9on6Q@public.gmane.org>
---
 drivers/i2c/busses/i2c-rcar.c |   17 +++++++++++++++--
 include/linux/i2c/i2c-rcar.h  |    4 ++++
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/drivers/i2c/busses/i2c-rcar.c b/drivers/i2c/busses/i2c-rcar.c
index 4ba4a95..85987c1 100644
--- a/drivers/i2c/busses/i2c-rcar.c
+++ b/drivers/i2c/busses/i2c-rcar.c
@@ -221,15 +221,28 @@ static int rcar_i2c_clock_calculate(struct rcar_i2c_priv *priv,
 				    struct device *dev)
 {
 	struct clk *clkp = clk_get(NULL, "peripheral_clk");
+	struct i2c_rcar_platform_data *pdata = dev->platform_data;
 	u32 scgd, cdf;
 	u32 round, ick;
 	u32 scl;
+	u32 cdf_width;
+	u32 flags = pdata ? pdata->flags : 0;
 
 	if (!clkp) {
 		dev_err(dev, "there is no peripheral_clk\n");
 		return -EIO;
 	}
 
+	switch (flags & I2C_RCAR_FLAGS_ICCCR_MASK) {
+	default:
+	case I2C_RCAR_FLAGS_ICCCR_IS_2BIT:
+		cdf_width = 2;
+		break;
+	case I2C_RCAR_FLAGS_ICCCR_IS_3BIT:
+		cdf_width = 3;
+		break;
+	}
+
 	/*
 	 * calculate SCL clock
 	 * see
@@ -245,7 +258,7 @@ static int rcar_i2c_clock_calculate(struct rcar_i2c_priv *priv,
 	 * clkp : peripheral_clk
 	 * F[]  : integer up-valuation
 	 */
-	for (cdf = 0; cdf < 4; cdf++) {
+	for (cdf = 0; cdf < (1 << cdf_width); cdf++) {
 		ick = clk_get_rate(clkp) / (1 + cdf);
 		if (ick < 20000000)
 			goto ick_find;
@@ -287,7 +300,7 @@ scgd_find:
 	/*
 	 * keep icccr value
 	 */
-	priv->icccr = (scgd << 2 | cdf);
+	priv->icccr = (scgd << (cdf_width) | cdf);
 
 	return 0;
 }
diff --git a/include/linux/i2c/i2c-rcar.h b/include/linux/i2c/i2c-rcar.h
index 496f5c2..572a6e5 100644
--- a/include/linux/i2c/i2c-rcar.h
+++ b/include/linux/i2c/i2c-rcar.h
@@ -5,6 +5,10 @@
 
 struct i2c_rcar_platform_data {
 	u32 bus_speed;
+	u32 flags;
+#define I2C_RCAR_FLAGS_ICCCR_MASK	(0xF << 0)
+#define I2C_RCAR_FLAGS_ICCCR_IS_2BIT	(0 << 0) /* default */
+#define I2C_RCAR_FLAGS_ICCCR_IS_3BIT	(1 << 0)
 };
 
 #endif /* __I2C_R_CAR_H__ */
-- 
1.7.9.5

Re: [PATCH v2 1/1] i2c: rcar: modify I2C driver

[Kuninori Morimoto]

Hi Wolfram, Dung-san

# I added Wolfram's email address

> From: Nguyen Viet Dung <nv-dung-HEF513clHfp3+QwDJ9on6Q@public.gmane.org>
> 
> This patch modify calculate for clock in I2C driver.
> 
> Signed-off-by: Nguyen Viet Dung <nv-dung-HEF513clHfp3+QwDJ9on6Q@public.gmane.org>
> ---

You forgot to add Wolfram's email address on this patch :)

Acked-by: Kuninori Morimoto <kuninori.morimoto.gx-zM6kxYcvzFBBDgjK7y7TUQ@public.gmane.org>

>  drivers/i2c/busses/i2c-rcar.c |   17 +++++++++++++++--
>  include/linux/i2c/i2c-rcar.h  |    4 ++++
>  2 files changed, 19 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/i2c/busses/i2c-rcar.c b/drivers/i2c/busses/i2c-rcar.c
> index 4ba4a95..85987c1 100644
> --- a/drivers/i2c/busses/i2c-rcar.c
> +++ b/drivers/i2c/busses/i2c-rcar.c
> @@ -221,15 +221,28 @@ static int rcar_i2c_clock_calculate(struct rcar_i2c_priv *priv,
>  				    struct device *dev)
>  {
>  	struct clk *clkp = clk_get(NULL, "peripheral_clk");
> +	struct i2c_rcar_platform_data *pdata = dev->platform_data;
>  	u32 scgd, cdf;
>  	u32 round, ick;
>  	u32 scl;
> +	u32 cdf_width;
> +	u32 flags = pdata ? pdata->flags : 0;
>  
>  	if (!clkp) {
>  		dev_err(dev, "there is no peripheral_clk\n");
>  		return -EIO;
>  	}
>  
> +	switch (flags & I2C_RCAR_FLAGS_ICCCR_MASK) {
> +	default:
> +	case I2C_RCAR_FLAGS_ICCCR_IS_2BIT:
> +		cdf_width = 2;
> +		break;
> +	case I2C_RCAR_FLAGS_ICCCR_IS_3BIT:
> +		cdf_width = 3;
> +		break;
> +	}
> +
>  	/*
>  	 * calculate SCL clock
>  	 * see
> @@ -245,7 +258,7 @@ static int rcar_i2c_clock_calculate(struct rcar_i2c_priv *priv,
>  	 * clkp : peripheral_clk
>  	 * F[]  : integer up-valuation
>  	 */
> -	for (cdf = 0; cdf < 4; cdf++) {
> +	for (cdf = 0; cdf < (1 << cdf_width); cdf++) {
>  		ick = clk_get_rate(clkp) / (1 + cdf);
>  		if (ick < 20000000)
>  			goto ick_find;
> @@ -287,7 +300,7 @@ scgd_find:
>  	/*
>  	 * keep icccr value
>  	 */
> -	priv->icccr = (scgd << 2 | cdf);
> +	priv->icccr = (scgd << (cdf_width) | cdf);
>  
>  	return 0;
>  }
> diff --git a/include/linux/i2c/i2c-rcar.h b/include/linux/i2c/i2c-rcar.h
> index 496f5c2..572a6e5 100644
> --- a/include/linux/i2c/i2c-rcar.h
> +++ b/include/linux/i2c/i2c-rcar.h
> @@ -5,6 +5,10 @@
>  
>  struct i2c_rcar_platform_data {
>  	u32 bus_speed;
> +	u32 flags;
> +#define I2C_RCAR_FLAGS_ICCCR_MASK	(0xF << 0)
> +#define I2C_RCAR_FLAGS_ICCCR_IS_2BIT	(0 << 0) /* default */
> +#define I2C_RCAR_FLAGS_ICCCR_IS_3BIT	(1 << 0)
>  };
>  
>  #endif /* __I2C_R_CAR_H__ */
> -- 
> 1.7.9.5
> 

Re: [PATCH v2 1/1] i2c: rcar: modify I2C driver

[Nguyen Viet Dung]

Hi Wolfram, Morimoto-san

On 07/11/2013 06:03 PM, Kuninori Morimoto wrote:
> Hi Wolfram, Dung-san
>
> # I added Wolfram's email address
>
>> From: Nguyen Viet Dung <nv-dung-HEF513clHfp3+QwDJ9on6Q@public.gmane.org>
>>
>> This patch modify calculate for clock in I2C driver.
>>
>> Signed-off-by: Nguyen Viet Dung <nv-dung-HEF513clHfp3+QwDJ9on6Q@public.gmane.org>
>> ---
> You forgot to add Wolfram's email address on this patch :)
>
> Acked-by: Kuninori Morimoto <kuninori.morimoto.gx-zM6kxYcvzFBBDgjK7y7TUQ@public.gmane.org>
I am sorry, I have forgot  to add Wolfram's email address on the patch.

Wolfram,please consider this patch.
It have tested on Lager board (R8A7790 soc) and it seen like goood.

Thanks you,

Re: [PATCH v2 1/1] i2c: rcar: modify I2C driver

[Nguyen Viet Dung]

Hi Wolfram, Morimoto-san

On 07/11/2013 06:03 PM, Kuninori Morimoto wrote:
> Hi Wolfram, Dung-san
>
> # I added Wolfram's email address
>
>> From: Nguyen Viet Dung <nv-dung-HEF513clHfp3+QwDJ9on6Q@public.gmane.org>
>>
>> This patch modify calculate for clock in I2C driver.
>>
>> Signed-off-by: Nguyen Viet Dung <nv-dung-HEF513clHfp3+QwDJ9on6Q@public.gmane.org>
>> ---
> You forgot to add Wolfram's email address on this patch
>
> Acked-by: Kuninori Morimoto <kuninori.morimoto.gx-zM6kxYcvzFBBDgjK7y7TUQ@public.gmane.org>
I am sorry, I have forgot  to add Wolfram's email address on the patch.

Wolfram,please consider this patch.
It have tested on Lager board (R8A7790 soc) and it seen like goood.

Thanks you,

Re: [PATCH v2 1/1] i2c: rcar: modify I2C driver

[Nguyen Viet Dung]

Hi Wolfram,

I'm sorry ,I had mistake for your'address.

Please consider this patch.
It have tested on Lager board (R8A7790 soc) and it seen like goood.

Thanks you,