diff options
| author | Tom Rini <trini@konsulko.com> | 2020-11-16 13:42:29 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-11-16 13:42:29 -0500 |
| commit | 9324c9a823ed91d901fb56954f438f9854b19bb5 (patch) | |
| tree | 41109045207756a47673ebc893489fba4120e74e /drivers | |
| parent | 530dcdd07c9870bcb22e40a72d9ffe2afc513117 (diff) | |
| parent | 914689a204308df47eb60dfbb394fa4cee4fda31 (diff) | |
| download | u-boot-9324c9a823ed91d901fb56954f438f9854b19bb5.zip u-boot-9324c9a823ed91d901fb56954f438f9854b19bb5.tar.gz u-boot-9324c9a823ed91d901fb56954f438f9854b19bb5.tar.bz2 | |
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 'drivers')
| -rw-r--r-- | drivers/mtd/onenand/onenand_base.c | 1 | ||||
| -rw-r--r-- | drivers/power/twl4030.c | 7 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/mtd/onenand/onenand_base.c b/drivers/mtd/onenand/onenand_base.c index 36daef0..09daa0d 100644 --- a/drivers/mtd/onenand/onenand_base.c +++ b/drivers/mtd/onenand/onenand_base.c @@ -2657,6 +2657,7 @@ int onenand_probe(struct mtd_info *mtd) else mtd->size = this->chipsize; + mtd->type = ONENAND_IS_MLC(this) ? MTD_MLCNANDFLASH : MTD_NANDFLASH; mtd->flags = MTD_CAP_NANDFLASH; mtd->_erase = onenand_erase; mtd->_read_oob = onenand_read_oob; diff --git a/drivers/power/twl4030.c b/drivers/power/twl4030.c index b0d5cba..f48af84 100644 --- a/drivers/power/twl4030.c +++ b/drivers/power/twl4030.c @@ -201,7 +201,7 @@ int twl4030_i2c_write_u8(u8 chip_no, u8 reg, u8 val) return 0; } -int twl4030_i2c_read_u8(u8 chip_no, u8 reg, u8 *valp) +int twl4030_i2c_read(u8 chip_no, u8 reg, u8 *valp, int len) { struct udevice *dev; int ret; @@ -211,12 +211,11 @@ int twl4030_i2c_read_u8(u8 chip_no, u8 reg, u8 *valp) pr_err("unable to get I2C bus. ret %d\n", ret); return ret; } - ret = dm_i2c_reg_read(dev, reg); - if (ret < 0) { + ret = dm_i2c_read(dev, reg, valp, len); + if (ret) { pr_err("reading from twl4030 failed. ret %d\n", ret); return ret; } - *valp = (u8)ret; return 0; } #endif |