]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
drivers: tpm: atmel_twi: drop non-DM_I2C compatibility
authorMathew McBride <matt@traverse.com.au>
Thu, 11 Nov 2021 04:06:28 +0000 (04:06 +0000)
committerIlias Apalodimas <ilias.apalodimas@linaro.org>
Wed, 17 Nov 2021 11:47:29 +0000 (13:47 +0200)
There are no users of this driver without DM_I2C

Signed-off-by: Mathew McBride <matt@traverse.com.au>
Reviewed-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
Signed-off-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
drivers/tpm/tpm_atmel_twi.c

index 2dcc2af67f9b3ac351e003a2d376b56f87bb78bb..4ff4cf4cd423ed0d1c22e6e9df49e8352f2fd5f4 100644 (file)
@@ -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) {