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

Commit 1c36ab1a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://www.linux-watchdog.org/linux-watchdog 

* git://www.linux-watchdog.org/linux-watchdog:
  watchdog: iTCO_wdt: add Intel Lynx Point DeviceIDs
  watchdog: via_wdt: Set min_timeout and max_timeout for wdt_dev
  watchdog: Fix typo "unexpectdly"
  watchdog: wafer5823wdt: Fix handling WDIOS_DISABLECARD/WDIOS_ENABLECARD options
  watchdog: wm8350_wdt: Fix handling WDIOS_DISABLECARD/WDIOS_ENABLECARD options
  watchdog: Return proper error in nuc900wdt_probe if misc_register fails
  watchdog: Staticise nuc900_wdt
  watchdog: via_wdt: Staticise wdt_pci_table
  watchdog: omap_wdt.c: Fix the mismatch of pm_runtime enable and disable
  watchdog: dw_wdt.c: use devm_request_and_ioremap
  watchdog: imx2_wdt.c: use devm_request_and_ioremap
parents deb9b4ce 84e83c28

drivers/watchdog/dw_wdt.c

+1 −5
Original line number Diff line number Diff line
@@ -300,11 +300,7 @@ static int __devinit dw_wdt_drv_probe(struct platform_device *pdev) 
	if (!mem)

		return -EINVAL;



	if (!devm_request_mem_region(&pdev->dev, mem->start, resource_size(mem),

				     "dw_wdt"))

		return -ENOMEM;



	dw_wdt.regs = devm_ioremap(&pdev->dev, mem->start, resource_size(mem));

	dw_wdt.regs = devm_request_and_ioremap(&pdev->dev, mem);

	if (!dw_wdt.regs)

		return -ENOMEM;

drivers/watchdog/iTCO_wdt.c

+35 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
 *	document number TBD                   : Patsburg (PBG)

 *	document number TBD                   : DH89xxCC

 *	document number TBD                   : Panther Point

 *	document number TBD                   : Lynx Point

 */



/*
@@ -126,6 +127,7 @@ enum iTCO_chipsets { 
	TCO_PBG,	/* Patsburg */

	TCO_DH89XXCC,	/* DH89xxCC */

	TCO_PPT,	/* Panther Point */

	TCO_LPT,	/* Lynx Point */

};



