Signed-off-by: Lei Wen <lei...@marvell.com>
---
drivers/i2c/pxa_i2c.c | 38 ++++++++++++++++++++++++++++++++++++--
include/configs/dkb.h | 4 +++-
2 files changed, 39 insertions(+), 3 deletions(-)
diff --git a/drivers/i2c/pxa_i2c.c b/drivers/i2c/pxa_i2c.c
index 0e37417..17b83ab 100644
--- a/drivers/i2c/pxa_i2c.c
+++ b/drivers/i2c/pxa_i2c.c
@@ -131,9 +131,38 @@ struct pxa_i2c {
u32 isar;
};
-static struct pxa_i2c *base = (struct pxa_i2c *)CONFIG_PXA_I2C_REG;
#define PXAI2C_AND(reg, val) writel(readl(reg) & val, reg)
#define PXAI2C_OR(reg, val) writel(readl(reg) | val, reg)
+static struct pxa_i2c *base;
+
+#ifdef CONFIG_I2C_MULTI_BUS
+static u32 i2c_regs[CONFIG_PXA_I2C_NUM] = CONFIG_PXA_I2C_REG;
+static unsigned int bus_initialized[CONFIG_PXA_I2C_NUM];
+static unsigned int current_bus = 0;
+
+int i2c_set_bus_num(unsigned int bus)
+{
+ if ((bus < 0) || (bus >= CONFIG_PXA_I2C_NUM)) {
+ printf("Bad bus: %d\n", bus);
+ return -1;
+ }
+
+ base = (struct pxa_i2c *)i2c_regs[bus];
+ current_bus = bus;
+
+ if(!bus_initialized[current_bus]) {
+ i2c_init(CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
+ bus_initialized[current_bus] = 1;
+ }
+
+ return 0;
+}
+
+unsigned int i2c_get_bus_num(void)
+{
+ return current_bus;
+}
+#endif
/**
* i2c_pxa_reset: - reset the host controller
@@ -311,6 +340,12 @@ i2c_transfer_finish:
void i2c_init(int speed, int slaveaddr)
{
+#ifdef CONFIG_I2C_MULTI_BUS
+ base = (struct pxa_i2c *)i2c_regs[current_bus];
+#else
+ base = (struct pxa_i2c *)CONFIG_PXA_I2C_REG;
+#endif
+
#ifdef CONFIG_SYS_I2C_INIT_BOARD
u32 icr;
/* call board specific i2c bus reset routine before accessing the */
@@ -520,5 +555,4 @@ int i2c_write(uchar chip, uint addr, int alen, uchar
*buffer, int len)
return 0;
}
-
#endif /* CONFIG_HARD_I2C */
diff --git a/include/configs/dkb.h b/include/configs/dkb.h
index 75c4b99..b1a2319 100644
--- a/include/configs/dkb.h
+++ b/include/configs/dkb.h
@@ -62,7 +62,9 @@
*/
#define CONFIG_CMD_I2C
#define CONFIG_PXA_I2C 1
-#define CONFIG_PXA_I2C_REG 0xd4011000
+#define CONFIG_PXA_I2C_NUM 1
+#define CONFIG_I2C_MULTI_BUS 1
+#define CONFIG_PXA_I2C_REG {0xd4011000}
#define CONFIG_HARD_I2C 1
#define CONFIG_SYS_I2C_SPEED 0
#define CONFIG_SYS_I2C_SLAVE 0xfe
--
1.7.0.4
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
