From 401214bfbece31e3ef783f13b762da6f83d10f84 Mon Sep 17 00:00:00 2001
From: andrew azmansky <andrew.zaman...@nuvoton.com>
Date: Thu, 2 Jun 2016 09:13:28 +0300
Subject: [PATCH] adding tpm2.0 support to nuvoton drivers and adding npct6xx
to device tree
Signed-off-by: Andrew Zamansky <andrew.zaman...@nuvoton.com>
---
Documentation/devicetree/bindings/i2c/trivial-devices.txt | 1 +
drivers/char/tpm/tpm_i2c_nuvoton.c | 5 +++--
drivers/char/tpm/tpm_tis.c | 2 +-
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/Documentation/devicetree/bindings/i2c/trivial-devices.txt
b/Documentation/devicetree/bindings/i2c/trivial-devices.txt
index 5398744..0a07cbc 100644
--- a/Documentation/devicetree/bindings/i2c/trivial-devices.txt
+++ b/Documentation/devicetree/bindings/i2c/trivial-devices.txt
@@ -62,6 +62,7 @@ national,lm80 Serial Interface ACPI-Compatible
Microprocessor System Hardware M
national,lm85 Temperature sensor with integrated fan control
national,lm92 ±0.33°C Accurate, 12-Bit + Sign Temperature Sensor and
Thermal Window Comparator with Two-Wire Interface
nuvoton,npct501 i2c trusted platform module (TPM)
+nuvoton,npct6xx i2c trusted platform module (TPM) 6xx series
nxp,pca9556 Octal SMBus and I2C registered interface
nxp,pca9557 8-bit I2C-bus and SMBus I/O port with reset
nxp,pcf8563 Real-time clock/calendar
diff --git a/drivers/char/tpm/tpm_i2c_nuvoton.c
b/drivers/char/tpm/tpm_i2c_nuvoton.c
index b64effc..7fb0e6c 100644
--- a/drivers/char/tpm/tpm_i2c_nuvoton.c
+++ b/drivers/char/tpm/tpm_i2c_nuvoton.c
@@ -1,5 +1,5 @@
/******************************************************************************
- * Nuvoton TPM I2C Device Driver Interface for WPCT301/NPCT501,
+ * Nuvoton TPM I2C Device Driver Interface for WPCT301/NPCT501/NPCT6XX,
* based on the TCG TPM Interface Spec version 1.2.
* Specifications at www.trustedcomputinggroup.org
*
@@ -456,7 +456,7 @@ static bool i2c_nuvoton_req_canceled(struct tpm_chip *chip,
u8 status)
}
static const struct tpm_class_ops tpm_i2c = {
- .flags = TPM_OPS_AUTO_STARTUP,
+ .flags = TPM_OPS_AUTO_STARTUP | TPM_OPS_PROBE_TPM2,
.status = i2c_nuvoton_read_status,
.recv = i2c_nuvoton_recv,
.send = i2c_nuvoton_send,
@@ -623,6 +623,7 @@ MODULE_DEVICE_TABLE(i2c, i2c_nuvoton_id);
static const struct of_device_id i2c_nuvoton_of_match[] = {
{.compatible = "nuvoton,npct501"},
{.compatible = "winbond,wpct301"},
+ {.compatible = "nuvoton,npct6xx"},
{},
};
MODULE_DEVICE_TABLE(of, i2c_nuvoton_of_match);
diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c
index 30aff5b..bc5fba3 100644
--- a/drivers/char/tpm/tpm_tis.c
+++ b/drivers/char/tpm/tpm_tis.c
@@ -524,7 +524,7 @@ static bool tpm_tis_req_canceled(struct tpm_chip *chip, u8
status)
}
static const struct tpm_class_ops tpm_tis = {
- .flags = TPM_OPS_AUTO_STARTUP,
+ .flags = TPM_OPS_AUTO_STARTUP | TPM_OPS_PROBE_TPM2,
.status = tpm_tis_status,
.recv = tpm_tis_recv,
.send = tpm_tis_send,
--
1.9.1
this patch requires Jason's latest patch
------------------------------------------------------------------------------
What NetFlow Analyzer can do for you? Monitors network bandwidth and traffic
patterns at an interface-level. Reveals which users, apps, and protocols are
consuming the most bandwidth. Provides multi-vendor support for NetFlow,
J-Flow, sFlow and other flows. Make informed decisions using capacity
planning reports. https://ad.doubleclick.net/ddm/clk/305295220;132659582;e
_______________________________________________
tpmdd-devel mailing list
tpmdd-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tpmdd-devel
