diff options
Diffstat (limited to 'target/linux/brcm47xx/patches-2.6.23/610-ssb-watchdog-fix.patch')
-rw-r--r-- | target/linux/brcm47xx/patches-2.6.23/610-ssb-watchdog-fix.patch | 119 |
1 files changed, 0 insertions, 119 deletions
diff --git a/target/linux/brcm47xx/patches-2.6.23/610-ssb-watchdog-fix.patch b/target/linux/brcm47xx/patches-2.6.23/610-ssb-watchdog-fix.patch deleted file mode 100644 index f0a8772ce..000000000 --- a/target/linux/brcm47xx/patches-2.6.23/610-ssb-watchdog-fix.patch +++ /dev/null @@ -1,119 +0,0 @@ ---- a/drivers/ssb/Kconfig -+++ b/drivers/ssb/Kconfig -@@ -105,6 +105,12 @@ - - If unsure, say N - -+# Assumption: We are on embedded, if we compile the MIPS core. -+config SSB_EMBEDDED -+ bool -+ depends on SSB_DRIVER_MIPS -+ default y -+ - config SSB_DRIVER_EXTIF - bool "SSB Broadcom EXTIF core driver (EXPERIMENTAL)" - depends on SSB_DRIVER_MIPS && EXPERIMENTAL ---- a/drivers/ssb/Makefile -+++ b/drivers/ssb/Makefile -@@ -1,5 +1,6 @@ - # core - ssb-y += main.o scan.o -+ssb-$(CONFIG_SSB_EMBEDDED) += embedded.o - - # host support - ssb-$(CONFIG_SSB_PCIHOST) += pci.o pcihost_wrapper.o ---- a/drivers/ssb/driver_extif.c -+++ b/drivers/ssb/driver_extif.c -@@ -37,6 +37,12 @@ - return value; - } - -+void ssb_extif_watchdog_timer_set(struct ssb_extif *extif, -+ u32 ticks) -+{ -+ extif_write32(extif, SSB_EXTIF_WATCHDOG, ticks); -+} -+ - #ifdef CONFIG_SSB_SERIAL - static bool serial_exists(u8 *regs) - { ---- /dev/null -+++ b/drivers/ssb/embedded.c -@@ -0,0 +1,26 @@ -+/* -+ * Sonics Silicon Backplane -+ * Embedded systems support code -+ * -+ * Copyright 2005-2008, Broadcom Corporation -+ * Copyright 2006-2008, Michael Buesch <mb@bu3sch.de> -+ * -+ * Licensed under the GNU/GPL. See COPYING for details. -+ */ -+ -+#include <linux/ssb/ssb.h> -+#include <linux/ssb/ssb_embedded.h> -+ -+ -+int ssb_watchdog_timer_set(struct ssb_bus *bus, u32 ticks) -+{ -+ if (ssb_chipco_available(&bus->chipco)) { -+ ssb_chipco_watchdog_timer_set(&bus->chipco, ticks); -+ return 0; -+ } -+ if (ssb_extif_available(&bus->extif)) { -+ ssb_extif_watchdog_timer_set(&bus->extif, ticks); -+ return 0; -+ } -+ return -ENODEV; -+} ---- a/include/linux/ssb/ssb_driver_chipcommon.h -+++ b/include/linux/ssb/ssb_driver_chipcommon.h -@@ -360,6 +360,11 @@ - u16 fast_pwrup_delay; - }; - -+static inline bool ssb_chipco_available(struct ssb_chipcommon *cc) -+{ -+ return (cc->dev != NULL); -+} -+ - extern void ssb_chipcommon_init(struct ssb_chipcommon *cc); - - #include <linux/pm.h> ---- a/include/linux/ssb/ssb_driver_extif.h -+++ b/include/linux/ssb/ssb_driver_extif.h -@@ -178,6 +178,9 @@ - u32 ssb_extif_gpio_polarity(struct ssb_extif *extif, u32 mask, u32 value); - u32 ssb_extif_gpio_intmask(struct ssb_extif *extif, u32 mask, u32 value); - -+extern void ssb_extif_watchdog_timer_set(struct ssb_extif *extif, -+ u32 ticks); -+ - #ifdef CONFIG_SSB_SERIAL - extern int ssb_extif_serial_init(struct ssb_extif *extif, - struct ssb_serial_port *ports); -@@ -201,5 +204,11 @@ - { - } - -+static inline -+void ssb_extif_watchdog_timer_set(struct ssb_extif *extif, -+ u32 ticks) -+{ -+} -+ - #endif /* CONFIG_SSB_DRIVER_EXTIF */ - #endif /* LINUX_SSB_EXTIFCORE_H_ */ ---- /dev/null -+++ b/include/linux/ssb/ssb_embedded.h -@@ -0,0 +1,10 @@ -+#ifndef LINUX_SSB_EMBEDDED_H_ -+#define LINUX_SSB_EMBEDDED_H_ -+ -+#include <linux/types.h> -+#include <linux/ssb/ssb.h> -+ -+ -+extern int ssb_watchdog_timer_set(struct ssb_bus *bus, u32 ticks); -+ -+#endif /* LINUX_SSB_EMBEDDED_H_ */ |