summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristophe Ricard <christophe.ricard@gmail.com>2015-01-13 23:13:13 +0100
committerPeter Huewe <peterhuewe@gmx.de>2015-01-17 15:04:04 +0100
commit3eda7d0ea3a0365aa72a2007f9450f314d92f065 (patch)
treec1a72470fb22133a8142c1028b1ab724d94ead56
parent7b1ee96f074cc931a2c226b33607fe7a74d5cba3 (diff)
downloadlinux-3eda7d0ea3a0365aa72a2007f9450f314d92f065.tar.bz2
tpm/tpm_i2c_stm_st33: Change tpm_i2c_stm_st33.h to tpm_stm_st33.h
include/linux/platform_data/tpm_i2c_stm_st33.h can be used by other st33 tpm device driver not using i2c protocol. Reviewed-by: Jason Gunthorpe <jason.gunthorpe@obsidianresearch.com> Signed-off-by: Christophe Ricard <christophe-h.ricard@st.com> Reviewed-by: Peter Huewe <peterhuewe@gmx.de> Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
-rw-r--r--drivers/char/tpm/tpm_i2c_stm_st33.c2
-rw-r--r--include/linux/platform_data/tpm_stm_st33.h (renamed from include/linux/platform_data/tpm_i2c_stm_st33.h)12
2 files changed, 7 insertions, 7 deletions
diff --git a/drivers/char/tpm/tpm_i2c_stm_st33.c b/drivers/char/tpm/tpm_i2c_stm_st33.c
index 86a24ced66c0..dbab8d0d875e 100644
--- a/drivers/char/tpm/tpm_i2c_stm_st33.c
+++ b/drivers/char/tpm/tpm_i2c_stm_st33.c
@@ -50,7 +50,7 @@
#include <linux/of_irq.h>
#include <linux/of_gpio.h>
-#include <linux/platform_data/tpm_i2c_stm_st33.h>
+#include <linux/platform_data/tpm_stm_st33.h>
#include "tpm.h"
#define TPM_ACCESS 0x0
diff --git a/include/linux/platform_data/tpm_i2c_stm_st33.h b/include/linux/platform_data/tpm_stm_st33.h
index 85775cf5f9a5..ff75310c0f47 100644
--- a/include/linux/platform_data/tpm_i2c_stm_st33.h
+++ b/include/linux/platform_data/tpm_stm_st33.h
@@ -22,18 +22,18 @@
*
* @Author: Christophe RICARD tpmsupport@st.com
*
- * @File: stm_st33_tpm_i2c.h
+ * @File: stm_st33_tpm.h
*
* @Date: 09/15/2010
*/
-#ifndef __STM_ST33_TPM_I2C_MAIN_H__
-#define __STM_ST33_TPM_I2C_MAIN_H__
+#ifndef __STM_ST33_TPM_H__
+#define __STM_ST33_TPM_H__
-
-#define TPM_ST33_I2C "st33zp24_i2c"
+#define TPM_ST33_I2C "st33zp24-i2c"
+#define TPM_ST33_SPI "st33zp24-spi"
struct st33zp24_platform_data {
int io_lpcpd;
};
-#endif /* __STM_ST33_TPM_I2C_MAIN_H__ */
+#endif /* __STM_ST33_TPM_H__ */