Subject: [PATCH 1/1] i2c: Add default configuration into the Nomadik I2C driver

From: [email-masked] (Srinidhi Kasagar)
Date: Mon, 6 Aug 2012 17:13:51 +0530

On Mon, Aug 06, 2012 at 12:21:52 +0200, Lee Jones wrote:
> From: Lee Jones <[email-masked]>
> Date: Mon, 6 Aug 2012 11:04:14 +0100
> Subject: [PATCH 1/1] i2c: Add default configuration into the Nomadik I2C
>  driver.
> 
> At this moment in time there is only one known configuration for the
> Nomadik I2C driver. By not holding that configuration in the driver
> adds some unnecessary overhead in platform code. The configuration
> as already been removed from platform code, this patch checks for any
> over-riding configurations. If there aren't any, the default is used.
> 
> Cc: linux-i2c at vger.kernel.org
> Signed-off-by: Lee Jones <[email-masked]>
> ---
>  drivers/i2c/busses/i2c-nomadik.c |   24 ++++++++++++++++++------
>  1 file changed, 18 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/i2c/busses/i2c-nomadik.c b/drivers/i2c/busses/i2c-nomadik.c
> index a92440d..86aa73d 100644
> --- a/drivers/i2c/busses/i2c-nomadik.c
> +++ b/drivers/i2c/busses/i2c-nomadik.c
> @@ -333,10 +333,6 @@ static void setup_i2c_controller(struct nmk_i2c_dev *dev)
>  
>  	i2c_clk = clk_get_rate(dev->clk);
>  
> -	/* fallback to std. mode if machine has not provided it */
> -	if (dev->cfg.clk_freq == 0)
> -		dev->cfg.clk_freq = 100000;
> -
>  	/*
>  	 * The spec says, in case of std. mode the divider is
>  	 * 2 whereas it is 3 for fast and fastplus mode of
> @@ -899,15 +895,31 @@ static const struct i2c_algorithm nmk_i2c_algo = {
>  	.functionality	= nmk_i2c_functionality
>  };
>  
> +static struct nmk_i2c_controller u8500_i2c = {
> +	/*
> +	 * Slave data setup time; 250ns, 100ns, and 10ns, which
> +	 * is 14, 6 and 2 respectively for a 48Mhz i2c clock.
> +	 */
> +	.slsu           = 0xe,
> +	.tft            = 1,      /* Tx FIFO threshold */
> +	.rft            = 8,      /* Rx FIFO threshold */
> +	.clk_freq       = 400000, /* std. mode operation */
"Fast mode operation" in comment, or use your favorite "upto" keyword.

Otherwise it is Acked-by: srinidhi kasagar <[email-masked]>

/srinidhi