aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorMichael Buesch <mb@bu3sch.de>2008-02-19 06:41:30 -0500
committerJohn W. Linville <linville@tuxdriver.com>2008-02-20 20:11:49 -0500
commit42bfad4f71637c4eb4791aa8062063c4a8526522 (patch)
tree42c8c52d953aaa8f0418084af1e60c15e900488c /drivers
parent58ff70d4feae29cbb7ace410fa6585ef3afb44b6 (diff)
ssb: Fix watchdog access for devices without a chipcommon
This fixes the SSB watchdog access for devices without a chipcommon. These devices have the watchdog on the extif. Signed-off-by: Michael Buesch <mb@bu3sch.de> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/ssb/Kconfig6
-rw-r--r--drivers/ssb/Makefile1
-rw-r--r--drivers/ssb/driver_extif.c6
-rw-r--r--drivers/ssb/embedded.c26
4 files changed, 39 insertions, 0 deletions
diff --git a/drivers/ssb/Kconfig b/drivers/ssb/Kconfig
index d976660cb7f0..78fd33125e02 100644
--- a/drivers/ssb/Kconfig
+++ b/drivers/ssb/Kconfig
@@ -105,6 +105,12 @@ config SSB_DRIVER_MIPS
105 105
106 If unsure, say N 106 If unsure, say N
107 107
108# Assumption: We are on embedded, if we compile the MIPS core.
109config SSB_EMBEDDED
110 bool
111 depends on SSB_DRIVER_MIPS
112 default y
113
108config SSB_DRIVER_EXTIF 114config SSB_DRIVER_EXTIF
109 bool "SSB Broadcom EXTIF core driver (EXPERIMENTAL)" 115 bool "SSB Broadcom EXTIF core driver (EXPERIMENTAL)"
110 depends on SSB_DRIVER_MIPS && EXPERIMENTAL 116 depends on SSB_DRIVER_MIPS && EXPERIMENTAL
diff --git a/drivers/ssb/Makefile b/drivers/ssb/Makefile
index 7be397595805..e235144add7c 100644
--- a/drivers/ssb/Makefile
+++ b/drivers/ssb/Makefile
@@ -1,5 +1,6 @@
1# core 1# core
2ssb-y += main.o scan.o 2ssb-y += main.o scan.o
3ssb-$(CONFIG_SSB_EMBEDDED) += embedded.o
3 4
4# host support 5# host support
5ssb-$(CONFIG_SSB_PCIHOST) += pci.o pcihost_wrapper.o 6ssb-$(CONFIG_SSB_PCIHOST) += pci.o pcihost_wrapper.o
diff --git a/drivers/ssb/driver_extif.c b/drivers/ssb/driver_extif.c
index fe55eb8b038a..b1899f422a54 100644
--- a/drivers/ssb/driver_extif.c
+++ b/drivers/ssb/driver_extif.c
@@ -110,6 +110,12 @@ void ssb_extif_get_clockcontrol(struct ssb_extif *extif,
110 *m = extif_read32(extif, SSB_EXTIF_CLOCK_SB); 110 *m = extif_read32(extif, SSB_EXTIF_CLOCK_SB);
111} 111}
112 112
113void ssb_extif_watchdog_timer_set(struct ssb_extif *extif,
114 u32 ticks)
115{
116 extif_write32(extif, SSB_EXTIF_WATCHDOG, ticks);
117}
118
113u32 ssb_extif_gpio_in(struct ssb_extif *extif, u32 mask) 119u32 ssb_extif_gpio_in(struct ssb_extif *extif, u32 mask)
114{ 120{
115 return extif_read32(extif, SSB_EXTIF_GPIO_IN) & mask; 121 return extif_read32(extif, SSB_EXTIF_GPIO_IN) & mask;
diff --git a/drivers/ssb/embedded.c b/drivers/ssb/embedded.c
new file mode 100644
index 000000000000..751f58ac612c
--- /dev/null
+++ b/drivers/ssb/embedded.c
@@ -0,0 +1,26 @@
1/*
2 * Sonics Silicon Backplane
3 * Embedded systems support code
4 *
5 * Copyright 2005-2008, Broadcom Corporation
6 * Copyright 2006-2008, Michael Buesch <mb@bu3sch.de>
7 *
8 * Licensed under the GNU/GPL. See COPYING for details.
9 */
10
11#include <linux/ssb/ssb.h>
12#include <linux/ssb/ssb_embedded.h>
13
14
15int ssb_watchdog_timer_set(struct ssb_bus *bus, u32 ticks)
16{
17 if (ssb_chipco_available(&bus->chipco)) {
18 ssb_chipco_watchdog_timer_set(&bus->chipco, ticks);
19 return 0;
20 }
21 if (ssb_extif_available(&bus->extif)) {
22 ssb_extif_watchdog_timer_set(&bus->extif, ticks);
23 return 0;
24 }
25 return -ENODEV;
26}