v2.6.31-rc patches - Part 2: new drivers
Hi Linus,
Please pull from 'master' branch of
git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog.git
or if master.kernel.org hasn't synced up yet:
master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog.git
This will update the following files:
drivers/mfd/twl4030-core.c | 12 drivers/watchdog/Kconfig | 41 ++ drivers/watchdog/Makefile | 5 drivers/watchdog/bcm47xx_wdt.c | 286 ++++++++++++++++++++ drivers/watchdog/coh901327_wdt.c | 537 +++++++++++++++++++++++++++++++++++++++ drivers/watchdog/pnx833x_wdt.c | 282 ++++++++++++++++++++ drivers/watchdog/stmp3xxx_wdt.c | 296 +++++++++++++++++++++ drivers/watchdog/twl4030_wdt.c | 272 +++++++++++++++++++ 8 files changed, 1731 insertions(+)
with these Changes:
Author: matthieu castet <[email protected]> Date: Fri Jun 5 18:57:18 2009 +0200
[WATCHDOG] add bcm47xx watchdog driver
This add watchdog driver for broadcom 47xx device. It uses the ssb subsytem to access embeded watchdog device.
Because the watchdog timeout is very short (about 2s), a soft timer is used to increase the watchdog period.
Note : A patch for exporting the ssb_watchdog_timer_set will be submitted on next linux-mips merge. Without this patch it can't be build as a module.
Author: dmitry pervushin <[email protected]> Date: Wed Jun 3 20:21:21 2009 +0400
[WATCHDOG] Freescale STMP: watchdog driver
Add watchdog timer support for Freescale STMP3xxx boards
Author: Timo Kokkonen <[email protected]> Date: Fri Mar 27 16:42:17 2009 +0200
[WATCHDOG] twl4030 watchdog driver
Implementation of twl4030 watchdog driver.
Author: Linus Walleij <[email protected]> Date: Wed May 6 15:35:40 2009 +0200
[WATCHDOG] U300 COH 901 327 watchdog driver
This patch adds support for the U300 COH 901 327 watchdog for the U300 platform recently added to RMK:s ARM tree.
Author: Daniel Laird <[email protected]> Date: Wed Nov 5 16:46:49 2008 +0100
[WATCHDOG] Add pnx833x_wdt
Add support for PNX833x watchdog timer.
The Changes can also be looked at on:
http://www.kernel.org/git/?p=linux/kernel/git/wim/linux-2.6-watchdog.git;a=summary
For completeness, I added the overal diff below.
Greetings,
Wim.
================================================================================
drivers/mfd/twl4030-core.c +12 -0
@@ -101,6 +101,12 @@#define twl_has_usb () false#endif +#if defined(CONFIG_TWL4030_WATCHDOG ) || \ + defined(CONFIG_TWL4030_WATCHDOG_MODULE ) +#define twl_has_watchdog () true +#else +#define twl_has_watchdog () false +#endif /* Triton Core internal information (BEGIN) */
@@ -526,6 +532,12 @@ add_children(struct twl4030_platform_data *pdata, unsigned long features) usb_transceiver = child; } +if (twl_has_watchdog ()) { + child =add_child (0 ,"twl4030_wdt" ,NULL ,0 , false,0 ,0 ); +if (IS_ERR (child)) +return PTR_ERR (child); + } +if (twl_has_regulator ()) {/* child = add_regulator(TWL4030_REG_VPLL1, pdata->vpll1);
drivers/watchdog/Kconfig +41 -0
59 lines not on this page · raw message
drivers/watchdog/Makefile +5 -0
@@ -28,6 +28,7 @@ obj-$(CONFIG_USBPCWATCHDOG) += pcwd_usb.o obj-$(CONFIG_AT91RM9200_WATCHDOG) += at91rm9200_wdt.o obj-$(CONFIG_AT91SAM9X_WATCHDOG) += at91sam9_wdt.o obj-$(CONFIG_OMAP_WATCHDOG) += omap_wdt.o +obj-$(CONFIG_TWL4030_WATCHDOG) += twl4030_wdt.o obj-$(CONFIG_21285_WATCHDOG) += wdt285.o obj-$(CONFIG_977_WATCHDOG) += wdt977.o obj-$(CONFIG_IXP2000_WATCHDOG) += ixp2000_wdt.o
@@ -41,6 +42,8 @@ obj-$(CONFIG_PNX4008_WATCHDOG) += pnx4008_wdt.o 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 # AVR32 Architecture obj-$(CONFIG_AT32AP700X_WDT) += at32ap700x_wdt.o
@@ -98,9 +101,11 @@ obj-$(CONFIG_SBC_EPX_C3_WATCHDOG) += sbc_epx_c3.o # M68KNOMMU Architecture # MIPS Architecture +obj-$(CONFIG_BCM47XX_WDT) += bcm47xx_wdt.o obj-$(CONFIG_RC32434_WDT) += rc32434_wdt.o obj-$(CONFIG_INDYDOG) += indydog.o obj-$(CONFIG_WDT_MTX1) += mtx-1_wdt.o +obj-$(CONFIG_PNX833X_WDT) += pnx833x_wdt.o obj-$(CONFIG_WDT_RM9K_GPI) += rm9k_wdt.o obj-$(CONFIG_SIBYTE_WDOG) += sb_wdog.o obj-$(CONFIG_AR7_WDT) += ar7_wdt.o
drivers/watchdog/bcm47xx_wdt.c new file +286 -0
286 lines not on this page · raw message
drivers/watchdog/coh901327_wdt.c new file +537 -0
537 lines not on this page · raw message
drivers/watchdog/pnx833x_wdt.c new file +282 -0
282 lines not on this page · raw message
drivers/watchdog/stmp3xxx_wdt.c new file +296 -0
296 lines not on this page · raw message
drivers/watchdog/twl4030_wdt.c new file +272 -0
272 lines not on this page · raw message