mbox

[tpmdd-devel,PULL,REQUEST] Pull TPM Fixes/Changes / TPM2.0 Support for 4.1

Message ID 201503182305.54790.PeterHuewe@gmx.de
State Accepted
Headers show

Pull-request

https://github.com/PeterHuewe/linux-tpmdd for-james

Message

Peter Hüwe March 18, 2015, 10:05 p.m. UTC
Hi James,

since the next merge window approaches, can you please pull the following TPM 
changes/fixes for 4.1?

1 patches are marked for stable.
Based against your latest -next (including the fixes you already pulled for 4.0)

Since 
The following changes since commit 74f0414b2f9a6b12df208a69baa21e22178a2463:

  Merge tag 'yama-4.0' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux into next (2015-03-03 19:56:08 +1100)

are available in the git repository at:

  https://github.com/PeterHuewe/linux-tpmdd for-james

for you to fetch changes up to 6b37729bd184fdd44f144c6cc4951b06b55bcf4b:

  tpm/tpm_infineon: Use struct dev_pm_ops for power management (2015-03-18 22:43:08 +0100)

----------------------------------------------------------------
Christophe Ricard (4):
      tpm/tpm_i2c_stm_st33: Replace access to io_lpcpd from struct st33zp24_platform_data to tpm_stm_dev
      tpm/tpm_i2c_stm_st33: Split tpm_i2c_tpm_st33 in 2 layers (core + phy)
      tpm/st33zp24/spi: Add st33zp24 spi phy
      tpm/st33zp24/dts/st33zp24-spi: Add dts documentation for st33zp24 spi phy

Jarkko Sakkinen (2):
      tpm: fix call order in tpm-chip.c
      tpm: fix: sanitized code paths in tpm_chip_register()

Peter Huewe (3):
      tpm: Update KConfig text to include TPM2.0 FIFO chips
      MAINTAINERS: Add Jason as designated reviewer for TPM
      tpm/tpm_infineon: Use struct dev_pm_ops for power management

jmlatten@linux.vnet.ibm.com (1):
      tpm/ibmvtpm: Additional LE support for tpm_ibmvtpm_send

 .../bindings/security/tpm/st33zp24-spi.txt         |  34 +
 MAINTAINERS                                        |   1 +
 drivers/char/tpm/Kconfig                           |  20 +-
 drivers/char/tpm/Makefile                          |   2 +-
 drivers/char/tpm/st33zp24/Kconfig                  |  30 +
 drivers/char/tpm/st33zp24/Makefile                 |  12 +
 drivers/char/tpm/st33zp24/i2c.c                    | 276 +++++++
 drivers/char/tpm/st33zp24/spi.c                    | 392 +++++++++
 drivers/char/tpm/st33zp24/st33zp24.c               | 688 ++++++++++++++++
 drivers/char/tpm/st33zp24/st33zp24.h               |  37 +
 drivers/char/tpm/tpm-chip.c                        |  92 ++-
 drivers/char/tpm/tpm_i2c_stm_st33.c                | 911 ---------------------
 drivers/char/tpm/tpm_ibmvtpm.c                     |  10 +-
 drivers/char/tpm/tpm_ibmvtpm.h                     |   6 +-
 drivers/char/tpm/tpm_infineon.c                    |  34 +-
 .../platform_data/{tpm_stm_st33.h => st33zp24.h}   |  21 +-
 16 files changed, 1551 insertions(+), 1015 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/security/tpm/st33zp24-spi.txt
 create mode 100644 drivers/char/tpm/st33zp24/Kconfig
 create mode 100644 drivers/char/tpm/st33zp24/Makefile
 create mode 100644 drivers/char/tpm/st33zp24/i2c.c
 create mode 100644 drivers/char/tpm/st33zp24/spi.c
 create mode 100644 drivers/char/tpm/st33zp24/st33zp24.c
 create mode 100644 drivers/char/tpm/st33zp24/st33zp24.h
 delete mode 100644 drivers/char/tpm/tpm_i2c_stm_st33.c
 rename include/linux/platform_data/{tpm_stm_st33.h => st33zp24.h} (60%)

------------------------------------------------------------------------------
Dive into the World of Parallel Programming The Go Parallel Website, sponsored
by Intel and developed in partnership with Slashdot Media, is your hub for all
things parallel software development, from weekly thought leadership blogs to
news, videos, case studies, tutorials and more. Take a look and join the 
conversation now. http://goparallel.sourceforge.net/

Comments

James Morris March 19, 2015, midnight UTC | #1
On Wed, 18 Mar 2015, Peter Hüwe wrote:

> Hi James,
> 
> since the next merge window approaches, can you please pull the following TPM 
> changes/fixes for 4.1?
> 
> 1 patches are marked for stable.
> Based against your latest -next (including the fixes you already pulled for 4.0)

Pulled, thanks.