summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmar <amarendra.xt@samsung.com>2013-07-10 10:42:29 +0530
committerMinkyu Kang <mk7.kang@samsung.com>2013-07-10 14:20:26 +0900
commit1ae76d438b602fe8be1f0ef8b8ce47c89d371047 (patch)
treeb4287314decd2d574f031f112d861efa70f880c7
parente161f60f4df044e1815f4639795fce13f7b3bee3 (diff)
EXYNOS: Resolve the i2c compilation error
This patch resolves the below mentioned compilation error of i2c driver for non-FDT case Compilation error: s3c24x0_i2c.c: In function 'board_i2c_init': s3c24x0_i2c.c:544:18: error: 'CONFIG_MAX_I2C_NUM' undeclared (first use in this function) s3c24x0_i2c.c:544:18: note: each undeclared identifier is reported only once for each function it appears in s3c24x0_i2c.c:545:3: warning: implicit declaration of function Signed-off-by: Rajeshwari Shinde <rajeshwari.s@samsung.com> Signed-off-by: Amar <amarendra.xt@samsung.com> Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
-rw-r--r--board/samsung/smdk5250/smdk5250.c10
-rw-r--r--drivers/i2c/s3c24x0_i2c.c9
2 files changed, 11 insertions, 8 deletions
diff --git a/board/samsung/smdk5250/smdk5250.c b/board/samsung/smdk5250/smdk5250.c
index ae1f077c4c..f1d3d97fd6 100644
--- a/board/samsung/smdk5250/smdk5250.c
+++ b/board/samsung/smdk5250/smdk5250.c
@@ -332,6 +332,16 @@ static int board_uart_init(void)
return ret;
}
+void board_i2c_init(const void *blob)
+{
+ int i;
+
+ for (i = 0; i < CONFIG_MAX_I2C_NUM; i++) {
+ exynos_pinmux_config((PERIPH_ID_I2C0 + i),
+ PINMUX_FLAG_NONE);
+ }
+}
+
#ifdef CONFIG_BOARD_EARLY_INIT_F
int board_early_init_f(void)
{
diff --git a/drivers/i2c/s3c24x0_i2c.c b/drivers/i2c/s3c24x0_i2c.c
index 3fc1c5b03b..382e4c2ecf 100644
--- a/drivers/i2c/s3c24x0_i2c.c
+++ b/drivers/i2c/s3c24x0_i2c.c
@@ -515,10 +515,10 @@ int i2c_write(uchar chip, uint addr, int alen, uchar *buffer, int len)
len) != 0);
}
+#ifdef CONFIG_OF_CONTROL
void board_i2c_init(const void *blob)
{
int i;
-#ifdef CONFIG_OF_CONTROL
int node_list[CONFIG_MAX_I2C_NUM];
int count;
@@ -540,15 +540,8 @@ void board_i2c_init(const void *blob)
bus->bus_num = i2c_busses++;
exynos_pinmux_config(bus->id, 0);
}
-#else
- for (i = 0; i < CONFIG_MAX_I2C_NUM; i++) {
- exynos_pinmux_config((PERIPH_ID_I2C0 + i),
- PINMUX_FLAG_NONE);
- }
-#endif
}
-#ifdef CONFIG_OF_CONTROL
static struct s3c24x0_i2c_bus *get_bus(unsigned int bus_idx)
{
if (bus_idx < i2c_busses)