diff options
| author | Che-Liang Chiou <clchiou@chromium.org> | 2011-12-20 16:35:10 +0800 |
|---|---|---|
| committer | Gerrit <chrome-bot@google.com> | 2011-12-20 07:43:30 -0800 |
| commit | 955f0be509f6b55d84beb0809488f8c3f7877111 (patch) | |
| tree | f83af2077b38bfb1de9c2aaa25cfe02f901197ae /drivers | |
| parent | 690c2073f08f142c00c89b71195f530314360207 (diff) | |
tegra: tpm: Use i2c's zero register address length
BUG=none
TEST=emerge-tegra_kaen chromeos-u-boot
Signed-off-by: Che-Liang Chiou <clchiou@chromium.org>
CQ-DEPEND=Ibb8f42116812dba74e726129ea92a941e15c272b
Change-Id: Iba58e415e7cd6deafa5744c1ff501a8ea5730d1e
Reviewed-on: https://gerrit.chromium.org/gerrit/13227
Commit-Ready: Che-Liang Chiou <clchiou@chromium.org>
Tested-by: Che-Liang Chiou <clchiou@chromium.org>
Reviewed-by: Rong Chang <rongchang@chromium.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/tpm/slb9635_i2c/tpm_tis_i2c.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/drivers/tpm/slb9635_i2c/tpm_tis_i2c.c b/drivers/tpm/slb9635_i2c/tpm_tis_i2c.c index c239a30457f..aea3c264354 100644 --- a/drivers/tpm/slb9635_i2c/tpm_tis_i2c.c +++ b/drivers/tpm/slb9635_i2c/tpm_tis_i2c.c @@ -77,13 +77,6 @@ static struct tpm_inf_dev tpm_dev = { .addr = TPM_I2C_ADDR }; -/* I2C Read/Write Functions from U-Boot -* Unfortunately we have to use these functions directly, due to the wakeup -* behaviour of the tpm -*/ -extern int i2c_read_data(uchar chip, uchar *buffer, int len); -extern int i2c_write_data(uchar chip, uchar *buffer, int len); - /* * iic_tpm_read() - read from TPM register * @addr: register address to read from @@ -106,7 +99,7 @@ int iic_tpm_read(u8 addr, u8 *buffer, size_t len) /* we have to use uint here, uchar hangs the board */ for (count = 0; count < MAX_COUNT; count++) { - rc = i2c_write_data(tpm_dev.addr, (uchar *) &myaddr, 1); + rc = i2c_write(tpm_dev.addr, 0, 0, (uchar *) &myaddr, 1); if (rc == 0) break; /*success, break to skip sleep*/ @@ -121,7 +114,7 @@ int iic_tpm_read(u8 addr, u8 *buffer, size_t len) */ for (count = 0; count < MAX_COUNT; count++) { udelay(SLEEP_DURATION); - rc = i2c_read_data(tpm_dev.addr, buffer, len); + rc = i2c_read(tpm_dev.addr, 0, 0, buffer, len); if (rc == 0) break; /*success, break to skip sleep*/ @@ -145,7 +138,7 @@ static int iic_tpm_write_generic(u8 addr, u8 *buffer, size_t len, memcpy(&(tpm_dev.buf[1]), buffer, len); for (count = 0; count < max_count; count++) { - rc = i2c_write_data(tpm_dev.addr, tpm_dev.buf, len + 1); + rc = i2c_write(tpm_dev.addr, 0, 0, tpm_dev.buf, len + 1); if (rc == 0) break; /*success, break to skip sleep*/ |