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

Commit b65d04a7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
  [WATCHDOG] improve machzwd detection
  [WATCHDOG] use ENOTTY instead of ENOIOCTLCMD in ioctl()
  [WATCHDOG] s3c24XX nowayout
  [WATCHDOG] pnx4008: add cpu_relax()
  [WATCHDOG] pnx4008_wdt.c - spinlock fixes.
  [WATCHDOG] pnx4008_wdt.c - remove patch
  [WATCHDOG] pnx4008_wdt.c - nowayout patch
  [WATCHDOG] pnx4008: add watchdog support
  [WATCHDOG] i8xx_tco remove pci_find_device.
  [WATCHDOG] alim remove pci_find_device
parents 0235497f 11dc1019

arch/arm/mach-pnx4008/clock.c

+11 −0
Original line number Original line Diff line number Diff line
@@ -735,6 +735,16 @@ static struct clk uart6_ck = { 
	.enable_reg = UARTCLKCTRL_REG,

	.enable_reg = UARTCLKCTRL_REG,

};

};





static struct clk wdt_ck = {

	.name = "wdt_ck",

	.parent = &per_ck,

	.flags = NEEDS_INITIALIZATION,

	.round_rate = &on_off_round_rate,

	.set_rate = &on_off_set_rate,

	.enable_shift = 0,

	.enable_reg = TIMCLKCTRL_REG,

};



/* These clocks are visible outside this module

/* These clocks are visible outside this module

 * and can be initialized

 * and can be initialized

 */

 */
@@ -765,6 +775,7 @@ static struct clk *onchip_clks[] = { 
	&uart4_ck,

	&uart4_ck,

	&uart5_ck,

	&uart5_ck,

	&uart6_ck,

	&uart6_ck,

	&wdt_ck,

};

};





static int local_clk_enable(struct clk *clk)

static int local_clk_enable(struct clk *clk)

drivers/char/watchdog/Kconfig

+11 −0
Original line number Original line Diff line number Diff line
@@ -172,6 +172,17 @@ config OMAP_WATCHDOG 
	  Support for TI OMAP1610/OMAP1710/OMAP2420 watchdog.  Say 'Y' here to

	  Support for TI OMAP1610/OMAP1710/OMAP2420 watchdog.  Say 'Y' here to

	  enable the OMAP1610/OMAP1710 watchdog timer.

	  enable the OMAP1610/OMAP1710 watchdog timer.





config PNX4008_WATCHDOG

	tristate "PNX4008 Watchdog"

	depends on WATCHDOG && ARCH_PNX4008

	help

	  Say Y here if to include support for the watchdog timer

	  in the PNX4008 processor.

	  This driver can be built as a module by choosing M. The module

	  will be called pnx4008_wdt.



	  Say N if you are unsure.



# X86 (i386 + ia64 + x86_64) Architecture

# X86 (i386 + ia64 + x86_64) Architecture





config ACQUIRE_WDT

config ACQUIRE_WDT

drivers/char/watchdog/Makefile

+1 −0
Original line number Original line Diff line number Diff line
@@ -33,6 +33,7 @@ obj-$(CONFIG_S3C2410_WATCHDOG) += s3c2410_wdt.o 
obj-$(CONFIG_SA1100_WATCHDOG) += sa1100_wdt.o

obj-$(CONFIG_SA1100_WATCHDOG) += sa1100_wdt.o

obj-$(CONFIG_MPCORE_WATCHDOG) += mpcore_wdt.o

obj-$(CONFIG_MPCORE_WATCHDOG) += mpcore_wdt.o

obj-$(CONFIG_EP93XX_WATCHDOG) += ep93xx_wdt.o

obj-$(CONFIG_EP93XX_WATCHDOG) += ep93xx_wdt.o

obj-$(CONFIG_PNX4008_WATCHDOG) += pnx4008_wdt.o





# X86 (i386 + ia64 + x86_64) Architecture

# X86 (i386 + ia64 + x86_64) Architecture

obj-$(CONFIG_ACQUIRE_WDT) += acquirewdt.o

obj-$(CONFIG_ACQUIRE_WDT) += acquirewdt.o

drivers/char/watchdog/acquirewdt.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -183,7 +183,7 @@ static int acq_ioctl(struct inode *inode, struct file *file, unsigned int cmd, 
	}

	}





	default:

	default:

	  return -ENOIOCTLCMD;

	  return -ENOTTY;

	}

	}

}

}

drivers/char/watchdog/advantechwdt.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -176,7 +176,7 @@ advwdt_ioctl(struct inode *inode, struct file *file, unsigned int cmd, 
	}

	}





	default:

	default:

	  return -ENOIOCTLCMD;

	  return -ENOTTY;

	}

	}

	return 0;

	return 0;

}

}