[PATCH for 2.6.36 2/2] cpuimx27: fix i2c bus selection

[Uwe Kleine-König]

On Wed, Oct 06, 2010 at 03:07:04PM +0200, Uwe Kleine-König wrote:
> On Wed, Oct 06, 2010 at 10:53:50AM +0200, Eric Bénard wrote:
> > Recent clean of i.MX devices registration changed the i2C bus number
> > selected for our platform (Freescale start peripheral ID at 1, kernel
> > now start it at 0 so i.MX27's i2c 1 is kernel's i2c 0).
> > Without this fix, i2c is unusable on this platform.
> > 
> > Signed-off-by: Eric Bénard <eric at eukrea.com>
> > ---
> >  arch/arm/mach-imx/mach-cpuimx27.c |    2 +-
> >  1 files changed, 1 insertions(+), 1 deletions(-)
> > 
> > diff --git a/arch/arm/mach-imx/mach-cpuimx27.c b/arch/arm/mach-imx/mach-cpuimx27.c
> > index 339150a..6830afd 100644
> > --- a/arch/arm/mach-imx/mach-cpuimx27.c
> > +++ b/arch/arm/mach-imx/mach-cpuimx27.c
> > @@ -259,7 +259,7 @@ static void __init eukrea_cpuimx27_init(void)
> >  	i2c_register_board_info(0, eukrea_cpuimx27_i2c_devices,
> >  				ARRAY_SIZE(eukrea_cpuimx27_i2c_devices));
> >  
> > -	imx27_add_i2c_imx1(&cpuimx27_i2c1_data);
> > +	imx27_add_i2c_imx0(&cpuimx27_i2c1_data);
> This doesn't fit on Sascha's current tree.  Can you please rebase it?
I need to be more precise here:  It doesn't fit Sascha's for-2.6.37
branch.  If you want it to go in before .36, then it's obviously OK.

Maybe you want to add the offending commit to the log (it's
c69871597dd173af2d7615429c0ee6aa10fae42b).  And you can add my

	Acked-and-blame-taken-by: Uwe Kleine-König <u.kleine-koenig at pengutronix.de>

Best regards and sorry for that,
Uwe

-- 
Pengutronix e.K.                           | Uwe Kleine-König            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |