3 files changed, 0 insertions, 298 deletions

diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index 879232186ca6..100caabf7fc8 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -317,15 +317,6 @@ config TWL4030_WATCHDOG
           Support for TI TWL4030 watchdog.  Say 'Y' here to enable the
           watchdog timer support for TWL4030 chips.
 
-config STMP3XXX_WATCHDOG
-        tristate "Freescale STMP3XXX watchdog"
-        depends on ARCH_STMP3XXX
-        help
-          Say Y here if to include support for the watchdog timer
-          for the Sigmatel STMP37XX/378X SoC.
-          To compile this driver as a module, choose M here: the
-          module will be called stmp3xxx_wdt.
-
 config STMP3XXX_RTC_WATCHDOG
         tristate "Freescale STMP3XXX & i.MX23/28 watchdog"
         depends on RTC_DRV_STMP
diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile
index f1fc6a1d92ca..a300b948f254 100644
--- a/drivers/watchdog/Makefile
+++ b/drivers/watchdog/Makefile
@@ -48,7 +48,6 @@ obj-$(CONFIG_IOP_WATCHDOG) += iop_wdt.o
 obj-$(CONFIG_DAVINCI_WATCHDOG) += davinci_wdt.o
 obj-$(CONFIG_ORION_WATCHDOG) += orion_wdt.o
 obj-$(CONFIG_COH901327_WATCHDOG) += coh901327_wdt.o
-obj-$(CONFIG_STMP3XXX_WATCHDOG) += stmp3xxx_wdt.o
 obj-$(CONFIG_STMP3XXX_RTC_WATCHDOG) += stmp3xxx_rtc_wdt.o
 obj-$(CONFIG_NUC900_WATCHDOG) += nuc900_wdt.o
 obj-$(CONFIG_TS72XX_WATCHDOG) += ts72xx_wdt.o
