diff options
| author | Tom Rini <trini@ti.com> | 2013-04-15 07:45:07 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-04-15 07:45:07 -0400 |
| commit | 277f037074fbb73be10a7bff27079b6eb0a3bfbb (patch) | |
| tree | fda7a8df71f7ac5b1a4082dd612d3f4cfd17bcf1 /drivers/tpm/generic_lpc_tpm.c | |
| parent | e303be2d2819699a443b5eece5a04ecc380a9b61 (diff) | |
| parent | 8732b0700d21588b4954d0f1b182f4c60725d228 (diff) | |
| download | u-boot-imx-277f037074fbb73be10a7bff27079b6eb0a3bfbb.zip u-boot-imx-277f037074fbb73be10a7bff27079b6eb0a3bfbb.tar.gz u-boot-imx-277f037074fbb73be10a7bff27079b6eb0a3bfbb.tar.bz2 | |
Merge branch 'tpm' of git://git.denx.de/u-boot-x86
Diffstat (limited to 'drivers/tpm/generic_lpc_tpm.c')
| -rw-r--r-- | drivers/tpm/generic_lpc_tpm.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/tpm/generic_lpc_tpm.c b/drivers/tpm/generic_lpc_tpm.c index 6c494eb..04ad418 100644 --- a/drivers/tpm/generic_lpc_tpm.c +++ b/drivers/tpm/generic_lpc_tpm.c @@ -135,7 +135,7 @@ static u8 tpm_read_byte(const u8 *ptr) { u8 ret = readb(ptr); debug(PREFIX "Read reg 0x%4.4x returns 0x%2.2x\n", - (u32)ptr - (u32)lpc_tpm_dev, ret); + (u32)(uintptr_t)ptr - (u32)(uintptr_t)lpc_tpm_dev, ret); return ret; } @@ -143,21 +143,21 @@ static u32 tpm_read_word(const u32 *ptr) { u32 ret = readl(ptr); debug(PREFIX "Read reg 0x%4.4x returns 0x%8.8x\n", - (u32)ptr - (u32)lpc_tpm_dev, ret); + (u32)(uintptr_t)ptr - (u32)(uintptr_t)lpc_tpm_dev, ret); return ret; } static void tpm_write_byte(u8 value, u8 *ptr) { debug(PREFIX "Write reg 0x%4.4x with 0x%2.2x\n", - (u32)ptr - (u32)lpc_tpm_dev, value); + (u32)(uintptr_t)ptr - (u32)(uintptr_t)lpc_tpm_dev, value); writeb(value, ptr); } static void tpm_write_word(u32 value, u32 *ptr) { debug(PREFIX "Write reg 0x%4.4x with 0x%8.8x\n", - (u32)ptr - (u32)lpc_tpm_dev, value); + (u32)(uintptr_t)ptr - (u32)(uintptr_t)lpc_tpm_dev, value); writel(value, ptr); } @@ -491,5 +491,5 @@ int tis_sendrecv(const u8 *sendbuf, size_t send_size, return TPM_DRIVER_ERR; } - return tis_readresponse(recvbuf, recv_len); + return tis_readresponse(recvbuf, (u32 *)recv_len); } |