From e140959fceb246b7d296eb306aac8b6be9d512b3 Mon Sep 17 00:00:00 2001 From: Minkyu Kang Date: Fri, 4 Dec 2009 15:08:20 +0900 Subject: [PATCH] s5pc110: i2c: use API function Signed-off-by: Minkyu Kang --- board/samsung/universal/universal.c | 20 ++++++++++---------- cpu/arm_cortexa8/s5pc1xx/i2c-gpio.c | 7 +------ 2 files changed, 11 insertions(+), 16 deletions(-) diff --git a/board/samsung/universal/universal.c b/board/samsung/universal/universal.c index b5ecbf0..fe2402e 100644 --- a/board/samsung/universal/universal.c +++ b/board/samsung/universal/universal.c @@ -768,7 +768,7 @@ static void check_keypad(void) if (machine_is_aquila()) { /* 3 touchkey */ - i2c_gpio_set_bus(I2C_GPIO6); + i2c_set_bus_num(I2C_GPIO6); if (i2c_probe(addr)) { printf("Can't found 3 touchkey\n"); @@ -799,7 +799,7 @@ static void enable_battery(void) if (!board_is_limo_universal() && !board_is_limo_real()) return; - i2c_gpio_set_bus(I2C_GPIO3); + i2c_set_bus_num(I2C_GPIO3); if (i2c_probe(addr)) { printf("Can't found max17040 fuel gauge\n"); @@ -819,7 +819,7 @@ static void check_battery(void) if (!board_is_limo_universal() && !board_is_limo_real()) return; - i2c_gpio_set_bus(I2C_GPIO3); + i2c_set_bus_num(I2C_GPIO3); if (i2c_probe(addr)) { printf("Can't found max17040 fuel gauge\n"); @@ -852,7 +852,7 @@ static void check_mhl(void) /* output enable */ gpio_set_value(&gpio->gpio_mp0_4, 7, 1); - i2c_gpio_set_bus(I2C_GPIO5); + i2c_set_bus_num(I2C_GPIO5); /* set usb path */ if (i2c_probe(addr)) { @@ -949,7 +949,7 @@ static void check_micro_usb(void) return; } - i2c_gpio_set_bus(I2C_PMIC); + i2c_set_bus_num(I2C_PMIC); addr = 0x25; /* fsa9480 */ if (i2c_probe(addr)) { @@ -1004,7 +1004,7 @@ static void init_pmic(void) if (cpu_is_s5pc100()) return; - i2c_gpio_set_bus(I2C_PMIC); + i2c_set_bus_num(I2C_PMIC); addr = 0xCC >> 1; /* max8998 */ if (i2c_probe(addr)) { @@ -1435,7 +1435,7 @@ void board_sleep_init(void) value &= ~(1 << 18); /* T-Flash */ writel(value, S5PC110_EINT_WAKEUP_MASK); - i2c_gpio_set_bus(I2C_PMIC); + i2c_set_bus_num(I2C_PMIC); addr = 0xCC >> 1; if (i2c_probe(addr)) { printf("Can't find max8998\n"); @@ -1499,7 +1499,7 @@ void board_sleep_resume(void) struct s5pc110_gpio *gpio = (struct s5pc110_gpio *)S5PC110_GPIO_BASE; - i2c_gpio_set_bus(I2C_PMIC); + i2c_set_bus_num(I2C_PMIC); addr = 0xCC >> 1; if (i2c_probe(addr)) { printf("Can't find max8998\n"); @@ -1629,7 +1629,7 @@ static int pmic_status(void) unsigned char addr, val[2]; int reg, i; - i2c_gpio_set_bus(I2C_PMIC); + i2c_set_bus_num(I2C_PMIC); addr = 0xCC >> 1; if (i2c_probe(addr)) { printf("Can't found max8998\n"); @@ -1680,7 +1680,7 @@ static int pmic_ldo_control(int buck, int ldo, int on) } else return -1; - i2c_gpio_set_bus(I2C_PMIC); + i2c_set_bus_num(I2C_PMIC); addr = 0xCC >> 1; if (i2c_probe(addr)) { printf("Can't found max8998\n"); diff --git a/cpu/arm_cortexa8/s5pc1xx/i2c-gpio.c b/cpu/arm_cortexa8/s5pc1xx/i2c-gpio.c index 4a7860d..61cde4b 100644 --- a/cpu/arm_cortexa8/s5pc1xx/i2c-gpio.c +++ b/cpu/arm_cortexa8/s5pc1xx/i2c-gpio.c @@ -29,11 +29,6 @@ static struct i2c_gpio_bus *i2c_gpio; -void i2c_gpio_set_bus(int index) -{ - i2c_set_bus_num(index); -} - void i2c_gpio_init(struct i2c_gpio_bus *bus, int len, int index) { int i; @@ -55,7 +50,7 @@ void i2c_gpio_init(struct i2c_gpio_bus *bus, int len, int index) } /* set default bus */ - i2c_gpio_set_bus(index); + i2c_set_bus_num(index); } void i2c_gpio_set(int line, int value) -- 2.7.4