diff options
| author | Tom Rini <trini@konsulko.com> | 2020-11-16 21:42:29 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-11-16 21:42:29 +0300 |
| commit | 9324c9a823ed91d901fb56954f438f9854b19bb5 (patch) | |
| tree | 41109045207756a47673ebc893489fba4120e74e /include | |
| parent | 530dcdd07c9870bcb22e40a72d9ffe2afc513117 (diff) | |
| parent | 914689a204308df47eb60dfbb394fa4cee4fda31 (diff) | |
| download | u-boot-9324c9a823ed91d901fb56954f438f9854b19bb5.tar.xz | |
Merge tag 'ti-v2021.01-rc3' of https://gitlab.denx.de/u-boot/custodians/u-boot-ti
- Fix Nokia RX-51 boot issues
- Fix CONFIG_LOGLEVEL on K3 devices
- Add phyBOARD REGOR support
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/nokia_rx51.h | 12 | ||||
| -rw-r--r-- | include/twl4030.h | 12 |
2 files changed, 9 insertions, 15 deletions
diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h index c86c429413..6879f52a0c 100644 --- a/include/configs/nokia_rx51.h +++ b/include/configs/nokia_rx51.h @@ -75,14 +75,6 @@ #define CONFIG_USBD_MANUFACTURER "Nokia" #define CONFIG_USBD_PRODUCT_NAME "N900" -/* commands to include */ - -#define CONFIG_SYS_I2C - -/* - * TWL4030 - */ - #define GPIO_SLIDE 71 /* @@ -231,10 +223,6 @@ int rx51_kp_getc(struct stdio_dev *sdev); "run attachboot;" \ "echo" -/* - * Miscellaneous configurable options - */ - /* default load address */ #define CONFIG_SYS_LOAD_ADDR (OMAP34XX_SDRC_CS0) diff --git a/include/twl4030.h b/include/twl4030.h index c27ad615ee..ef05193996 100644 --- a/include/twl4030.h +++ b/include/twl4030.h @@ -654,14 +654,20 @@ static inline int twl4030_i2c_write_u8(u8 chip_no, u8 reg, u8 val) return i2c_write(chip_no, reg, 1, &val, 1); } -static inline int twl4030_i2c_read_u8(u8 chip_no, u8 reg, u8 *val) +static inline int twl4030_i2c_read(u8 chip_no, u8 reg, u8 *val, int len) { - return i2c_read(chip_no, reg, 1, val, 1); + return i2c_read(chip_no, reg, 1, val, len); } #else int twl4030_i2c_write_u8(u8 chip_no, u8 reg, u8 val); -int twl4030_i2c_read_u8(u8 chip_no, u8 reg, u8 *val); +int twl4030_i2c_read(u8 chip_no, u8 reg, u8 *val, int len); #endif + +static inline int twl4030_i2c_read_u8(u8 chip_no, u8 reg, u8 *val) +{ + return twl4030_i2c_read(chip_no, reg, val, 1); +} + /* * Power */ |