net: ks8851: Use 16bit RXQCR access

[oweals/u-boot.git] / drivers / tpm / tpm_tis_lpc.c

diff --git a/drivers/tpm/tpm_tis_lpc.c b/drivers/tpm/tpm_tis_lpc.c
index 7664bb1a6057996b4d2a8c0d726fce1b370045c4..2dd374cf77d18bb75fc4518d99ab54bff44b9c39 100644 (file)
--- a/drivers/tpm/tpm_tis_lpc.c
+++ b/drivers/tpm/tpm_tis_lpc.c
@@ -14,9 +14,11 @@
 
 #include <common.h>
 #include <dm.h>
+#include <log.h>
 #include <mapmem.h>
 #include <tpm-v1.h>
 #include <asm/io.h>
+#include <linux/delay.h>
 
 #define PREFIX "lpc_tpm: "
 
@@ -164,7 +166,7 @@ static int tpm_tis_lpc_probe(struct udevice *dev)
        u32 didvid;
        ulong chip_type = dev_get_driver_data(dev);
 
-       addr = devfdt_get_addr(dev);
+       addr = dev_read_addr(dev);
        if (addr == FDT_ADDR_T_NONE)
                return -EINVAL;
        priv->regs = map_sysmem(addr, 0);
@@ -388,6 +390,27 @@ static int tis_readresponse(struct udevice *dev, u8 *buffer, size_t len)
        return offset;
 }
 
+static int tpm_tis_lpc_close(struct udevice *dev)
+{
+       struct tpm_tis_lpc_priv *priv = dev_get_priv(dev);
+       struct tpm_locality *regs = priv->regs;
+       u8 locality = 0;
+
+       if (tpm_read_word(priv, &regs[locality].access) &
+           TIS_ACCESS_ACTIVE_LOCALITY) {
+               tpm_write_word(priv, TIS_ACCESS_ACTIVE_LOCALITY,
+                              &regs[locality].access);
+
+               if (tis_wait_reg(priv, &regs[locality].access,
+                                TIS_ACCESS_ACTIVE_LOCALITY, 0) == -ETIMEDOUT) {
+                       printf("%s:%d - failed to release locality %d\n",
+                              __FILE__, __LINE__, locality);
+                       return -ETIMEDOUT;
+               }
+       }
+       return 0;
+}
+
 static int tpm_tis_lpc_open(struct udevice *dev)
 {
        struct tpm_tis_lpc_priv *priv = dev_get_priv(dev);
@@ -395,6 +418,12 @@ static int tpm_tis_lpc_open(struct udevice *dev)
        u8 locality = 0; /* we use locality zero for everything. */
        int ret;
 
+       ret = tpm_tis_lpc_close(dev);
+       if (ret) {
+               printf("%s: Failed to close TPM\n", __func__);
+               return ret;
+       }
+
        /* now request access to locality. */
        tpm_write_word(priv, TIS_ACCESS_REQUEST_USE, &regs[locality].access);
 
@@ -410,27 +439,7 @@ static int tpm_tis_lpc_open(struct udevice *dev)
 
        tpm_write_word(priv, TIS_STS_COMMAND_READY,
                       &regs[locality].tpm_status);
-       return 0;
-}
-
-static int tpm_tis_lpc_close(struct udevice *dev)
-{
-       struct tpm_tis_lpc_priv *priv = dev_get_priv(dev);
-       struct tpm_locality *regs = priv->regs;
-       u8 locality = 0;
-
-       if (tpm_read_word(priv, &regs[locality].access) &
-           TIS_ACCESS_ACTIVE_LOCALITY) {
-               tpm_write_word(priv, TIS_ACCESS_ACTIVE_LOCALITY,
-                              &regs[locality].access);
 
-               if (tis_wait_reg(priv, &regs[locality].access,
-                                TIS_ACCESS_ACTIVE_LOCALITY, 0) == -ETIMEDOUT) {
-                       printf("%s:%d - failed to release locality %d\n",
-                              __FILE__, __LINE__, locality);
-                       return -ETIMEDOUT;
-               }
-       }
        return 0;
 }