summaryrefslogtreecommitdiff
path: root/drivers/tpm/tpm_tis_i2c.h
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2015-08-22 18:31:24 -0600
committerSimon Glass <sjg@chromium.org>2015-08-31 07:57:27 -0600
commit7c73537e8e4a296bb2780c1fadb2b82cd2c38185 (patch)
tree8a663c77f9665d8fef99b217d4a7ca63704fbcc4 /drivers/tpm/tpm_tis_i2c.h
parentb382e02124710d8964fe75b94046a7708c55216c (diff)
downloadu-boot-imx-7c73537e8e4a296bb2780c1fadb2b82cd2c38185.zip
u-boot-imx-7c73537e8e4a296bb2780c1fadb2b82cd2c38185.tar.gz
u-boot-imx-7c73537e8e4a296bb2780c1fadb2b82cd2c38185.tar.bz2
tpm: tpm_tis_i2c: Drop struct tpm_vendor_specific
This function is misnamed since it only applies to a single driver. Merge its fields into its parent. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Heiko Schocher <hs@denx.de>
Diffstat (limited to 'drivers/tpm/tpm_tis_i2c.h')
-rw-r--r--drivers/tpm/tpm_tis_i2c.h16
1 files changed, 5 insertions, 11 deletions
diff --git a/drivers/tpm/tpm_tis_i2c.h b/drivers/tpm/tpm_tis_i2c.h
index 426c519..2a4ad77 100644
--- a/drivers/tpm/tpm_tis_i2c.h
+++ b/drivers/tpm/tpm_tis_i2c.h
@@ -35,21 +35,17 @@ enum tpm_timeout {
struct tpm_chip;
-struct tpm_vendor_specific {
- const u8 req_complete_mask;
- const u8 req_complete_val;
- const u8 req_canceled;
+struct tpm_chip {
+ int is_open;
+ u8 req_complete_mask;
+ u8 req_complete_val;
+ u8 req_canceled;
int irq;
int locality;
unsigned long timeout_a, timeout_b, timeout_c, timeout_d; /* msec */
unsigned long duration[3]; /* msec */
};
-struct tpm_chip {
- int is_open;
- struct tpm_vendor_specific vendor;
-};
-
struct tpm_input_header {
__be16 tag;
__be32 length;
@@ -106,8 +102,6 @@ struct tpm_cmd_t {
union tpm_cmd_params params;
} __packed;
-struct tpm_chip *tpm_register_hardware(const struct tpm_vendor_specific *);
-
struct udevice;
int tpm_vendor_init(struct udevice *dev);