]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
WATCHDOG: Remove obsolete drivers/char/watchdog
authorTony Lindgren <tony@atomide.com>
Wed, 14 Nov 2007 01:40:53 +0000 (17:40 -0800)
committerTony Lindgren <tony@atomide.com>
Wed, 14 Nov 2007 01:40:53 +0000 (17:40 -0800)
Remove obsolete drivers/char/watchdog as noted by Iqbal.

Signed-off-by: Tony Lindgren <tony@atomide.com>
drivers/char/watchdog/omap_wdt.c [deleted file]
drivers/char/watchdog/omap_wdt.h [deleted file]

diff --git a/drivers/char/watchdog/omap_wdt.c b/drivers/char/watchdog/omap_wdt.c
deleted file mode 100644 (file)
index 772ebcc..0000000
+++ /dev/null
@@ -1,448 +0,0 @@
-/*
- * linux/drivers/char/watchdog/omap_wdt.c
- *
- * Watchdog driver for the TI OMAP 16xx & 24xx 32KHz (non-secure) watchdog
- *
- * Author: MontaVista Software, Inc.
- *      <gdavis@mvista.com> or <source@mvista.com>
- *
- * 2003 (c) MontaVista Software, Inc. This file is licensed under the
- * terms of the GNU General Public License version 2. This program is
- * licensed "as is" without any warranty of any kind, whether express
- * or implied.
- *
- * History:
- *
- * 20030527: George G. Davis <gdavis@mvista.com>
- *     Initially based on linux-2.4.19-rmk7-pxa1/drivers/char/sa1100_wdt.c
- *     (c) Copyright 2000 Oleg Drokin <green@crimea.edu>
- *     Based on SoftDog driver by Alan Cox <alan@redhat.com>
- *
- * Copyright (c) 2004 Texas Instruments.
- *     1. Modified to support OMAP1610 32-KHz watchdog timer
- *     2. Ported to 2.6 kernel
- *
- * Copyright (c) 2005 David Brownell
- *     Use the driver model and standard identifiers; handle bigger timeouts.
- */
-
-#include <linux/module.h>
-#include <linux/types.h>
-#include <linux/kernel.h>
-#include <linux/fs.h>
-#include <linux/mm.h>
-#include <linux/miscdevice.h>
-#include <linux/watchdog.h>
-#include <linux/reboot.h>
-#include <linux/init.h>
-#include <linux/err.h>
-#include <linux/platform_device.h>
-#include <linux/moduleparam.h>
-#include <linux/clk.h>
-
-#include <asm/io.h>
-#include <asm/uaccess.h>
-#include <asm/hardware.h>
-#include <asm/bitops.h>
-
-#include <asm/arch/prcm.h>
-
-#include "omap_wdt.h"
-
-static struct platform_device *omap_wdt_dev;
-
-static unsigned timer_margin;
-module_param(timer_margin, uint, 0);
-MODULE_PARM_DESC(timer_margin, "initial watchdog timeout (in seconds)");
-
-static unsigned int wdt_trgr_pattern = 0x1234;
-struct omap_wdt_dev {
-       void __iomem    *base;          /* physical */
-       struct device   *dev;
-       int             omap_wdt_users;
-       struct clk      *armwdt_ck;
-       struct clk      *mpu_wdt_ick;
-       struct clk      *mpu_wdt_fck;
-       struct resource *mem;
-       struct miscdevice omap_wdt_miscdev;
-};
-
-static void omap_wdt_ping(struct omap_wdt_dev *wdev)
-{
-       void __iomem    *base = wdev->base;
-       /* wait for posted write to complete */
-       while ((omap_readl(base + OMAP_WATCHDOG_WPS)) & 0x08)
-               cpu_relax();
-       wdt_trgr_pattern = ~wdt_trgr_pattern;
-       omap_writel(wdt_trgr_pattern, (base + OMAP_WATCHDOG_TGR));
-       /* wait for posted write to complete */
-       while ((omap_readl(base + OMAP_WATCHDOG_WPS)) & 0x08)
-               cpu_relax();
-       /* reloaded WCRR from WLDR */
-}
-
-static void omap_wdt_enable(struct omap_wdt_dev *wdev)
-{
-       void __iomem *base;
-       base = wdev->base;
-       /* Sequence to enable the watchdog */
-       omap_writel(0xBBBB, base + OMAP_WATCHDOG_SPR);
-       while ((omap_readl(base + OMAP_WATCHDOG_WPS)) & 0x10)
-               cpu_relax();
-       omap_writel(0x4444, base + OMAP_WATCHDOG_SPR);
-       while ((omap_readl(base + OMAP_WATCHDOG_WPS)) & 0x10)
-               cpu_relax();
-}
-
-static void omap_wdt_disable(struct omap_wdt_dev *wdev)
-{
-       void __iomem *base;
-       base = wdev->base;
-       /* sequence required to disable watchdog */
-       omap_writel(0xAAAA, base + OMAP_WATCHDOG_SPR);  /* TIMER_MODE */
-       while (omap_readl(base + OMAP_WATCHDOG_WPS) & 0x10)
-               cpu_relax();
-       omap_writel(0x5555, base + OMAP_WATCHDOG_SPR);  /* TIMER_MODE */
-       while (omap_readl(base + OMAP_WATCHDOG_WPS) & 0x10)
-               cpu_relax();
-}
-
-static void omap_wdt_adjust_timeout(unsigned new_timeout)
-{
-       if (new_timeout < TIMER_MARGIN_MIN)
-               new_timeout = TIMER_MARGIN_DEFAULT;
-       if (new_timeout > TIMER_MARGIN_MAX)
-               new_timeout = TIMER_MARGIN_MAX;
-       timer_margin = new_timeout;
-}
-
-static void omap_wdt_set_timeout(struct omap_wdt_dev *wdev)
-{
-       u32 pre_margin = GET_WLDR_VAL(timer_margin);
-       void __iomem *base;
-       base = wdev->base;
-
-       /* just count up at 32 KHz */
-       while (omap_readl(base + OMAP_WATCHDOG_WPS) & 0x04)
-               cpu_relax();
-       omap_writel(pre_margin, base + OMAP_WATCHDOG_LDR);
-       while (omap_readl(base + OMAP_WATCHDOG_WPS) & 0x04)
-               cpu_relax();
-}
-
-/*
- *     Allow only one task to hold it open
- */
-
-static int omap_wdt_open(struct inode *inode, struct file *file)
-{
-       struct omap_wdt_dev *wdev;
-       void __iomem *base;
-       wdev = platform_get_drvdata(omap_wdt_dev);
-       base = wdev->base;
-       if (test_and_set_bit(1, (unsigned long *)&(wdev->omap_wdt_users)))
-               return -EBUSY;
-
-       if (cpu_is_omap16xx())
-               clk_enable(wdev->armwdt_ck);    /* Enable the clock */
-
-       if (cpu_is_omap24xx()) {
-               clk_enable(wdev->mpu_wdt_ick);    /* Enable the interface clock */
-               clk_enable(wdev->mpu_wdt_fck);    /* Enable the functional clock */
-       }
-
-       /* initialize prescaler */
-       while (omap_readl(base + OMAP_WATCHDOG_WPS) & 0x01)
-               cpu_relax();
-       omap_writel((1 << 5) | (PTV << 2), base + OMAP_WATCHDOG_CNTRL);
-       while (omap_readl(base + OMAP_WATCHDOG_WPS) & 0x01)
-               cpu_relax();
-
-       file->private_data = (void *) wdev;
-
-       omap_wdt_set_timeout(wdev);
-       omap_wdt_enable(wdev);
-       return nonseekable_open(inode, file);
-}
-
-static int omap_wdt_release(struct inode *inode, struct file *file)
-{
-       struct omap_wdt_dev *wdev;
-       wdev = file->private_data;
-       /*
-        *      Shut off the timer unless NOWAYOUT is defined.
-        */
-#ifndef CONFIG_WATCHDOG_NOWAYOUT
-
-       omap_wdt_disable(wdev);
-
-       if (cpu_is_omap16xx()) {
-               clk_disable(wdev->armwdt_ck);   /* Disable the clock */
-               clk_put(wdev->armwdt_ck);
-               wdev->armwdt_ck = NULL;
-       }
-
-       if (cpu_is_omap24xx()) {
-               clk_disable(wdev->mpu_wdt_ick); /* Disable the clock */
-               clk_disable(wdev->mpu_wdt_fck); /* Disable the clock */
-               clk_put(wdev->mpu_wdt_ick);
-               clk_put(wdev->mpu_wdt_fck);
-               wdev->mpu_wdt_ick = NULL;
-               wdev->mpu_wdt_fck = NULL;
-       }
-#else
-       printk(KERN_CRIT "omap_wdt: Unexpected close, not stopping!\n");
-#endif
-       wdev->omap_wdt_users = 0;
-       return 0;
-}
-
-static ssize_t
-omap_wdt_write(struct file *file, const char __user *data,
-               size_t len, loff_t *ppos)
-{
-       struct omap_wdt_dev *wdev;
-       wdev = file->private_data;
-       /* Refresh LOAD_TIME. */
-       if (len)
-               omap_wdt_ping(wdev);
-       return len;
-}
-
-static int
-omap_wdt_ioctl(struct inode *inode, struct file *file,
-       unsigned int cmd, unsigned long arg)
-{
-       struct omap_wdt_dev *wdev;
-       int new_margin;
-       static struct watchdog_info ident = {
-               .identity = "OMAP Watchdog",
-               .options = WDIOF_SETTIMEOUT,
-               .firmware_version = 0,
-       };
-       wdev = file->private_data;
-
-       switch (cmd) {
-       default:
-               return -ENOTTY;
-       case WDIOC_GETSUPPORT:
-               return copy_to_user((struct watchdog_info __user *)arg, &ident,
-                               sizeof(ident));
-       case WDIOC_GETSTATUS:
-               return put_user(0, (int __user *)arg);
-       case WDIOC_GETBOOTSTATUS:
-               if (cpu_is_omap16xx())
-                       return put_user(omap_readw(ARM_SYSST),
-                                       (int __user *)arg);
-               if (cpu_is_omap24xx())
-                       return put_user(omap_prcm_get_reset_sources(),
-                                       (int __user *)arg);
-       case WDIOC_KEEPALIVE:
-               omap_wdt_ping(wdev);
-               return 0;
-       case WDIOC_SETTIMEOUT:
-               if (get_user(new_margin, (int __user *)arg))
-                       return -EFAULT;
-               omap_wdt_adjust_timeout(new_margin);
-
-               omap_wdt_disable(wdev);
-               omap_wdt_set_timeout(wdev);
-               omap_wdt_enable(wdev);
-
-               omap_wdt_ping(wdev);
-               /* Fall */
-       case WDIOC_GETTIMEOUT:
-               return put_user(timer_margin, (int __user *)arg);
-       }
-       return 0;
-}
-
-static const struct file_operations omap_wdt_fops = {
-       .owner = THIS_MODULE,
-       .write = omap_wdt_write,
-       .ioctl = omap_wdt_ioctl,
-       .open = omap_wdt_open,
-       .release = omap_wdt_release,
-};
-
-
-static int __init omap_wdt_probe(struct platform_device *pdev)
-{
-       struct resource *res, *mem;
-       int ret;
-       struct omap_wdt_dev *wdev;
-
-       /* reserve static register mappings */
-       res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       if (!res)
-               return -ENOENT;
-
-       if (omap_wdt_dev)
-               return -EBUSY;
-
-       mem = request_mem_region(res->start, res->end - res->start + 1,
-                                pdev->name);
-       if (mem == NULL)
-               return -EBUSY;
-
-       wdev = kzalloc(sizeof(struct omap_wdt_dev), GFP_KERNEL);
-       if (!wdev) {
-               ret = -ENOMEM;
-               goto fail;
-       }
-       wdev->omap_wdt_users = 0;
-       wdev->mem = mem;
-
-       if (cpu_is_omap16xx()) {
-               wdev->armwdt_ck = clk_get(&pdev->dev, "armwdt_ck");
-               if (IS_ERR(wdev->armwdt_ck)) {
-                       ret = PTR_ERR(wdev->armwdt_ck);
-                       wdev->armwdt_ck = NULL;
-                       goto fail;
-               }
-       }
-
-       if (cpu_is_omap24xx()) {
-               wdev->mpu_wdt_ick = clk_get(&pdev->dev, "mpu_wdt_ick");
-               if (IS_ERR(wdev->mpu_wdt_ick)) {
-                       ret = PTR_ERR(wdev->mpu_wdt_ick);
-                       wdev->mpu_wdt_ick = NULL;
-                       goto fail;
-               }
-               wdev->mpu_wdt_fck = clk_get(&pdev->dev, "mpu_wdt_fck");
-               if (IS_ERR(wdev->mpu_wdt_fck)) {
-                       ret = PTR_ERR(wdev->mpu_wdt_fck);
-                       wdev->mpu_wdt_fck = NULL;
-                       goto fail;
-               }
-       }
-       wdev->base = (void __iomem *) (mem->start);
-       platform_set_drvdata(pdev, wdev);
-
-       omap_wdt_disable(wdev);
-       omap_wdt_adjust_timeout(timer_margin);
-
-       wdev->omap_wdt_miscdev.parent = &pdev->dev;
-       wdev->omap_wdt_miscdev.minor = WATCHDOG_MINOR;
-       wdev->omap_wdt_miscdev.name = "watchdog";
-       wdev->omap_wdt_miscdev.fops = &omap_wdt_fops;
-
-       ret = misc_register(&(wdev->omap_wdt_miscdev));
-       if (ret)
-               goto fail;
-
-       pr_info("OMAP Watchdog Timer Rev 0x%02x: initial timeout %d sec\n",
-               omap_readl(wdev->base + OMAP_WATCHDOG_REV) & 0xFF,
-               timer_margin);
-
-       /* autogate OCP interface clock */
-       omap_writel(0x01, wdev->base + OMAP_WATCHDOG_SYS_CONFIG);
-
-       omap_wdt_dev = pdev;
-
-       return 0;
-
-fail:
-       if (wdev) {
-               platform_set_drvdata(pdev, NULL);
-               if (wdev->armwdt_ck)
-                       clk_put(wdev->armwdt_ck);
-               if (wdev->mpu_wdt_ick)
-                       clk_put(wdev->mpu_wdt_ick);
-               if (wdev->mpu_wdt_fck)
-                       clk_put(wdev->mpu_wdt_fck);
-               kfree(wdev);
-       }
-       if (mem) {
-               release_resource(mem);
-       }
-       return ret;
-}
-
-static void omap_wdt_shutdown(struct platform_device *pdev)
-{
-       struct omap_wdt_dev *wdev;
-       wdev = platform_get_drvdata(pdev);
-       omap_wdt_disable(wdev);
-}
-
-static int omap_wdt_remove(struct platform_device *pdev)
-{
-       struct omap_wdt_dev *wdev;
-       wdev = platform_get_drvdata(pdev);
-
-       misc_deregister(&(wdev->omap_wdt_miscdev));
-       release_resource(wdev->mem);
-       platform_set_drvdata(pdev, NULL);
-       if (wdev->armwdt_ck)
-               clk_put(wdev->armwdt_ck);
-       if (wdev->mpu_wdt_ick)
-               clk_put(wdev->mpu_wdt_ick);
-       if (wdev->mpu_wdt_fck)
-               clk_put(wdev->mpu_wdt_fck);
-       kfree(wdev);
-       omap_wdt_dev = NULL;
-       return 0;
-}
-
-#ifdef CONFIG_PM
-
-/* REVISIT ... not clear this is the best way to handle system suspend; and
- * it's very inappropriate for selective device suspend (e.g. suspending this
- * through sysfs rather than by stopping the watchdog daemon).  Also, this
- * may not play well enough with NOWAYOUT...
- */
-
-static int omap_wdt_suspend(struct platform_device *pdev, pm_message_t state)
-{
-       struct omap_wdt_dev *wdev;
-       wdev = platform_get_drvdata(pdev);
-       if (wdev->omap_wdt_users)
-               omap_wdt_disable(wdev);
-       return 0;
-}
-
-static int omap_wdt_resume(struct platform_device *pdev)
-{
-       struct omap_wdt_dev *wdev;
-       wdev = platform_get_drvdata(pdev);
-       if (wdev->omap_wdt_users) {
-               omap_wdt_enable(wdev);
-               omap_wdt_ping(wdev);
-       }
-       return 0;
-}
-
-#else
-#define        omap_wdt_suspend        NULL
-#define        omap_wdt_resume         NULL
-#endif
-
-static struct platform_driver omap_wdt_driver = {
-       .probe          = omap_wdt_probe,
-       .remove         = omap_wdt_remove,
-       .shutdown       = omap_wdt_shutdown,
-       .suspend        = omap_wdt_suspend,
-       .resume         = omap_wdt_resume,
-       .driver         = {
-               .owner  = THIS_MODULE,
-               .name   = "omap_wdt",
-       },
-};
-
-static int __init omap_wdt_init(void)
-{
-       return platform_driver_register(&omap_wdt_driver);
-}
-
-static void __exit omap_wdt_exit(void)
-{
-       platform_driver_unregister(&omap_wdt_driver);
-}
-
-module_init(omap_wdt_init);
-module_exit(omap_wdt_exit);
-
-MODULE_AUTHOR("George G. Davis");
-MODULE_LICENSE("GPL");
-MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
diff --git a/drivers/char/watchdog/omap_wdt.h b/drivers/char/watchdog/omap_wdt.h
deleted file mode 100644 (file)
index 511135d..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- *  linux/drivers/char/watchdog/omap_wdt.h
- *
- *  BRIEF MODULE DESCRIPTION
- *      OMAP Watchdog timer register definitions
- *
- *  Copyright (C) 2004 Texas Instruments.
- *
- *  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.
- *
- *  THIS  SOFTWARE  IS PROVIDED   ``AS  IS'' AND   ANY  EXPRESS OR IMPLIED
- *  WARRANTIES,   INCLUDING, BUT NOT  LIMITED  TO, THE IMPLIED WARRANTIES OF
- *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN
- *  NO  EVENT  SHALL   THE AUTHOR  BE    LIABLE FOR ANY   DIRECT, INDIRECT,
- *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- *  NOT LIMITED   TO, PROCUREMENT OF  SUBSTITUTE GOODS  OR SERVICES; LOSS OF
- *  USE, DATA,  OR PROFITS; OR  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN  CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- *  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *  You should have received a copy of the  GNU General Public License along
- *  with this program; if not, write  to the Free Software Foundation, Inc.,
- *  675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef _OMAP_WATCHDOG_H
-#define _OMAP_WATCHDOG_H
-
-#define OMAP_WATCHDOG_REV                      (0x00)
-#define OMAP_WATCHDOG_SYS_CONFIG       (0x10)
-#define OMAP_WATCHDOG_STATUS           (0x14)
-#define OMAP_WATCHDOG_CNTRL                    (0x24)
-#define OMAP_WATCHDOG_CRR                      (0x28)
-#define OMAP_WATCHDOG_LDR                      (0x2c)
-#define OMAP_WATCHDOG_TGR                      (0x30)
-#define OMAP_WATCHDOG_WPS                      (0x34)
-#define OMAP_WATCHDOG_SPR                      (0x48)
-
-/* Using the prescaler, the OMAP watchdog could go for many
- * months before firing.  These limits work without scaling,
- * with the 60 second default assumed by most tools and docs.
- */
-#define TIMER_MARGIN_MAX       (24 * 60 * 60)  /* 1 day */
-#define TIMER_MARGIN_DEFAULT   60      /* 60 secs */
-#define TIMER_MARGIN_MIN       1
-
-#define PTV                    0       /* prescale */
-#define GET_WLDR_VAL(secs)     (0xffffffff - ((secs) * (32768/(1<<PTV))) + 1)
-
-#endif                         /* _OMAP_WATCHDOG_H */