Tony Lindgren <[email protected]> writes: > * Cory Maccarrone <[email protected]> [100109 10:34]: >> On Sat, Jan 9, 2010 at 10:33 AM, Tony Lindgren <[email protected]> wrote: >> > >> > Let's plan on adding this into omap-testing branch next week so >> > we can make sure things are OK for the other platforms. >> > >> > Then assuming no issues, let's ask Ben can queue it. >> > >> >> Excellent, thank you! > > Applied to omap-testing with the following fix. Can you please merge > it into your original patch?
Unfortunately, Tony's additional fix did not make it into the version that was merged to mainline, which results in a crash during probe when using v2.6.34-rc1. Ben, can you queue the fix below from Tony for -rc2? Kevin > > Tony > From 5b640a850de9fb87b9e9e6dd2cfeb7144ada8053 Mon Sep 17 00:00:00 2001 > From: Tony Lindgren <[email protected]> > Date: Mon, 11 Jan 2010 17:22:21 -0800 > Subject: [PATCH] i2c-omap: Fix reg_shift init > > Otherwise register access won't work during probe > for omap_i2c_unidle. > > Signed-off-by: Tony Lindgren <[email protected]> > > diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c > index 913abd7..9c3ce4d 100644 > --- a/drivers/i2c/busses/i2c-omap.c > +++ b/drivers/i2c/busses/i2c-omap.c > @@ -894,6 +894,12 @@ omap_i2c_probe(struct platform_device *pdev) > dev->idle = 1; > dev->dev = &pdev->dev; > dev->irq = irq->start; > + > + if (cpu_is_omap7xx()) > + dev->reg_shift = 1; > + else > + dev->reg_shift = 2; > + > dev->base = ioremap(mem->start, resource_size(mem)); > if (!dev->base) { > r = -ENOMEM; > @@ -925,11 +931,6 @@ omap_i2c_probe(struct platform_device *pdev) > dev->b_hw = 1; /* Enable hardware fixes */ > } > > - if (cpu_is_omap7xx()) > - dev->reg_shift = 1; > - else > - dev->reg_shift = 2; > - > /* reset ASAP, clearing any IRQs */ > omap_i2c_init(dev); > -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
