diff options
| author | Christophe Ricard <christophe.ricard@gmail.com> | 2015-03-08 06:17:14 -0400 |
|---|---|---|
| committer | Peter Huewe <peterhuewe@gmx.de> | 2015-03-18 17:43:06 -0400 |
| commit | bf38b8710892333cec2d8069644eb36ff435fd6f (patch) | |
| tree | 8319469f65050f72a95ad0ca3e7d231779eac2b7 /include/linux/platform_data | |
| parent | fe7d36859f25cec5029fb4f26e40db2fea623906 (diff) | |
tpm/tpm_i2c_stm_st33: Split tpm_i2c_tpm_st33 in 2 layers (core + phy)
tpm_i2c_stm_st33 is a TIS 1.2 TPM with a core interface which can be used
by different phy such as i2c or spi. The core part is called st33zp24 which
is also the main part reference.
include/linux/platform_data/tpm_stm_st33.h is renamed consequently.
The driver is also split into an i2c phy in charge of sending/receiving
data as well as managing platform data or dts configuration.
Acked-by: Jarkko Sakkinen <jarkko.sakknen@linux.intel.com>
Reviewed-by: Jason Gunthorpe <jason.gunthorpe@obsidianresearch.com>
Signed-off-by: Christophe Ricard <christophe-h.ricard@st.com>
Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
Diffstat (limited to 'include/linux/platform_data')
| -rw-r--r-- | include/linux/platform_data/st33zp24.h (renamed from include/linux/platform_data/tpm_stm_st33.h) | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/include/linux/platform_data/tpm_stm_st33.h b/include/linux/platform_data/st33zp24.h index ff75310c0f47..817dfdb37885 100644 --- a/include/linux/platform_data/tpm_stm_st33.h +++ b/include/linux/platform_data/st33zp24.h | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * STMicroelectronics TPM I2C Linux driver for TPM ST33ZP24 | 2 | * STMicroelectronics TPM Linux driver for TPM 1.2 ST33ZP24 |
| 3 | * Copyright (C) 2009, 2010 STMicroelectronics | 3 | * Copyright (C) 2009 - 2015 STMicroelectronics |
| 4 | * | 4 | * |
| 5 | * This program is free software; you can redistribute it and/or modify | 5 | * This program is free software; you can redistribute it and/or modify |
| 6 | * it under the terms of the GNU General Public License as published by | 6 | * it under the terms of the GNU General Public License as published by |
| @@ -14,20 +14,9 @@ | |||
| 14 | * | 14 | * |
| 15 | * You should have received a copy of the GNU General Public License | 15 | * You should have received a copy of the GNU General Public License |
| 16 | * along with this program; if not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program; if not, see <http://www.gnu.org/licenses/>. |
| 17 | * | ||
| 18 | * STMicroelectronics version 1.2.0, Copyright (C) 2010 | ||
| 19 | * STMicroelectronics comes with ABSOLUTELY NO WARRANTY. | ||
| 20 | * This is free software, and you are welcome to redistribute it | ||
| 21 | * under certain conditions. | ||
| 22 | * | ||
| 23 | * @Author: Christophe RICARD tpmsupport@st.com | ||
| 24 | * | ||
| 25 | * @File: stm_st33_tpm.h | ||
| 26 | * | ||
| 27 | * @Date: 09/15/2010 | ||
| 28 | */ | 17 | */ |
| 29 | #ifndef __STM_ST33_TPM_H__ | 18 | #ifndef __ST33ZP24_H__ |
| 30 | #define __STM_ST33_TPM_H__ | 19 | #define __ST33ZP24_H__ |
| 31 | 20 | ||
| 32 | #define TPM_ST33_I2C "st33zp24-i2c" | 21 | #define TPM_ST33_I2C "st33zp24-i2c" |
| 33 | #define TPM_ST33_SPI "st33zp24-spi" | 22 | #define TPM_ST33_SPI "st33zp24-spi" |
| @@ -36,4 +25,4 @@ struct st33zp24_platform_data { | |||
| 36 | int io_lpcpd; | 25 | int io_lpcpd; |
| 37 | }; | 26 | }; |
| 38 | 27 | ||
| 39 | #endif /* __STM_ST33_TPM_H__ */ | 28 | #endif /* __ST33ZP24_H__ */ |
