6 files changed, 268 insertions, 56 deletions

diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index 7333b41d4224..df5f2b0e0750 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -175,7 +175,7 @@ config MOXA_INTELLIO
 
 config MOXA_SMARTIO
         tristate "Moxa SmartIO support"
-        depends on SERIAL_NONSTANDARD
+        depends on SERIAL_NONSTANDARD && (BROKEN || !SPARC32)
         help
           Say Y here if you have a Moxa SmartIO multiport serial card.
 
@@ -842,8 +842,7 @@ config SONYPI
 
 config TANBAC_TB0219
         tristate "TANBAC TB0219 base board support"
-        depends TANBAC_TB0229
-
+        depends TANBAC_TB022X
 
 menu "Ftape, the floppy tape device driver"
 
diff --git a/drivers/char/moxa.c b/drivers/char/moxa.c
index 95f7046ff059..79e490ef2cf2 100644
--- a/drivers/char/moxa.c
+++ b/drivers/char/moxa.c
@@ -339,7 +339,7 @@ static int __init moxa_init(void)
 
         init_MUTEX(&moxaBuffSem);
         moxaDriver->owner = THIS_MODULE;
-        moxaDriver->name = "ttya";
+        moxaDriver->name = "ttyMX";
         moxaDriver->devfs_name = "tts/a";
         moxaDriver->major = ttymajor;
         moxaDriver->minor_start = 0;
diff --git a/drivers/char/tpm/tpm_infineon.c b/drivers/char/tpm/tpm_infineon.c
index dc8c540391fd..939e51e119e6 100644
--- a/drivers/char/tpm/tpm_infineon.c
+++ b/drivers/char/tpm/tpm_infineon.c
@@ -14,7 +14,6 @@
  * License.
  */
 
-#include <acpi/acpi_bus.h>
 #include <linux/pnp.h>
 #include "tpm.h"
 
@@ -29,9 +28,10 @@
 #define TPM_MAX_TRIES           5000
 #define TPM_INFINEON_DEV_VEN_VALUE      0x15D1
 
-/* These values will be filled after ACPI-call */
+/* These values will be filled after PnP-call */
 static int TPM_INF_DATA = 0;
 static int TPM_INF_ADDR = 0;
