[U-Boot] [PATCH 5/6] WIP: i2c: s3c24x0: modify driver for new I2C framework
Piotr Wilczek
p.wilczek at samsung.com
Thu Nov 15 09:15:24 CET 2012
This patch modifies s3c24x0 driver for the new I2C framework.
Configs for VCMA9.h and smdk5250.h boards are modified.
Boards compile successfully but were not tested.
Signed-off-by: Piotr Wilczek <p.wilczek at samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park at samsung.com>
CC: Minkyu Kang <mk7.kang at samsung.com>
---
drivers/i2c/i2c_core.c | 5 ++
drivers/i2c/s3c24x0_i2c.c | 129 ++++++++++++++++++++++++++++++++++++++++---
include/configs/VCMA9.h | 4 ++
include/configs/smdk5250.h | 4 ++
4 files changed, 133 insertions(+), 9 deletions(-)
diff --git a/drivers/i2c/i2c_core.c b/drivers/i2c/i2c_core.c
index d3b5a8d..f0816f7 100644
--- a/drivers/i2c/i2c_core.c
+++ b/drivers/i2c/i2c_core.c
@@ -10,6 +10,10 @@
extern struct i2c_adapter fsl_i2c_adap[];
#endif
+#ifdef CONFIG_DRIVER_S3C24X0_I2C
+extern struct i2c_adapter s3c24x0_i2c_adap[];
+#endif
+
#ifdef CONFIG_SYS_I2C_SOFT
extern struct i2c_adapter soft_i2c_adap[];
#endif
@@ -214,6 +218,7 @@ unsigned int i2c_get_bus_num(void)
*/
int i2c_set_bus_num(unsigned int bus)
{
+
#ifndef CONFIG_SYS_I2C_DIRECT_BUS
int i;
uint8_t buf;
diff --git a/drivers/i2c/s3c24x0_i2c.c b/drivers/i2c/s3c24x0_i2c.c
index 90d297a..d473eaa 100644
--- a/drivers/i2c/s3c24x0_i2c.c
+++ b/drivers/i2c/s3c24x0_i2c.c
@@ -155,7 +155,6 @@ static void i2c_ch_init(struct s3c24x0_i2c *i2c, int speed, int slaveadd)
/* set prescaler, divisor according to freq, also set ACKGEN, IRQ */
writel((div & 0x0F) | 0xA0 | ((pres == 512) ? 0x40 : 0), &i2c->iiccon);
-
/* init to SLAVE REVEIVE and set slaveaddr */
writel(0, &i2c->iicstat);
writel(slaveadd, &i2c->iicadd);
@@ -168,7 +167,7 @@ static void i2c_ch_init(struct s3c24x0_i2c *i2c, int speed, int slaveadd)
*/
#ifdef CONFIG_I2C_MULTI_BUS
-int i2c_set_bus_num(unsigned int bus)
+int s3c24x0_i2c_set_bus_num(unsigned int bus)
{
struct s3c24x0_i2c *i2c;
@@ -184,13 +183,13 @@ int i2c_set_bus_num(unsigned int bus)
return 0;
}
-unsigned int i2c_get_bus_num(void)
+unsigned int s3c24x0_i2c_get_bus_num(void)
{
return g_current_bus;
}
#endif
-void i2c_init(int speed, int slaveadd)
+void s3c24x0_i2c_init(struct i2c_adapter *adap, int speed, int slaveadd)
{
struct s3c24x0_i2c *i2c;
#if !(defined CONFIG_EXYNOS4 || defined CONFIG_EXYNOS5)
@@ -198,8 +197,7 @@ void i2c_init(int speed, int slaveadd)
#endif
int i;
- /* By default i2c channel 0 is the current bus */
- g_current_bus = 0;
+ g_current_bus = adap->hwadapnr;
i2c = get_base_i2c();
/* wait for some time to give previous transfer a chance to finish */
@@ -415,11 +413,13 @@ static int i2c_transfer(struct s3c24x0_i2c *i2c,
return result;
}
-int i2c_probe(uchar chip)
+int s3c24x0_i2c_probe(struct i2c_adapter *adap, uchar chip)
{
struct s3c24x0_i2c *i2c;
uchar buf[1];
+ g_current_bus = adap->hwadapnr;
+
i2c = get_base_i2c();
buf[0] = 0;
@@ -431,12 +431,15 @@ int i2c_probe(uchar chip)
return i2c_transfer(i2c, I2C_READ, chip << 1, 0, 0, buf, 1) != I2C_OK;
}
-int i2c_read(uchar chip, uint addr, int alen, uchar *buffer, int len)
+int s3c24x0_i2c_read(struct i2c_adapter *adap, uchar chip, uint addr,
+ int alen, uchar *buffer, int len)
{
struct s3c24x0_i2c *i2c;
uchar xaddr[4];
int ret;
+ g_current_bus = adap->hwadapnr;
+
if (alen > 4) {
debug("I2C read: addr len %d not supported\n", alen);
return 1;
@@ -475,11 +478,14 @@ int i2c_read(uchar chip, uint addr, int alen, uchar *buffer, int len)
return 0;
}
-int i2c_write(uchar chip, uint addr, int alen, uchar *buffer, int len)
+int s3c24x0_i2c_write(struct i2c_adapter *adap, uchar chip, uint addr,
+ int alen, uchar *buffer, int len)
{
struct s3c24x0_i2c *i2c;
uchar xaddr[4];
+ g_current_bus = adap->hwadapnr;
+
if (alen > 4) {
debug("I2C write: addr len %d not supported\n", alen);
return 1;
@@ -512,4 +518,109 @@ int i2c_write(uchar chip, uint addr, int alen, uchar *buffer, int len)
(i2c, I2C_WRITE, chip << 1, &xaddr[4 - alen], alen, buffer,
len) != 0);
}
+
+struct i2c_adapter s3c24x0_i2c_adap[] = {
+ {
+ .init = s3c24x0_i2c_init,
+ .probe = s3c24x0_i2c_probe,
+ .read = s3c24x0_i2c_read,
+ .write = s3c24x0_i2c_write,
+ .speed = CONFIG_SYS_I2C_SPEED,
+ .slaveaddr = CONFIG_SYS_I2C_SLAVE,
+ .init_done = 0,
+ .hwadapnr = 0,
+ .name = "s3c24x0-i2c#0"
+ },
+#if CONFIG_MAX_I2C_NUM > 1
+ {
+ .init = s3c24x0_i2c_init,
+ .probe = s3c24x0_i2c_probe,
+ .read = s3c24x0_i2c_read,
+ .write = s3c24x0_i2c_write,
+ .speed = CONFIG_SYS_I2C_SPEED,
+ .slaveaddr = CONFIG_SYS_I2C_SLAVE,
+ .init_done = 0,
+ .hwadapnr = 1,
+ .name = "s3c24x0-i2c#1"
+ },
+#endif
+#if CONFIG_MAX_I2C_NUM > 2
+ {
+ .init = s3c24x0_i2c_init,
+ .probe = s3c24x0_i2c_probe,
+ .read = s3c24x0_i2c_read,
+ .write = s3c24x0_i2c_write,
+ .speed = CONFIG_SYS_I2C_SPEED,
+ .slaveaddr = CONFIG_SYS_I2C_SLAVE,
+ .init_done = 0,
+ .hwadapnr = 2,
+ .name = "s3c24x0-i2c#2"
+ },
+#endif
+#if CONFIG_MAX_I2C_NUM > 3
+ {
+ .init = s3c24x0_i2c_init,
+ .probe = s3c24x0_i2c_probe,
+ .read = s3c24x0_i2c_read,
+ .write = s3c24x0_i2c_write,
+ .speed = CONFIG_SYS_I2C_SPEED,
+ .slaveaddr = CONFIG_SYS_I2C_SLAVE,
+ .init_done = 0,
+ .hwadapnr = 3,
+ .name = "s3c24x0-i2c#3"
+ },
+#endif
+#if CONFIG_MAX_I2C_NUM > 4
+ {
+ .init = s3c24x0_i2c_init,
+ .probe = s3c24x0_i2c_probe,
+ .read = s3c24x0_i2c_read,
+ .write = s3c24x0_i2c_write,
+ .speed = CONFIG_SYS_I2C_SPEED,
+ .slaveaddr = CONFIG_SYS_I2C_SLAVE,
+ .init_done = 0,
+ .hwadapnr = 4,
+ .name = "s3c24x0-i2c#4"
+ },
+#endif
+#if CONFIG_MAX_I2C_NUM > 5
+ {
+ .init = s3c24x0_i2c_init,
+ .probe = s3c24x0_i2c_probe,
+ .read = s3c24x0_i2c_read,
+ .write = s3c24x0_i2c_write,
+ .speed = CONFIG_SYS_I2C_SPEED,
+ .slaveaddr = CONFIG_SYS_I2C_SLAVE,
+ .init_done = 0,
+ .hwadapnr = 5,
+ .name = "s3c24x0-i2c#5"
+ },
+#endif
+#if CONFIG_MAX_I2C_NUM > 6
+ {
+ .init = s3c24x0_i2c_init,
+ .probe = s3c24x0_i2c_probe,
+ .read = s3c24x0_i2c_read,
+ .write = s3c24x0_i2c_write,
+ .speed = CONFIG_SYS_I2C_SPEED,
+ .slaveaddr = CONFIG_SYS_I2C_SLAVE,
+ .init_done = 0,
+ .hwadapnr = 6,
+ .name = "s3c24x0-i2c#6"
+ },
+#endif
+#if CONFIG_MAX_I2C_NUM > 7
+ {
+ .init = s3c24x0_i2c_init,
+ .probe = s3c24x0_i2c_probe,
+ .read = s3c24x0_i2c_read,
+ .write = s3c24x0_i2c_write,
+ .speed = CONFIG_SYS_I2C_SPEED,
+ .slaveaddr = CONFIG_SYS_I2C_SLAVE,
+ .init_done = 0,
+ .hwadapnr = 7,
+ .name = "s3c24x0-i2c#7"
+ },
+#endif
+};
#endif /* CONFIG_HARD_I2C */
diff --git a/include/configs/VCMA9.h b/include/configs/VCMA9.h
index fb7d922..f1de21d 100644
--- a/include/configs/VCMA9.h
+++ b/include/configs/VCMA9.h
@@ -95,6 +95,10 @@
/* we use the built-in I2C controller */
#define CONFIG_DRIVER_S3C24X0_I2C
+#define CONFIG_SYS_I2C
+#define CONFIG_SYS_I2C_ADAPTERS {&s3c24x0_i2c_adap[0]}
+#define CONFIG_SYS_NUM_I2C_ADAPTERS 1
+
#define CONFIG_SYS_I2C_EEPROM_ADDR 0x50
#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2
/* use EEPROM for environment vars */
diff --git a/include/configs/smdk5250.h b/include/configs/smdk5250.h
index c0f8622..cb0f449 100644
--- a/include/configs/smdk5250.h
+++ b/include/configs/smdk5250.h
@@ -204,6 +204,10 @@
#define CONFIG_MAX_I2C_NUM 8
#define CONFIG_SYS_I2C_SLAVE 0x0
+#define CONFIG_SYS_I2C
+#define CONFIG_SYS_I2C_ADAPTERS {&s3c24x0_i2c_adap[0]}
+#define CONFIG_SYS_NUM_I2C_ADAPTERS 1
+
/* Ethernet Controllor Driver */
#ifdef CONFIG_CMD_NET
#define CONFIG_SMC911X
--
1.7.5.4
More information about the U-Boot
mailing list