Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2e5c26de authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog 

* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
  watchdog: it8712f_wdt: add note to Kconfig
  watchdog: gef_wdt: include fs.h
  watchdog: bcm63xx_wdt: improve platform part.
  watchdog: iTCO_wdt: TCO Watchdog patch for Intel Patsburg PCH
parents 75318ec3 4fc36808

drivers/watchdog/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -558,6 +558,9 @@ config IT8712F_WDT 
	  This is the driver for the built-in watchdog timer on the IT8712F

	  Super I/0 chipset used on many motherboards.



	  If the driver does not work, then make sure that the game port in

	  the BIOS is enabled.



	  To compile this driver as a module, choose M here: the

	  module will be called it8712f_wdt.

drivers/watchdog/bcm63xx_wdt.c

+12 −30
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 
#include <linux/miscdevice.h>

#include <linux/module.h>

#include <linux/moduleparam.h>

#include <linux/reboot.h>

#include <linux/types.h>

#include <linux/uaccess.h>

#include <linux/watchdog.h>
@@ -220,14 +219,6 @@ static long bcm63xx_wdt_ioctl(struct file *file, unsigned int cmd, 
	}

}



static int bcm63xx_wdt_notify_sys(struct notifier_block *this,

				unsigned long code, void *unused)

{

	if (code == SYS_DOWN || code == SYS_HALT)

		bcm63xx_wdt_pause();

	return NOTIFY_DONE;

}



static const struct file_operations bcm63xx_wdt_fops = {

	.owner		= THIS_MODULE,

	.llseek		= no_llseek,
@@ -243,12 +234,8 @@ static struct miscdevice bcm63xx_wdt_miscdev = { 
	.fops	= &bcm63xx_wdt_fops,

};



static struct notifier_block bcm63xx_wdt_notifier = {

	.notifier_call = bcm63xx_wdt_notify_sys,

};





static int bcm63xx_wdt_probe(struct platform_device *pdev)

static int __devinit bcm63xx_wdt_probe(struct platform_device *pdev)

{

	int ret;

	struct resource *r;
@@ -280,16 +267,10 @@ static int bcm63xx_wdt_probe(struct platform_device *pdev) 
			wdt_time);

	}



	ret = register_reboot_notifier(&bcm63xx_wdt_notifier);

	if (ret) {

		dev_err(&pdev->dev, "failed to register reboot_notifier\n");

		goto unregister_timer;

	}



	ret = misc_register(&bcm63xx_wdt_miscdev);

	if (ret < 0) {

		dev_err(&pdev->dev, "failed to register watchdog device\n");

		goto unregister_reboot_notifier;

		goto unregister_timer;

	}



	dev_info(&pdev->dev, " started, timer margin: %d sec\n",
@@ -297,8 +278,6 @@ static int bcm63xx_wdt_probe(struct platform_device *pdev) 


	return 0;



unregister_reboot_notifier:

	unregister_reboot_notifier(&bcm63xx_wdt_notifier);

unregister_timer:

	bcm63xx_timer_unregister(TIMER_WDT_ID);

unmap:
@@ -306,25 +285,28 @@ unmap: 
	return ret;

}



static int bcm63xx_wdt_remove(struct platform_device *pdev)

static int __devexit bcm63xx_wdt_remove(struct platform_device *pdev)

{

	if (!nowayout)

		bcm63xx_wdt_pause();



	misc_deregister(&bcm63xx_wdt_miscdev);



	iounmap(bcm63xx_wdt_device.regs);



	unregister_reboot_notifier(&bcm63xx_wdt_notifier);

	bcm63xx_timer_unregister(TIMER_WDT_ID);



	iounmap(bcm63xx_wdt_device.regs);

	return 0;

}



static void bcm63xx_wdt_shutdown(struct platform_device *pdev)

{

	bcm63xx_wdt_pause();

}



static struct platform_driver bcm63xx_wdt = {

	.probe	= bcm63xx_wdt_probe,

	.remove = bcm63xx_wdt_remove,

	.remove = __devexit_p(bcm63xx_wdt_remove),

	.shutdown = bcm63xx_wdt_shutdown,

	.driver = {

		.owner = THIS_MODULE,

		.name = "bcm63xx-wdt",

	}

};

drivers/watchdog/gef_wdt.c

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
#include <linux/module.h>

#include <linux/miscdevice.h>

#include <linux/watchdog.h>

#include <linux/fs.h>

#include <linux/of.h>

#include <linux/of_platform.h>

#include <linux/io.h>

drivers/watchdog/iTCO_wdt.c

+6 −2
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
 *	document number 322169-001, 322170-003: 5 Series, 3400 Series (PCH)

 *	document number 320066-003, 320257-008: EP80597 (IICH)

 *	document number TBD                   : Cougar Point (CPT)

 *	document number TBD                   : Patsburg (PBG)

 */



/*
@@ -146,7 +147,8 @@ enum iTCO_chipsets { 
	TCO_CPT29,	/* Cougar Point */

	TCO_CPT30,	/* Cougar Point */

	TCO_CPT31,	/* Cougar Point */

	TCO_PBG,	/* Patsburg */

	TCO_PBG1,	/* Patsburg */

	TCO_PBG2,	/* Patsburg */

};



static struct {
@@ -235,6 +237,7 @@ static struct { 
	{"Cougar Point", 2},

	{"Cougar Point", 2},

	{"Patsburg", 2},

	{"Patsburg", 2},

	{NULL, 0}

};
@@ -350,7 +353,8 @@ static struct pci_device_id iTCO_wdt_pci_tbl[] = { 
	{ ITCO_PCI_DEVICE(0x1c5d,				TCO_CPT29)},

	{ ITCO_PCI_DEVICE(0x1c5e,				TCO_CPT30)},

	{ ITCO_PCI_DEVICE(0x1c5f,				TCO_CPT31)},

	{ ITCO_PCI_DEVICE(0x1d40,				TCO_PBG)},

	{ ITCO_PCI_DEVICE(0x1d40,				TCO_PBG1)},

	{ ITCO_PCI_DEVICE(0x1d41,				TCO_PBG2)},

	{ 0, },			/* End of list */

};

MODULE_DEVICE_TABLE(pci, iTCO_wdt_pci_tbl);