Khasim Syed Mohammed wrote: > From 9045377f255e8a59450a6957e63366b4963281ae Mon Sep 17 00:00:00 2001 > From: Syed Mohammed Khasim <kha...@ti.com> > Date: Fri, 8 Jan 2010 20:20:41 +0530 > Subject: [PATCH] Enable I2C bus switching > > OMAP3 supports Multiple I2C channels, this patch allows > us to use i2c dev <bus no> command to switch between busses. > > Signed-off-by: Syed Mohammed Khasim <kha...@ti.com> > Acked-by: Heiko Schocher <h...@denx.de> > --- > drivers/i2c/omap24xx_i2c.c | 5 +++++ > include/configs/omap3_beagle.h | 4 ++++ > 2 files changed, 9 insertions(+), 0 deletions(-)
This patch fails to merge because of the recent usb changes in omap. Please rebase this patchset and resubmit. > > diff --git a/drivers/i2c/omap24xx_i2c.c b/drivers/i2c/omap24xx_i2c.c > index ff18991..e8c8184 100644 > --- a/drivers/i2c/omap24xx_i2c.c > +++ b/drivers/i2c/omap24xx_i2c.c > @@ -435,3 +435,8 @@ int i2c_set_bus_num(unsigned int bus) > > return 0; > } > + > +int i2c_get_bus_num(void) > +{ > + return (int) current_bus; > +} > diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h > index d1c9cd0..ff6d432 100644 > --- a/include/configs/omap3_beagle.h > +++ b/include/configs/omap3_beagle.h > @@ -100,6 +100,10 @@ > /* DDR - I use Micron DDR */ > #define CONFIG_OMAP3_MICRON_DDR 1 > > +/* Enable Multi Bus support for I2C */ > +#define CONFIG_I2C_MULTI_BUS 1 > +#define CONFIG_SYS_I2C_NOPROBES {0x0, 0x0} > + Most (All ?) of the configs I reviewed set the addr element to a valid address. I do not believe 0 is a valid address on omap. If the intent is a double negative {0, 0} == probe all then add a comment. Tom _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot