Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 37977
b: refs/heads/master
c: 9325fa3
h: refs/heads/master
i:
  37975: 08211a6
v: v3
  • Loading branch information
Vitaly Wool authored and Wim Van Sebroeck committed Oct 2, 2006
1 parent b7a3b4a commit eafa185
Show file tree
Hide file tree
Showing 6 changed files with 378 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 92dd9994c36fb83883585058232e082cb78b19c1
refs/heads/master: 9325fa36151fb9af39e697a6cd87e82667e2d8f9
11 changes: 11 additions & 0 deletions trunk/arch/arm/mach-pnx4008/clock.c
Original file line number Diff line number Diff line change
Expand Up @@ -735,6 +735,16 @@ static struct clk uart6_ck = {
.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
* and can be initialized
*/
Expand Down Expand Up @@ -765,6 +775,7 @@ static struct clk *onchip_clks[] = {
&uart4_ck,
&uart5_ck,
&uart6_ck,
&wdt_ck,
};

static int local_clk_enable(struct clk *clk)
Expand Down
11 changes: 11 additions & 0 deletions trunk/drivers/char/watchdog/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,17 @@ config OMAP_WATCHDOG
Support for TI OMAP1610/OMAP1710/OMAP2420 watchdog. Say 'Y' here to
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

config ACQUIRE_WDT
Expand Down
1 change: 1 addition & 0 deletions trunk/drivers/char/watchdog/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ obj-$(CONFIG_S3C2410_WATCHDOG) += s3c2410_wdt.o
obj-$(CONFIG_SA1100_WATCHDOG) += sa1100_wdt.o
obj-$(CONFIG_MPCORE_WATCHDOG) += mpcore_wdt.o
obj-$(CONFIG_EP93XX_WATCHDOG) += ep93xx_wdt.o
obj-$(CONFIG_PNX4008_WATCHDOG) += pnx4008_wdt.o

# X86 (i386 + ia64 + x86_64) Architecture
obj-$(CONFIG_ACQUIRE_WDT) += acquirewdt.o
Expand Down
Loading

0 comments on commit eafa185

Please sign in to comment.