diff --git a/drivers/watchdog/stmp3xxx_wdt.c b/drivers/watchdog/stmp3xxx_wdt.c
deleted file mode 100644
index 1f4f69728fee..000000000000
--- a/drivers/watchdog/stmp3xxx_wdt.c
+++ /dev/null
@@ -1,288 +0,0 @@
-/*
- * Watchdog driver for Freescale STMP37XX/STMP378X
- *
- * Author: Vitaly Wool <vital@embeddedalley.com>
- *
- * Copyright 2008 Freescale Semiconductor, Inc. All Rights Reserved.
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- */
-
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
-#include <linux/init.h>
-#include <linux/kernel.h>
-#include <linux/fs.h>
-#include <linux/miscdevice.h>
-#include <linux/watchdog.h>
-#include <linux/platform_device.h>
-#include <linux/spinlock.h>
-#include <linux/uaccess.h>
-#include <linux/module.h>
-
-#include <mach/platform.h>
-#include <mach/regs-rtc.h>
-
-#define DEFAULT_HEARTBEAT       19
-#define MAX_HEARTBEAT           (0x10000000 >> 6)
-
-/* missing bitmask in headers */
-#define BV_RTC_PERSISTENT1_GENERAL__RTC_FORCE_UPDATER     0x80000000
-
-#define WDT_IN_USE              0
-#define WDT_OK_TO_CLOSE         1
-
-#define WDOG_COUNTER_RATE       1000 /* 1 kHz clock */
-
-static DEFINE_SPINLOCK(stmp3xxx_wdt_io_lock);
-static unsigned long wdt_status;
-static const bool nowayout = WATCHDOG_NOWAYOUT;
-static int heartbeat = DEFAULT_HEARTBEAT;
-static unsigned long boot_status;
-
-static void wdt_enable(u32 value)
-{
-        spin_lock(&stmp3xxx_wdt_io_lock);
-        __raw_writel(value, REGS_RTC_BASE + HW_RTC_WATCHDOG);
-        stmp3xxx_setl(BM_RTC_CTRL_WATCHDOGEN, REGS_RTC_BASE + HW_RTC_CTRL);
-        stmp3xxx_setl(BV_RTC_PERSISTENT1_GENERAL__RTC_FORCE_UPDATER,
-                        REGS_RTC_BASE + HW_RTC_PERSISTENT1);
-        spin_unlock(&stmp3xxx_wdt_io_lock);
-}
-
-static void wdt_disable(void)
-{
-        spin_lock(&stmp3xxx_wdt_io_lock);
-        stmp3xxx_clearl(BV_RTC_PERSISTENT1_GENERAL__RTC_FORCE_UPDATER,
-                        REGS_RTC_BASE + HW_RTC_PERSISTENT1);
-        stmp3xxx_clearl(BM_RTC_CTRL_WATCHDOGEN, REGS_RTC_BASE + HW_RTC_CTRL);
-        spin_unlock(&stmp3xxx_wdt_io_lock);
-}
-
-static void wdt_ping(void)
-{
-        wdt_enable(heartbeat * WDOG_COUNTER_RATE);
-}
-
-static int stmp3xxx_wdt_open(struct inode *inode, struct file *file)
-{
-        if (test_and_set_bit(WDT_IN_USE, &wdt_status))
-                return -EBUSY;
-
-        clear_bit(WDT_OK_TO_CLOSE, &wdt_status);
-        wdt_ping();
-
-        return nonseekable_open(inode, file);
-}
-
-static ssize_t stmp3xxx_wdt_write(struct file *file, const char __user *data,
-        size_t len, loff_t *ppos)
-{
-        if (len) {
-                if (!nowayout) {
-                        size_t i;
-
-                        clear_bit(WDT_OK_TO_CLOSE, &wdt_status);
-
-                        for (i = 0; i != len; i++) {
-                                char c;
-
-                                if (get_user(c, data + i))
-                                        return -EFAULT;
-                                if (c == 'V')
-                                        set_bit(WDT_OK_TO_CLOSE, &wdt_status);
-                        }
-                }
-                wdt_ping();
-        }
-
-        return len;
-}
-
-static const struct watchdog_info ident = {
-        .options        = WDIOF_CARDRESET |
-                          WDIOF_MAGICCLOSE |
-                          WDIOF_SETTIMEOUT |
-                          WDIOF_KEEPALIVEPING,
-        .identity       = "STMP3XXX Watchdog",
-};
-
-static long stmp3xxx_wdt_ioctl(struct file *file, unsigned int cmd,
-        unsigned long arg)
-{
-        void __user *argp = (void __user *)arg;
-        int __user *p = argp;
-        int new_heartbeat, opts;
-        int ret = -ENOTTY;
-
-        switch (cmd) {
-        case WDIOC_GETSUPPORT:
-                ret = copy_to_user(argp, &ident, sizeof(ident)) ? -EFAULT : 0;
-                break;
-
-        case WDIOC_GETSTATUS:
-                ret = put_user(0, p);
-                break;
-
-        case WDIOC_GETBOOTSTATUS:
-                ret = put_user(boot_status, p);
-                break;
-
-        case WDIOC_SETOPTIONS:
-                if (get_user(opts, p)) {
-                        ret = -EFAULT;
-                        break;
-                }
-                if (opts & WDIOS_DISABLECARD)
-                        wdt_disable();
-                else if (opts & WDIOS_ENABLECARD)
-                        wdt_ping();
-                else {
-                        pr_debug("%s: unknown option 0x%x\n", __func__, opts);
-                        ret = -EINVAL;
-                        break;
-                }
-                ret = 0;
-                break;
-
-        case WDIOC_KEEPALIVE:
-                wdt_ping();
-                ret = 0;
-                break;
-
-        case WDIOC_SETTIMEOUT:
-                if (get_user(new_heartbeat, p)) {
-                        ret = -EFAULT;
-                        break;
-                }
-                if (new_heartbeat <= 0 || new_heartbeat > MAX_HEARTBEAT) {
-                        ret = -EINVAL;
-                        break;
-                }
-
-                heartbeat = new_heartbeat;
-                wdt_ping();
-                /* Fall through */
-