| Message ID | 1381994312-10728-3-git-send-email-nobuhiro.iwamatsu.yj@renesas.com |
|---|---|
| State | Changes Requested |
| Delegated to: | Heiko Schocher |
| Headers | show |
Hello Nobuhiro, Am 17.10.2013 09:18, schrieb Nobuhiro Iwamatsu: > Ecovec uses sh_i2c driver. sh_i2c driver updated to new I2C framwork. > This updates ecovec to this change. > > Signed-off-by: Nobuhiro Iwamatsu<nobuhiro.iwamatsu.yj@renesas.com> > --- > board/renesas/ecovec/ecovec.c | 4 ++-- > include/configs/ecovec.h | 15 +++++++-------- > 2 files changed, 9 insertions(+), 10 deletions(-) Could you sqash this patch into http://patchwork.ozlabs.org/patch/284106 so we get no problems with "git bisect". Beside of that only one comment: > diff --git a/board/renesas/ecovec/ecovec.c b/board/renesas/ecovec/ecovec.c > index e2d365a..4289d2d 100644 > --- a/board/renesas/ecovec/ecovec.c > +++ b/board/renesas/ecovec/ecovec.c > @@ -57,8 +57,8 @@ int board_late_init(void) > > outl(inl(MSTPCR2)& ~0x10000000, MSTPCR2); > > - i2c_init(CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE); > - i2c_set_bus_num(CONFIG_SYS_I2C_MODULE); /* Use I2C 1 */ > + i2c_init(CONFIG_SYS_I2C_SH_SPEED1, CONFIG_SYS_I2C_SLAVE); > + i2c_set_bus_num(1); /* Use I2C 1 */ same comment as for your patch for the kzm9g board, remove i2c_init() call, as it is no longer necessary, thanks! bye, Heiko
Hi, Thanks for your review 2013/10/17 Heiko Schocher <hs@denx.de>: > Hello Nobuhiro, > > Am 17.10.2013 09:18, schrieb Nobuhiro Iwamatsu: > >> Ecovec uses sh_i2c driver. sh_i2c driver updated to new I2C framwork. >> This updates ecovec to this change. >> >> Signed-off-by: Nobuhiro Iwamatsu<nobuhiro.iwamatsu.yj@renesas.com> >> --- >> board/renesas/ecovec/ecovec.c | 4 ++-- >> include/configs/ecovec.h | 15 +++++++-------- >> 2 files changed, 9 insertions(+), 10 deletions(-) > > > Could you sqash this patch into http://patchwork.ozlabs.org/patch/284106 > so we get no problems with "git bisect". OK , I will bisect and re-send. > > Beside of that only one comment: > >> diff --git a/board/renesas/ecovec/ecovec.c b/board/renesas/ecovec/ecovec.c >> index e2d365a..4289d2d 100644 >> --- a/board/renesas/ecovec/ecovec.c >> +++ b/board/renesas/ecovec/ecovec.c >> @@ -57,8 +57,8 @@ int board_late_init(void) >> >> outl(inl(MSTPCR2)& ~0x10000000, MSTPCR2); >> >> >> - i2c_init(CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE); >> - i2c_set_bus_num(CONFIG_SYS_I2C_MODULE); /* Use I2C 1 */ >> + i2c_init(CONFIG_SYS_I2C_SH_SPEED1, CONFIG_SYS_I2C_SLAVE); >> + i2c_set_bus_num(1); /* Use I2C 1 */ > > > same comment as for your patch for the kzm9g board, remove i2c_init() > call, as it is no longer necessary, thanks! > I see. I will remove i2c_init(). > bye, > Heiko Best regards, Nobuhiro
diff --git a/board/renesas/ecovec/ecovec.c b/board/renesas/ecovec/ecovec.c index e2d365a..4289d2d 100644 --- a/board/renesas/ecovec/ecovec.c +++ b/board/renesas/ecovec/ecovec.c @@ -57,8 +57,8 @@ int board_late_init(void) outl(inl(MSTPCR2) & ~0x10000000, MSTPCR2); - i2c_init(CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE); - i2c_set_bus_num(CONFIG_SYS_I2C_MODULE); /* Use I2C 1 */ + i2c_init(CONFIG_SYS_I2C_SH_SPEED1, CONFIG_SYS_I2C_SLAVE); + i2c_set_bus_num(1); /* Use I2C 1 */ /* Read MAC address */ i2c_read(0x50, 0x10, 0, mac, 6); diff --git a/include/configs/ecovec.h b/include/configs/ecovec.h index 34bd0b3..b0c41b1 100644 --- a/include/configs/ecovec.h +++ b/include/configs/ecovec.h @@ -58,18 +58,17 @@ /* I2C */ #define CONFIG_CMD_I2C -#define CONFIG_SH_I2C 1 -#define CONFIG_HARD_I2C 1 -#define CONFIG_I2C_MULTI_BUS 1 -#define CONFIG_SYS_MAX_I2C_BUS 2 -#define CONFIG_SYS_I2C_MODULE 1 -#define CONFIG_SYS_I2C_SPEED 100000 /* 100 kHz */ +#define CONFIG_SYS_I2C +#define CONFIG_SYS_I2C_SH #define CONFIG_SYS_I2C_SLAVE 0x7F +#define CONFIG_SYS_I2C_SH_NUM_CONTROLLERS 2 +#define CONFIG_SYS_I2C_SH_BASE0 0xA4470000 +#define CONFIG_SYS_I2C_SH_SPEED0 100000 +#define CONFIG_SYS_I2C_SH_BASE1 0xA4750000 +#define CONFIG_SYS_I2C_SH_SPEED1 100000 #define CONFIG_SH_I2C_DATA_HIGH 4 #define CONFIG_SH_I2C_DATA_LOW 5 #define CONFIG_SH_I2C_CLOCK 41666666 -#define CONFIG_SH_I2C_BASE0 0xA4470000 -#define CONFIG_SH_I2C_BASE1 0xA4750000 /* Ether */ #define CONFIG_SH_ETHER 1
Ecovec uses sh_i2c driver. sh_i2c driver updated to new I2C framwork. This updates ecovec to this change. Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> --- board/renesas/ecovec/ecovec.c | 4 ++-- include/configs/ecovec.h | 15 +++++++-------- 2 files changed, 9 insertions(+), 10 deletions(-)