| Message ID | 20120806102151.GB16996@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, Aug 6, 2012 at 12:21 PM, Lee Jones <lee.jones@linaro.org> wrote: > From: Lee Jones <lee.jones@linaro.org> > 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@vger.kernel.org > Signed-off-by: Lee Jones <lee.jones@linaro.org> Ah, I created my own solution for this as well by reverting back some platform data. This works too, but the patch does not apply to v3.6-rc1. Please rebase and repost, then you can add my Acked-by: Linus Walleij <linus.walleij@linaro.org> Please not that you need to send I2C patches for embedded to Wolfram Sang. Wolfram, please pick this for the -rc series because it's a regression in v3.6-rc1. Yours, Linus Walleij
On Mon, Aug 06, 2012 at 12:21:52 +0200, Lee Jones wrote: > From: Lee Jones <lee.jones@linaro.org> > 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@vger.kernel.org > Signed-off-by: Lee Jones <lee.jones@linaro.org> > --- > 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 <srinidhi.kasagar@stericsson.com> /srinidhi
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 */ + .timeout = 200, /* Slave response timeout(ms) */ + .sm = I2C_FREQ_MODE_FAST, +}; + static int __devinit nmk_i2c_probe(struct platform_device *pdev) { int ret = 0; struct resource *res; - struct nmk_i2c_controller *pdata = - pdev->dev.platform_data; + struct nmk_i2c_controller *pdata = pdev->dev.platform_data; struct nmk_i2c_dev *dev; struct i2c_adapter *adap; + if (!pdata) + /* No i2c configuration found, using the default. */ + pdata = &u8500_i2c; + dev = kzalloc(sizeof(struct nmk_i2c_dev), GFP_KERNEL); if (!dev) { dev_err(&pdev->dev, "cannot allocate memory\n");