diff options
author | Christophe Ricard <christophe.ricard@gmail.com> | 2015-01-13 17:13:13 -0500 |
---|---|---|
committer | Peter Huewe <peterhuewe@gmx.de> | 2015-01-17 09:04:04 -0500 |
commit | 3eda7d0ea3a0365aa72a2007f9450f314d92f065 (patch) | |
tree | c1a72470fb22133a8142c1028b1ab724d94ead56 | |
parent | 7b1ee96f074cc931a2c226b33607fe7a74d5cba3 (diff) |
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.c | 2 | ||||
-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 @@ | |||
50 | #include <linux/of_irq.h> | 50 | #include <linux/of_irq.h> |
51 | #include <linux/of_gpio.h> | 51 | #include <linux/of_gpio.h> |
52 | 52 | ||
53 | #include <linux/platform_data/tpm_i2c_stm_st33.h> | 53 | #include <linux/platform_data/tpm_stm_st33.h> |
54 | #include "tpm.h" | 54 | #include "tpm.h" |
55 | 55 | ||
56 | #define TPM_ACCESS 0x0 | 56 | #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 @@ | |||
22 | * | 22 | * |
23 | * @Author: Christophe RICARD tpmsupport@st.com | 23 | * @Author: Christophe RICARD tpmsupport@st.com |
24 | * | 24 | * |
25 | * @File: stm_st33_tpm_i2c.h | 25 | * @File: stm_st33_tpm.h |
26 | * | 26 | * |
27 | * @Date: 09/15/2010 | 27 | * @Date: 09/15/2010 |
28 | */ | 28 | */ |
29 | #ifndef __STM_ST33_TPM_I2C_MAIN_H__ | 29 | #ifndef __STM_ST33_TPM_H__ |
30 | #define __STM_ST33_TPM_I2C_MAIN_H__ | 30 | #define __STM_ST33_TPM_H__ |
31 | 31 | ||
32 | 32 | #define TPM_ST33_I2C "st33zp24-i2c" | |
33 | #define TPM_ST33_I2C "st33zp24_i2c" | 33 | #define TPM_ST33_SPI "st33zp24-spi" |
34 | 34 | ||
35 | struct st33zp24_platform_data { | 35 | struct st33zp24_platform_data { |
36 | int io_lpcpd; | 36 | int io_lpcpd; |
37 | }; | 37 | }; |
38 | 38 | ||
39 | #endif /* __STM_ST33_TPM_I2C_MAIN_H__ */ | 39 | #endif /* __STM_ST33_TPM_H__ */ |