static struct {
@@ -189,6 +191,7 @@ static struct { 
	{"Patsburg", 2},

	{"DH89xxCC", 2},

	{"Panther Point", 2},

	{"Lynx Point", 2},

	{NULL, 0}

};
@@ -331,6 +334,38 @@ static DEFINE_PCI_DEVICE_TABLE(iTCO_wdt_pci_tbl) = { 
	{ PCI_VDEVICE(INTEL, 0x1e5d), TCO_PPT},

	{ PCI_VDEVICE(INTEL, 0x1e5e), TCO_PPT},

	{ PCI_VDEVICE(INTEL, 0x1e5f), TCO_PPT},

	{ PCI_VDEVICE(INTEL, 0x8c40), TCO_LPT},

	{ PCI_VDEVICE(INTEL, 0x8c41), TCO_LPT},

	{ PCI_VDEVICE(INTEL, 0x8c42), TCO_LPT},

	{ PCI_VDEVICE(INTEL, 0x8c43), TCO_LPT},

	{ PCI_VDEVICE(INTEL, 0x8c44), TCO_LPT},

	{ PCI_VDEVICE(INTEL, 0x8c45), TCO_LPT},

	{ PCI_VDEVICE(INTEL, 0x8c46), TCO_LPT},

	{ PCI_VDEVICE(INTEL, 0x8c47), TCO_LPT},

	{ PCI_VDEVICE(INTEL, 0x8c48), TCO_LPT},

	{ PCI_VDEVICE(INTEL, 0x8c49), TCO_LPT},

	{ PCI_VDEVICE(INTEL, 0x8c4a), TCO_LPT},

	{ PCI_VDEVICE(INTEL, 0x8c4b), TCO_LPT},

	{ PCI_VDEVICE(INTEL, 0x8c4c), TCO_LPT},

	{ PCI_VDEVICE(INTEL, 0x8c4d), TCO_LPT},

	{ PCI_VDEVICE(INTEL, 0x8c4e), TCO_LPT},

	{ PCI_VDEVICE(INTEL, 0x8c4f), TCO_LPT},

	{ PCI_VDEVICE(INTEL, 0x8c50), TCO_LPT},

	{ PCI_VDEVICE(INTEL, 0x8c51), TCO_LPT},

	{ PCI_VDEVICE(INTEL, 0x8c52), TCO_LPT},

	{ PCI_VDEVICE(INTEL, 0x8c53), TCO_LPT},

	{ PCI_VDEVICE(INTEL, 0x8c54), TCO_LPT},

	{ PCI_VDEVICE(INTEL, 0x8c55), TCO_LPT},

	{ PCI_VDEVICE(INTEL, 0x8c56), TCO_LPT},

	{ PCI_VDEVICE(INTEL, 0x8c57), TCO_LPT},

	{ PCI_VDEVICE(INTEL, 0x8c58), TCO_LPT},

	{ PCI_VDEVICE(INTEL, 0x8c59), TCO_LPT},

	{ PCI_VDEVICE(INTEL, 0x8c5a), TCO_LPT},

	{ PCI_VDEVICE(INTEL, 0x8c5b), TCO_LPT},

	{ PCI_VDEVICE(INTEL, 0x8c5c), TCO_LPT},

	{ PCI_VDEVICE(INTEL, 0x8c5d), TCO_LPT},

	{ PCI_VDEVICE(INTEL, 0x8c5e), TCO_LPT},

	{ PCI_VDEVICE(INTEL, 0x8c5f), TCO_LPT},

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

};

MODULE_DEVICE_TABLE(pci, iTCO_wdt_pci_tbl);

drivers/watchdog/imx2_wdt.c

+1 −10
Original line number Diff line number Diff line
@@ -247,7 +247,6 @@ static struct miscdevice imx2_wdt_miscdev = { 
static int __init imx2_wdt_probe(struct platform_device *pdev)

{

	int ret;

	int res_size;

	struct resource *res;



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
@@ -256,15 +255,7 @@ static int __init imx2_wdt_probe(struct platform_device *pdev) 
		return -ENODEV;

	}



	res_size = resource_size(res);

	if (!devm_request_mem_region(&pdev->dev, res->start, res_size,

		res->name)) {

		dev_err(&pdev->dev, "can't allocate %d bytes at %d address\n",

			res_size, res->start);

		return -ENOMEM;

	}



	imx2_wdt.base = devm_ioremap_nocache(&pdev->dev, res->start, res_size);

	imx2_wdt.base = devm_request_and_ioremap(&pdev->dev, res);

	if (!imx2_wdt.base) {

		dev_err(&pdev->dev, "ioremap failed\n");

		return -ENOMEM;

drivers/watchdog/nuc900_wdt.c

+3 −2
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ struct nuc900_wdt { 
};



static unsigned long nuc900wdt_busy;

struct nuc900_wdt *nuc900_wdt;

static struct nuc900_wdt *nuc900_wdt;



static inline void nuc900_wdt_keepalive(void)

{
@@ -287,7 +287,8 @@ static int __devinit nuc900wdt_probe(struct platform_device *pdev) 


	setup_timer(&nuc900_wdt->timer, nuc900_wdt_timer_ping, 0);



	if (misc_register(&nuc900wdt_miscdev)) {

	ret = misc_register(&nuc900wdt_miscdev);

	if (ret) {

		dev_err(&pdev->dev, "err register miscdev on minor=%d (%d)\n",

			WATCHDOG_MINOR, ret);

		goto err_clk;

drivers/watchdog/omap_wdt.c

+2 −0
Original line number Diff line number Diff line
@@ -339,6 +339,7 @@ static int __devinit omap_wdt_probe(struct platform_device *pdev) 
	return 0;



err_misc:

	pm_runtime_disable(wdev->dev);

	platform_set_drvdata(pdev, NULL);

	iounmap(wdev->base);
@@ -371,6 +372,7 @@ static int __devexit omap_wdt_remove(struct platform_device *pdev) 
	struct omap_wdt_dev *wdev = platform_get_drvdata(pdev);

	struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0);



	pm_runtime_disable(wdev->dev);

	if (!res)

		return -ENOENT;