[PATCH 3/6] drivers: tpm: atmel_twi: drop non-DM_I2C compatibility

Ilias Apalodimas ilias.apalodimas at linaro.org
Thu Nov 4 08:10:11 CET 2021


On Thu, 4 Nov 2021 at 03:14, Mathew McBride <matt at traverse.com.au> wrote:
>
> There are no users of this driver without DM_I2C
>
> Signed-off-by: Mathew McBride <matt at traverse.com.au>
> ---
>  drivers/tpm/tpm_atmel_twi.c | 14 +-------------
>  1 file changed, 1 insertion(+), 13 deletions(-)
>
> diff --git a/drivers/tpm/tpm_atmel_twi.c b/drivers/tpm/tpm_atmel_twi.c
> index 2dcc2af67f..4ff4cf4cd4 100644
> --- a/drivers/tpm/tpm_atmel_twi.c
> +++ b/drivers/tpm/tpm_atmel_twi.c
> @@ -81,22 +81,15 @@ static int tpm_atmel_twi_xfer(struct udevice *dev,
>         print_buffer(0, (void *)sendbuf, 1, send_size, 0);
>  #endif
>
> -#if !CONFIG_IS_ENABLED(DM_I2C)
> -       res = i2c_write(0x29, 0, 0, (uchar *)sendbuf, send_size);
> -#else
>         res = dm_i2c_write(dev, 0, sendbuf, send_size);
> -#endif
>         if (res) {
>                 printf("i2c_write returned %d\n", res);
>                 return -1;
>         }
>
>         start = get_timer(0);
> -#if !CONFIG_IS_ENABLED(DM_I2C)
> -       while ((res = i2c_read(0x29, 0, 0, recvbuf, 10)))
> -#else
> +
>         while ((res = dm_i2c_read(dev, 0, recvbuf, 10)))
> -#endif
>         {
>                 /* TODO Use TIS_TIMEOUT from tpm_tis_infineon.h */
>                 if (get_timer(start) > ATMEL_TPM_TIMEOUT_MS) {
> @@ -116,12 +109,7 @@ static int tpm_atmel_twi_xfer(struct udevice *dev,
>                         return -1;
>                 } else {
>                         *recv_len = hdr_recv_len;
> -#if !CONFIG_IS_ENABLED(DM_I2C)
> -                       res = i2c_read(0x29, 0, 0, recvbuf, *recv_len);
> -#else
>                         res = dm_i2c_read(dev, 0, recvbuf, *recv_len);
> -#endif
> -
>                 }
>         }
>         if (res) {
> --
> 2.30.1
>
Reviewed-by: Ilias Apalodimas <ilias.apalodimas at linaro.org>


More information about the U-Boot mailing list