board: keymile: convert to CONFIG_DM_I2C
The conversion to DM_I2C is mandatory, rework to remove
use of legacy I2C API.
Signed-off-by: Anatolij Gustschin <agust@denx.de>
Cc: Aleksandar Gerasimovski <aleksandar.gerasimovski@hitachienergy.com>
Cc: Holger Brunck <holger.brunck@hitachienergy.com>
Cc: Tomas Alvarez Vanoli <tomas.alvarez-vanoli@hitachienergy.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Heiko Schocher <hs@denx.de>
diff --git a/board/keymile/Kconfig b/board/keymile/Kconfig
index f7e9b74..4145881 100644
--- a/board/keymile/Kconfig
+++ b/board/keymile/Kconfig
@@ -11,9 +11,6 @@
menu "KM Board Setup"
-config SYS_I2C_INIT_BOARD
- def_bool y if ARM
-
config HUSH_INIT_VAR
def_bool y
diff --git a/board/keymile/common/common.c b/board/keymile/common/common.c
index 9358c25..25897af 100644
--- a/board/keymile/common/common.c
+++ b/board/keymile/common/common.c
@@ -129,7 +129,6 @@
}
#endif
-#if defined(CONFIG_SYS_I2C_INIT_BOARD)
static void i2c_write_start_seq(void)
{
set_sda(1);
@@ -187,17 +186,6 @@
return ret;
}
-/**
- * i2c_init_board - reset i2c bus. When the board is powercycled during a
- * bus transfer it might hang; for details see doc/I2C_Edge_Conditions.
- */
-void i2c_init_board(void)
-{
- /* Now run the AbortSequence() */
- i2c_make_abort();
-}
-#endif
-
#if defined(CONFIG_KM_COMMON_ETH_INIT)
int board_eth_init(struct bd_info *bis)
{
diff --git a/board/keymile/common/common.h b/board/keymile/common/common.h
index d16c824..7d2fdff 100644
--- a/board/keymile/common/common.h
+++ b/board/keymile/common/common.h
@@ -138,13 +138,12 @@
void check_for_uboot_update(void);
#define DELAY_ABORT_SEQ 62 /* @200kHz 9 clocks = 44us, 62us is ok */
-#define DELAY_HALF_PERIOD (500 / (CONFIG_SYS_I2C_SPEED / 1000))
+#define DELAY_HALF_PERIOD (500 / (I2C_SPEED_STANDARD_RATE / 1000))
void set_sda(int state);
void set_scl(int state);
int get_sda(void);
int get_scl(void);
-int i2c_soft_read_pin(void);
int i2c_make_abort(void);
#endif /* __KEYMILE_COMMON_H */
diff --git a/board/keymile/common/ivm.c b/board/keymile/common/ivm.c
index f01fe44..9360c86 100644
--- a/board/keymile/common/ivm.c
+++ b/board/keymile/common/ivm.c
@@ -342,9 +342,8 @@
int ivm_read_eeprom(unsigned char *buf, int len, int mac_address_offset)
{
- int ret;
-#if CONFIG_IS_ENABLED(DM_I2C)
struct udevice *eedev = NULL;
+ int ret;
ret = i2c_get_chip_for_busnum(CONFIG_KM_IVM_BUS,
CONFIG_SYS_IVM_EEPROM_ADR, 1, &eedev);
@@ -354,22 +353,17 @@
return 1;
}
+#if CONFIG_IS_ENABLED(ARCH_LS1021A)
+ /* add deblocking here */
+ i2c_make_abort();
+#endif
+
ret = dm_i2c_read(eedev, 0, buf, len);
if (ret != 0) {
printf("Error: Unable to read from I2C EEPROM at address %02X:%02X\n",
CONFIG_SYS_IVM_EEPROM_ADR, 0);
return 1;
}
-#else
- i2c_set_bus_num(CONFIG_KM_IVM_BUS);
- /* add deblocking here */
- i2c_make_abort();
- ret = i2c_read(CONFIG_SYS_IVM_EEPROM_ADR, 0, 1, buf, len);
- if (ret != 0) {
- printf("Error reading EEprom\n");
- return -2;
- }
-#endif
return ivm_populate_env(buf, len, mac_address_offset);
}
diff --git a/board/keymile/pg-wcom-ls102xa/pg-wcom-ls102xa.c b/board/keymile/pg-wcom-ls102xa/pg-wcom-ls102xa.c
index cc3611e..409a55e 100644
--- a/board/keymile/pg-wcom-ls102xa/pg-wcom-ls102xa.c
+++ b/board/keymile/pg-wcom-ls102xa/pg-wcom-ls102xa.c
@@ -5,7 +5,6 @@
#include <config.h>
#include <event.h>
-#include <i2c.h>
#include <asm/io.h>
#include <asm/arch/immap_ls102xa.h>
#include <asm/arch/clock.h>
@@ -107,6 +106,13 @@
arch_soc_init();
+ /*
+ * Reset I2C bus. When the board is powercycled during a bus
+ * transfer it might hang; for details see doc/I2C_Edge_Conditions.
+ * Now run the AbortSequence()
+ */
+ i2c_make_abort();
+
return 0;
}