| Message ID | 1344255947-10062-1-git-send-email-lee.jones@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, Aug 6, 2012 at 2:25 PM, Lee Jones <lee.jones@linaro.org> wrote: > 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 > Acked-by: srinidhi kasagar <srinidhi.kasagar@stericsson.com> > Acked-by: Linus Walleij <linus.walleij@linaro.org> > Signed-off-by: Lee Jones <lee.jones@linaro.org> This still does not apply for me on v3.6-rc1 what did you base this patch on? Applying: i2c: Add default configuration into the Nomadik I2C driver. error: patch failed: drivers/i2c/busses/i2c-nomadik.c:899 error: drivers/i2c/busses/i2c-nomadik.c: patch does not apply Patch failed at 0001 i2c: Add default configuration into the Nomadik I2C driver. When you have resolved this problem run "git am --resolved". If you would prefer to skip this patch, instead run "git am --skip". To restore the original branch and stop patching run "git am --abort". Yours, Linus Walleij
On Mon, Aug 06, 2012 at 04:00:04PM +0200, Linus Walleij wrote: > On Mon, Aug 6, 2012 at 2:25 PM, Lee Jones <lee.jones@linaro.org> wrote: > > > 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 > > Acked-by: srinidhi kasagar <srinidhi.kasagar@stericsson.com> > > Acked-by: Linus Walleij <linus.walleij@linaro.org> > > Signed-off-by: Lee Jones <lee.jones@linaro.org> > > This still does not apply for me on v3.6-rc1 what did you base > this patch on? > > Applying: i2c: Add default configuration into the Nomadik I2C driver. > error: patch failed: drivers/i2c/busses/i2c-nomadik.c:899 > error: drivers/i2c/busses/i2c-nomadik.c: patch does not apply > Patch failed at 0001 i2c: Add default configuration into the Nomadik I2C driver. > When you have resolved this problem run "git am --resolved". > If you would prefer to skip this patch, instead run "git am --skip". > To restore the original branch and stop patching run "git am --abort". Ah, my mistake. I'll rebase to latest and re-submit.
> This still does not apply for me on v3.6-rc1 what did you base > this patch on? Resent based on v3.6-rc1, sorry for the mixup.
diff --git a/drivers/i2c/busses/i2c-nomadik.c b/drivers/i2c/busses/i2c-nomadik.c index a92440d..34ab587 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, /* fast 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");