+static int pnp_registered = 0;
 
 /* TPM header definitions */
 enum infineon_tpm_header {
@@ -356,24 +356,26 @@ static const struct pnp_device_id tpm_pnp_tbl[] = {
         {"IFX0102", 0},
         {"", 0}
 };
+MODULE_DEVICE_TABLE(pnp, tpm_pnp_tbl);
 
-static int __devinit tpm_inf_acpi_probe(struct pnp_dev *dev,
+static int __devinit tpm_inf_pnp_probe(struct pnp_dev *dev,
                                         const struct pnp_device_id *dev_id)
 {
-        TPM_INF_ADDR = (pnp_port_start(dev, 0) & 0xff);
-        TPM_INF_DATA = ((TPM_INF_ADDR + 1) & 0xff);
-        tpm_inf.base = pnp_port_start(dev, 1);
-        dev_info(&dev->dev, "Found %s with ID %s\n",
-                 dev->name, dev_id->id);
-        if (!((tpm_inf.base >> 8) & 0xff))
-                tpm_inf.base = 0;
-        return 0;
+        if (pnp_port_valid(dev, 0)) {
+                TPM_INF_ADDR = (pnp_port_start(dev, 0) & 0xff);
+                TPM_INF_DATA = ((TPM_INF_ADDR + 1) & 0xff);
+                tpm_inf.base = pnp_port_start(dev, 1);
+                dev_info(&dev->dev, "Found %s with ID %s\n",
+                dev->name, dev_id->id);
+                return 0;
+        }
+        return -ENODEV;
 }
 
 static struct pnp_driver tpm_inf_pnp = {
         .name = "tpm_inf_pnp",
         .id_table = tpm_pnp_tbl,
-        .probe = tpm_inf_acpi_probe,
+        .probe = tpm_inf_pnp_probe,
 };
 
 static int __devinit tpm_inf_probe(struct pci_dev *pci_dev,
@@ -386,19 +388,30 @@ static int __devinit tpm_inf_probe(struct pci_dev *pci_dev,
         int productid[2];
         char chipname[20];
 
-        if (pci_enable_device(pci_dev))
-                return -EIO;
+        rc = pci_enable_device(pci_dev);
+        if (rc)
+                return rc;
 
         dev_info(&pci_dev->dev, "LPC-bus found at 0x%x\n", pci_id->device);
 
-        /* read IO-ports from ACPI */
-        pnp_register_driver(&tpm_inf_pnp);
-        pnp_unregister_driver(&tpm_inf_pnp);
+        /* read IO-ports from PnP */
+        rc = pnp_register_driver(&tpm_inf_pnp);
+        if (rc < 0) {
+                dev_err(&pci_dev->dev,
+                        "Error %x from pnp_register_driver!\n",rc);
+                goto error2;
+        }
+        if (!rc) {
+                dev_info(&pci_dev->dev, "No Infineon TPM found!\n");
+                goto error;
+        } else {
+                pnp_registered = 1;
+        }
 
         /* Make sure, we have received valid config ports */
         if (!TPM_INF_ADDR) {
-                pci_disable_device(pci_dev);
-                return -EIO;
+                dev_err(&pci_dev->dev, "No valid IO-ports received!\n");
+                goto error;
         }
 
         /* query chip for its vendor, its version number a.s.o. */
@@ -418,23 +431,21 @@ static int __devinit tpm_inf_probe(struct pci_dev *pci_dev,
 
         switch ((productid[0] << 8) | productid[1]) {
         case 6:
-                sprintf(chipname, " (SLD 9630 TT 1.1)");
+                snprintf(chipname, sizeof(chipname), " (SLD 9630 TT 1.1)");
                 break;
         case 11:
-                sprintf(chipname, " (SLB 9635 TT 1.2)");
+                snprintf(chipname, sizeof(chipname), " (SLB 9635 TT 1.2)");
                 break;
         default:
-                sprintf(chipname, " (unknown chip)");
+                snprintf(chipname, sizeof(chipname), " (unknown chip)");
                 break;
         }
-        chipname[19] = 0;
 
         if ((vendorid[0] << 8 | vendorid[1]) == (TPM_INFINEON_DEV_VEN_VALUE)) {
 
                 if (tpm_inf.base == 0) {
                         dev_err(&pci_dev->dev, "No IO-ports found!\n");
-                        pci_disable_device(pci_dev);
-                        return -EIO;
+                        goto error;
                 }
                 /* configure TPM with IO-ports */
                 outb(IOLIMH, TPM_INF_ADDR);
@@ -452,8 +463,7 @@ static int __devinit tpm_inf_probe(struct pci_dev *pci_dev,
                         dev_err(&pci_dev->dev,
                                 "Could not set IO-ports to %04x\n",
                                 tpm_inf.base);
-                        pci_disable_device(pci_dev);
-                        return -EIO;
+                        goto error;
                 }
 
                 /* activate register */
@@ -479,14 +489,16 @@ static int __devinit tpm_inf_probe(struct pci_dev *pci_dev,
                          productid[0], productid[1], chipname);
 
                 rc = tpm_register_hardware(pci_dev, &tpm_inf);
-                if (rc < 0) {
-                        pci_disable_device(pci_dev);
-                        return -ENODEV;
-                }
+                if (rc < 0)
+                        goto error;
                 return 0;
         } else {
                 dev_info(&pci_dev->dev, "No Infineon TPM found!\n");
+error:
+                pnp_unregister_driver(&tpm_inf_pnp);
+error2:
                 pci_disable_device(pci_dev);
+                pnp_registered = 0;
                 return -ENODEV;
         }
 }
@@ -521,6 +533,8 @@ static int __init init_inf(void)
 
 static void __exit cleanup_inf(void)
 {
+        if (pnp_registered)
+                pnp_unregister_driver(&tpm_inf_pnp);
         pci_unregister_driver(&inf_pci_driver);
 }
 
diff --git a/drivers/char/watchdog/Kconfig b/drivers/char/watchdog/Kconfig
index f4bf6c399010..c3898afce3ae 100644
--- a/drivers/char/watchdog/Kconfig
+++ b/drivers/char/watchdog/Kconfig
@@ -84,17 +84,6 @@ config 977_WATCHDOG
 
           Not sure? It's safe to say N.
 
-config IXP2000_WATCHDOG
-        tristate "IXP2000 Watchdog"
-        depends on WATCHDOG && ARCH_IXP2000
-        help
-          Say Y here if to include support for the watchdog timer
-          in the Intel IXP2000(2400, 2800, 2850) network processors.
-          This driver can be built as a module by choosing M. The module
-          will be called ixp2000_wdt.
-
-          Say N if you are unsure.
-
 config IXP4XX_WATCHDOG
         tristate "IXP4xx Watchdog"
         depends on WATCHDOG && ARCH_IXP4XX
@@ -111,6 +100,17 @@ config IXP4XX_WATCHDOG
 
           Say N if you are unsure.
 
+config IXP2000_WATCHDOG
+        tristate "IXP2000 Watchdog"
+        depends on WATCHDOG && ARCH_IXP2000
+        help
+          Say Y here if to include support for the watchdog timer
+          in the Intel IXP2000(2400, 2800, 2850) network processors.
+          This driver can be built as a module by choosing M. The module
+          will be called ixp2000_wdt.
+
+          Say N if you are unsure.
+
 config S3C2410_WATCHDOG
         tristate "S3C2410 Watchdog"
         depends on WATCHDOG && ARCH_S3C2410
@@ -346,16 +346,12 @@ config 8xx_WDT
         tristate "MPC8xx Watchdog Timer"
         depends on WATCHDOG && 8xx
 
-# PPC64 Architecture
-
-config WATCHDOG_RTAS
-        tristate "RTAS watchdog"
-        depends on WATCHDOG && PPC_RTAS
-        help
-          This driver adds watchdog support for the RTAS watchdog.
-
-          To compile this driver as a module, choose M here. The module
-          will be called wdrtas.
+config BOOKE_WDT
+        tristate "PowerPC Book-E Watchdog Timer"
+        depends on WATCHDOG && (BOOKE || 4xx)
+        ---help---
+          Please see Documentation/watchdog/watchdog-api.txt for
+          more information.
 
 # MIPS Architecture
 
@@ -425,6 +421,16 @@ config WATCHDOG_RIO
           machines.  The watchdog timeout period is normally one minute but
           can be changed with a boot-time parameter.
 
+# ppc64 RTAS watchdog
+config WATCHDOG_RTAS
+        tristate "RTAS watchdog"
+        depends on WATCHDOG && PPC_RTAS
+        help
+          This driver adds watchdog support for the RTAS watchdog.
+
+          To compile this driver as a module, choose M here. The module
+          will be called wdrtas.
+
 #
 # ISA-based Watchdog Cards
 #
diff --git a/drivers/char/watchdog/Makefile b/drivers/char/watchdog/Makefile
index 6f02f4ce4536..cfeac6f10137 100644
--- a/drivers/char/watchdog/Makefile
+++ b/drivers/char/watchdog/Makefile
@@ -53,6 +53,7 @@ obj-$(CONFIG_8xx_WDT) += mpc8xx_wdt.o
 
 # PPC64 Architecture
 obj-$(CONFIG_WATCHDOG_RTAS) += wdrtas.o
+obj-$(CONFIG_BOOKE_WDT) += booke_wdt.o
 
 # MIPS Architecture
 obj-$(CONFIG_INDYDOG) += indydog.o
diff --git a/drivers/char/watchdog/booke_wdt.c b/drivers/char/watchdog/booke_wdt.c
new file mode 100644
index 000000000000..abc30cca6645
--- /dev/null
+++ b/drivers/char/watchdog/booke_wdt.c
@@ -0,0 +1,192 @@
+/*
+ * drivers/char/watchdog/booke_wdt.c
+ *
+ * Watchdog timer for PowerPC Book-E systems
+ *
+ * Author: Matthew McClintock
+ * Maintainer: Kumar Gala <kumar.gala@freescale.com>
+ *
+ * Copyright 2005 Freescale Semiconductor Inc.
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of  the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ */
+
+#include <linux/config.h>
+#include <linux/module.h>
+#include <linux/fs.h>
+#include <linux/miscdevice.h>
+#include <linux/notifier.h>
+#include <linux/watchdog.h>
+
+#include <asm/reg_booke.h>
+#include <asm/uaccess.h>
+#include <asm/system.h>
+
+/* If the kernel parameter wdt_enable=1, the watchdog will be enabled at boot.
+ * Also, the wdt_period sets the watchdog timer period timeout.
+ * For E500 cpus the wdt_period sets which bit changing from 0->1 will
+ * trigger a watchog timeout. This watchdog timeout will occur 3 times, the
+ * first time nothing will happen, the second time a watchdog exception will
+ * occur, and the final time the board will reset.
+ */
+
+#ifdef  CONFIG_FSL_BOOKE
+#define WDT_PERIOD_DEFAULT 63   /* Ex. wdt_period=28 bus=333Mhz , reset=~40sec */
+#else
+#define WDT_PERIOD_DEFAULT 4    /* Refer to the PPC40x and PPC4xx manuals */
+#endif                          /* for timing information */
+
+u32 booke_wdt_enabled = 0;
+u32 booke_wdt_period = WDT_PERIOD_DEFAULT;
+
+#ifdef  CONFIG_FSL_BOOKE
+#define WDTP(x)         ((((63-x)&0x3)<<30)|(((63-x)&0x3c)<<15))
+#else
+#define WDTP(x)         (TCR_WP(x))
+#endif
+
+/*
+ * booke_wdt_enable:
+ */
+static __inline__ void booke_wdt_enable(void)
+{
+        u32 val;
+
+        val = mfspr(SPRN_TCR);
+        val |= (TCR_WIE|TCR_WRC(WRC_CHIP)|WDTP(booke_wdt_period));
+
+        mtspr(SPRN_TCR, val);
+}
+
+/*
+ * booke_wdt_ping:
+ */
+static __inline__ void booke_wdt_ping(void)
+{
+        mtspr(SPRN_TSR, TSR_ENW|TSR_WIS);
+}
+
+/*
+ * booke_wdt_write:
+ */
+static ssize_t booke_wdt_write (struct file *file, const char *buf,
+                                size_t count, loff_t *ppos)
+{
+        booke_wdt_ping();
+        return count;
+}
+
+static struct watchdog_info ident = {
+  .options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING,
+  .firmware_version = 0,
+  .identity = "PowerPC Book-E Watchdog",
+};
+
+/*
+ * booke_wdt_ioctl:
+ */
+static int booke_wdt_ioctl (struct inode *inode, struct file *file,
+                            unsigned int cmd, unsigned long arg)
+{
+        u32 tmp = 0;
+
+        switch (cmd) {
+        case WDIOC_GETSUPPORT:
+                if (copy_to_user ((struct watchdog_info *) arg, &ident,
+                                sizeof(struct watchdog_info)))
+                        return -EFAULT;
+        case WDIOC_GETSTATUS:
+                return put_user(ident.options, (u32 *) arg);
+        case WDIOC_GETBOOTSTATUS:
+                /* XXX: something is clearing TSR */
+                tmp = mfspr(SPRN_TSR) & TSR_WRS(3);
+                /* returns 1 if last reset was caused by the WDT */
+                return (tmp ? 1 : 0);
+        case WDIOC_KEEPALIVE:
+                booke_wdt_ping();
+                return 0;
+        case WDIOC_SETTIMEOUT:
+                if (get_user(booke_wdt_period, (u32 *) arg))
+                        return -EFAULT;
+                mtspr(SPRN_TCR, (mfspr(SPRN_TCR)&~WDTP(0))|WDTP(booke_wdt_period));
+                return 0;
+        case WDIOC_GETTIMEOUT:
+                return put_user(booke_wdt_period, (u32 *) arg);
+        case WDIOC_SETOPTIONS:
+                if (get_user(tmp, (u32 *) arg))
+                        return -EINVAL;
+                if (tmp == WDIOS_ENABLECARD) {
+                        booke_wdt_ping();
+                        break;
+                } else
+                        return -EINVAL;
+                return 0;
+        default:
+                return -ENOIOCTLCMD;
+        }
+
+        return 0;
+}
+/*
+ * booke_wdt_open:
+ */
+static int booke_wdt_open (struct inode *inode, struct file *file)
+{
+        if (booke_wdt_enabled == 0) {
+                booke_wdt_enabled = 1;
+                booke_wdt_enable();
+                printk (KERN_INFO "PowerPC Book-E Watchdog Timer Enabled (wdt_period=%d)\n",
+                                booke_wdt_period);
+        }
+
+        return 0;
+}
+
+static struct file_operations booke_wdt_fops = {
+  .owner = THIS_MODULE,
+  .llseek = no_llseek,
+  .write = booke_wdt_write,
+  .ioctl = booke_wdt_ioctl,
+  .open = booke_wdt_open,
+};
+
+static struct miscdevice booke_wdt_miscdev = {
+  .minor = WATCHDOG_MINOR,
+  .name = "watchdog",
+  .fops = &booke_wdt_fops,
+};
+
+static void __exit booke_wdt_exit(void)
+{
+        misc_deregister(&booke_wdt_miscdev);
+}
+
+/*
+ * booke_wdt_init:
+ */
+static int __init booke_wdt_init(void)
+{
+        int ret = 0;
+
+        printk (KERN_INFO "PowerPC Book-E Watchdog Timer Loaded\n");
+        ident.firmware_version = cpu_specs[0].pvr_value;
+
+        ret = misc_register(&booke_wdt_miscdev);
+        if (ret) {
+                printk (KERN_CRIT "Cannot register miscdev on minor=%d (err=%d)\n",
+                                WATCHDOG_MINOR, ret);
+                return ret;
+        }
+
+        if (booke_wdt_enabled == 1) {
+                printk (KERN_INFO "PowerPC Book-E Watchdog Timer Enabled (wdt_period=%d)\n",
+                                booke_wdt_period);
+                booke_wdt_enable();
+        }
+
+        return ret;
+}
+device_initcall(booke_wdt_init);