From 3eda7d0ea3a0365aa72a2007f9450f314d92f065 Mon Sep 17 00:00:00 2001 From: Christophe Ricard Date: Tue, 13 Jan 2015 23:13:13 +0100 Subject: [PATCH] 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 Signed-off-by: Christophe Ricard Reviewed-by: Peter Huewe Signed-off-by: Peter Huewe --- drivers/char/tpm/tpm_i2c_stm_st33.c | 2 +- .../{tpm_i2c_stm_st33.h => tpm_stm_st33.h} | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) rename include/linux/platform_data/{tpm_i2c_stm_st33.h => tpm_stm_st33.h} (85%) 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 #include -#include +#include #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 similarity index 85% rename from include/linux/platform_data/tpm_i2c_stm_st33.h rename to 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__ */ -- 2.20.1