diff options
author | Jean-Jacques Hiblot <jjhiblot@ti.com> | 2018-12-07 14:50:49 +0100 |
---|---|---|
committer | Heiko Schocher <hs@denx.de> | 2018-12-10 07:15:21 +0100 |
commit | 1514244cc137fe29c9321ea2990de2ec827a9549 (patch) | |
tree | 7bd338feaa0ea0e779e9bf9e7b668cc6d1b35dc9 /board/ti/am57xx | |
parent | ad95da1f3c2d67e36f2b334083bc487b05085c7e (diff) | |
download | u-boot-1514244cc137fe29c9321ea2990de2ec827a9549.zip u-boot-1514244cc137fe29c9321ea2990de2ec827a9549.tar.gz u-boot-1514244cc137fe29c9321ea2990de2ec827a9549.tar.bz2 |
ti: remove usage of DM_I2C_COMPAT and don't disable DM_I2C in SPL
DM_I2C_COMPAT is a compatibility layer that allows using the non-DM I2C
API when DM_I2C is used. The goal is to eventually remove DM_I2C_COMPAT
when all I2C "clients" have been migrated to use the DM API.
This a step in that direction for the TI based platforms.
Build tested with buildman:
buildman -dle am33xx ti omap3 omap4 omap5 davinci keystone
boot tested with:
am335x_evm, am335x_boneblack, am335x_boneblack_vboot (DM version),
am57xx_evm, dra7xx_evm, k2g_evm, am437x_evm
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Heiko Schocher <hs@denx.de>
Diffstat (limited to 'board/ti/am57xx')
-rw-r--r-- | board/ti/am57xx/board.c | 29 |
1 files changed, 28 insertions, 1 deletions
diff --git a/board/ti/am57xx/board.c b/board/ti/am57xx/board.c index 177a324..355ea55 100644 --- a/board/ti/am57xx/board.c +++ b/board/ti/am57xx/board.c @@ -623,7 +623,7 @@ void am57x_idk_lcd_detect(void) { int r = -ENODEV; char *idk_lcd = "no"; - uint8_t buf = 0; + u8 buf = 0; /* Only valid for IDKs */ if (board_is_x15() || board_is_am572x_evm()) @@ -633,6 +633,7 @@ void am57x_idk_lcd_detect(void) if (board_is_am571x_idk() && !am571x_idk_needs_lcd()) goto out; +#ifndef CONFIG_DM_I2C r = i2c_set_bus_num(OSD_TS_FT_BUS_ADDRESS); if (r) { printf("%s: Failed to set bus address to %d: %d\n", @@ -657,6 +658,32 @@ void am57x_idk_lcd_detect(void) OSD_TS_FT_REG_ID, r); goto out; } +#else + struct udevice *dev; + + r = i2c_get_chip_for_busnum(OSD_TS_FT_BUS_ADDRESS, + OSD_TS_FT_CHIP_ADDRESS, 1, &dev); + if (r) { + printf("%s: Failed to get I2C device %d/%d (ret %d)\n", + __func__, OSD_TS_FT_BUS_ADDRESS, OSD_TS_FT_CHIP_ADDRESS, + r); + /* AM572x IDK has no explicit settings for optional LCD kit */ + if (board_is_am571x_idk()) + printf("%s: Touch screen detect failed: %d!\n", + __func__, r); + goto out; + } + + /* Read FT ID */ + r = dm_i2c_reg_read(dev, OSD_TS_FT_REG_ID); + if (r < 0) { + printf("%s: Touch screen ID read %d:0x%02x[0x%02x] failed:%d\n", + __func__, OSD_TS_FT_BUS_ADDRESS, OSD_TS_FT_CHIP_ADDRESS, + OSD_TS_FT_REG_ID, r); + goto out; + } + buf = (u8)r; +#endif switch (buf) { case OSD_TS_FT_ID_5606: |