[PATCH] tpm: replace odd LPC init function

Realized the tpm_lpc_init function isn't really necessary.  Replaced it
with vendor specific logic to find out the address the BIOS mapped the TPM
to.  This patch removes the tpm_lpc_init function, enums associated with it
and calls to it.  The patch also implements the replacement functionality.

Signed-off-by: Kylene Hall <kjhall@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 9 insertions, 7 deletions

diff --git a/drivers/char/tpm/tpm_atmel.c b/drivers/char/tpm/tpm_atmel.c
index 13248400b9c3..61fe14a77124 100644
--- a/drivers/char/tpm/tpm_atmel.c
+++ b/drivers/char/tpm/tpm_atmel.c
@@ -22,8 +22,9 @@
 #include "tpm.h"
 
 /* Atmel definitions */
-enum tpm_atmel_addr{
-        TPM_ATML_BASE = 0x400
+enum tpm_atmel_addr {
+        TPM_ATMEL_BASE_ADDR_LO = 0x08,
+        TPM_ATMEL_BASE_ADDR_HI = 0x09
 };
 
 /* write status bits */
@@ -148,7 +149,6 @@ static struct tpm_vendor_specific tpm_atmel = {
         .req_complete_mask = ATML_STATUS_BUSY | ATML_STATUS_DATA_AVAIL,
         .req_complete_val = ATML_STATUS_DATA_AVAIL,
         .req_canceled = ATML_STATUS_READY,
-        .base = TPM_ATML_BASE,
         .attr_group = &atmel_attr_grp,
         .miscdev = { .fops = &atmel_ops, },
 };
@@ -158,14 +158,16 @@ static int __devinit tpm_atml_init(struct pci_dev *pci_dev,
 {
         u8 version[4];
         int rc = 0;
+        int lo, hi;
 
         if (pci_enable_device(pci_dev))
                 return -EIO;
 
-        if (tpm_lpc_bus_init(pci_dev, TPM_ATML_BASE)) {
-                rc = -ENODEV;
-                goto out_err;
-        }
+        lo = tpm_read_index( TPM_ATMEL_BASE_ADDR_LO );
+        hi = tpm_read_index( TPM_ATMEL_BASE_ADDR_HI );
+
+        tpm_atmel.base = (hi<<8)|lo;
+        dev_dbg( &pci_dev->dev, "Operating with base: 0x%x\n", tpm_atmel.base);
 
         /* verify that it is an Atmel part */
         if (tpm_read_index(4) != 'A' || tpm_read_index(5) != 'T'