tpm/tpm_i2c_stm_st33: Move tpm registers to tpm_i2c_stm_st33.c

Move tpm registers to tpm_i2c_stm_st33.c.

Reviewed-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
Signed-off-by: Christophe Ricard <christophe-h.ricard@st.com>
Signed-off-by: Peter Huewe <peterhuewe@gmx.de>

diff --git a/drivers/char/tpm/tpm_i2c_stm_st33.c b/drivers/char/tpm/tpm_i2c_stm_st33.c
index c4925a0..44a0210 100644 (file)
--- a/drivers/char/tpm/tpm_i2c_stm_st33.c
+++ b/drivers/char/tpm/tpm_i2c_stm_st33.c
@@ -49,6 +49,23 @@
 #include <linux/slab.h>
 
 #include "tpm.h"
+
+#define TPM_ACCESS                     0x0
+#define TPM_STS                                0x18
+#define TPM_HASH_END                   0x20
+#define TPM_DATA_FIFO                  0x24
+#define TPM_HASH_DATA                  0x24
+#define TPM_HASH_START                 0x28
+#define TPM_INTF_CAPABILITY            0x14
+#define TPM_INT_STATUS                 0x10
+#define TPM_INT_ENABLE                 0x08
+
+#define TPM_DUMMY_BYTE                 0xAA
+#define TPM_WRITE_DIRECTION            0x80
+#define TPM_HEADER_SIZE                        10
+#define TPM_BUFSIZE                    2048
+
+#define LOCALITY0              0
 #include "tpm_i2c_stm_st33.h"
 
 enum stm33zp24_access {

diff --git a/drivers/char/tpm/tpm_i2c_stm_st33.h b/drivers/char/tpm/tpm_i2c_stm_st33.h
index 439a432..3041271 100644 (file)
--- a/drivers/char/tpm/tpm_i2c_stm_st33.h
+++ b/drivers/char/tpm/tpm_i2c_stm_st33.h
@@ -30,23 +30,6 @@
 #ifndef __STM_ST33_TPM_I2C_MAIN_H__
 #define __STM_ST33_TPM_I2C_MAIN_H__
 
-#define TPM_ACCESS                     (0x0)
-#define TPM_STS                                (0x18)
-#define TPM_HASH_END                   (0x20)
-#define TPM_DATA_FIFO                  (0x24)
-#define TPM_HASH_DATA                  (0x24)
-#define TPM_HASH_START                 (0x28)
-#define TPM_INTF_CAPABILITY            (0x14)
-#define TPM_INT_STATUS                 (0x10)
-#define TPM_INT_ENABLE                 (0x08)
-
-#define TPM_DUMMY_BYTE                 0xAA
-#define TPM_WRITE_DIRECTION            0x80
-#define TPM_HEADER_SIZE                        10
-#define TPM_BUFSIZE                    2048
-
-#define LOCALITY0              0
-
 #define TPM_ST33_I2C                   "st33zp24_i2c"
 
 struct st33zp24_platform_data {