Message ID | 20110303135030.30648.14923.stgit@otae.warmcat.com |
---|---|
State | New |
Headers | show |
On 3/3/2011 2:50 PM, Andy Green wrote: > Describe why we can't simply probe the peripheral unit ID > to make the decision about what register map to use > > Cc: patches@linaro.org > Signed-off-by: Andy Green<andy.green@linaro.org> > --- > > drivers/i2c/busses/i2c-omap.c | 11 +++++++++++ > 1 files changed, 11 insertions(+), 0 deletions(-) > > diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c > index b605ff3..d6500ec 100644 > --- a/drivers/i2c/busses/i2c-omap.c > +++ b/drivers/i2c/busses/i2c-omap.c > @@ -1032,6 +1032,17 @@ omap_i2c_probe(struct platform_device *pdev) > else > dev->reg_shift = 2; > > + dev->regs = (u8 *)reg_map; > + > + /* > + * this is a bit tricky, implementation on 4430 has the active > + * part of its ID register moved to +4 instead of +0 as > + * previously. So, we can't probe just using the ID register > + * Complicating matters the older implementation using the > + * simpler register set on 3530 also reports its revision as > + * 0x40, same as the 4430 newer implementation. > + */ The issue is that this revision field is not really documented in OMAP4 TRM, so you should not rely on it. Moreover, as you already noticed, the revision number is not even accurate. OMAP3 and 4 are using a different programming model but this is not reflected in this field. Since that issue is quite common in many OMAP IPs, we introduced a SW field in hwmod_class that should reflect the change in IP programming model. For the moment it is a simple integer that we increment each time there is change in a programming model that will impact the driver. You can check how it was done for the timer for example: https://patchwork.kernel.org/patch/587211/ Then you need to copy that info to a pdata field in order to allow the driver to access it. Check omap_timer_init in: https://patchwork.kernel.org/patch/587241/ > + > if (cpu_is_omap44xx()) > dev->regs = (u8 *) omap4_reg_map; OK, this is not part of your patch, but any call to cpu_is are forbidden from the driver. As soon as you have the revision field from hwmod you can get rid of all that code. Regards, Benoit
On 03/03/2011 09:12 PM, Somebody in the thread at some point said: Hi - Thanks for your comments. > The issue is that this revision field is not really documented in OMAP4 > TRM, so you should not rely on it. Moreover, as you already noticed, the > revision number is not even accurate. OMAP3 and 4 are using a different > programming model but this is not reflected in this field. OK. > Since that issue is quite common in many OMAP IPs, we introduced a SW > field in hwmod_class that should reflect the change in IP programming > model. For the moment it is a simple integer that we increment each time > there is change in a programming model that will impact the driver. > > You can check how it was done for the timer for example: Alright. In I2C case the path is hwmod class -> platform data though since hwmod content directly is not used in the driver, but platform data is. >> + >> if (cpu_is_omap44xx()) >> dev->regs = (u8 *) omap4_reg_map; > > OK, this is not part of your patch, but any call to cpu_is are forbidden > from the driver. As soon as you have the revision field from hwmod you > can get rid of all that code. Well, as you point out they are not forbidden enough since I was just working with what was already there. However this hwmod scheme will cover it all AFAICS, so I will extend the patches to nuke all cpu_is... from the driver. -Andy
diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c index b605ff3..d6500ec 100644 --- a/drivers/i2c/busses/i2c-omap.c +++ b/drivers/i2c/busses/i2c-omap.c @@ -1032,6 +1032,17 @@ omap_i2c_probe(struct platform_device *pdev) else dev->reg_shift = 2; + dev->regs = (u8 *)reg_map; + + /* + * this is a bit tricky, implementation on 4430 has the active + * part of its ID register moved to +4 instead of +0 as + * previously. So, we can't probe just using the ID register + * Complicating matters the older implementation using the + * simpler register set on 3530 also reports its revision as + * 0x40, same as the 4430 newer implementation. + */ + if (cpu_is_omap44xx()) dev->regs = (u8 *) omap4_reg_map; else
Describe why we can't simply probe the peripheral unit ID to make the decision about what register map to use Cc: patches@linaro.org Signed-off-by: Andy Green <andy.green@linaro.org> --- drivers/i2c/busses/i2c-omap.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-)