| Message ID | 20120808131158.GD8227@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, Aug 8, 2012 at 3:11 PM, Lee Jones <lee.jones@linaro.org> wrote: > From: Lee Jones <lee.jones@linaro.org> > Date: Tue, 7 Aug 2012 12:27:24 +0100 > Subject: [PATCH 1/1 v4] i2c/nomadik: Add default configuration into the Nomadik I2C driver Wolfram are you taking this v4 patch into the i2c tree for the -rc:s? Right now this is causing boot regressions so we need it badly... Yours, Linus Walleij
On Fri, Aug 17, 2012 at 05:02:32PM +0200, Linus Walleij wrote: > On Wed, Aug 8, 2012 at 3:11 PM, Lee Jones <lee.jones@linaro.org> wrote: > > > From: Lee Jones <lee.jones@linaro.org> > > Date: Tue, 7 Aug 2012 12:27:24 +0100 > > Subject: [PATCH 1/1 v4] i2c/nomadik: Add default configuration into the Nomadik I2C driver > > Wolfram are you taking this v4 patch into the i2c tree for the -rc:s? > > Right now this is causing boot regressions so we need it badly... I am collecting patches for rc3 this weekend.
On Wed, Aug 08, 2012 at 02:11:59PM +0100, Lee Jones wrote: > From: Lee Jones <lee.jones@linaro.org> > Date: Tue, 7 Aug 2012 12:27:24 +0100 > Subject: [PATCH 1/1 v4] i2c/nomadik: Add default configuration into the Nomadik I2C driver Actually, unlike Linus said, I prefer "i2c: nomadik:"; minor nit, though. > > 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 ^^ has ( I fixed it ) > 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> Applied to -current, thanks! I added a note from Linus that it is needed because of boot regressions. That is also useful in commit messages.
diff --git a/drivers/i2c/busses/i2c-nomadik.c b/drivers/i2c/busses/i2c-nomadik.c index 5e6f1ee..61b00ed 100644 --- a/drivers/i2c/busses/i2c-nomadik.c +++ b/drivers/i2c/busses/i2c-nomadik.c @@ -350,10 +350,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 @@ -911,20 +907,32 @@ 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 atomic_t adapter_id = ATOMIC_INIT(0); static int nmk_i2c_probe(struct amba_device *adev, const struct amba_id *id) { int ret = 0; - struct nmk_i2c_controller *pdata = - adev->dev.platform_data; + struct nmk_i2c_controller *pdata = adev->dev.platform_data; struct nmk_i2c_dev *dev; struct i2c_adapter *adap; - if (!pdata) { - dev_warn(&adev->dev, "no platform data\n"); - return -ENODEV; - } + 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(&adev->dev, "cannot allocate memory\n");