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>

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>
Michael Buesch · John W. Linville
1 parent 58ff70d4fe
Showing 7 changed files with 63 additions and 0 deletions Side-by-side Diff
drivers/ssb/Kconfig
drivers/ssb/Makefile
drivers/ssb/driver_extif.c
drivers/ssb/embedded.c
include/linux/ssb/ssb_driver_chipcommon.h
include/linux/ssb/ssb_driver_extif.h
include/linux/ssb/ssb_embedded.h
@@ -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
 # core
 ssb-y					+= main.o scan.o
+ssb-$(CONFIG_SSB_EMBEDDED)		+= embedded.o
  
 # host support
 ssb-$(CONFIG_SSB_PCIHOST)		+= pci.o pcihost_wrapper.o
@@ -110,6 +110,12 @@
 	*m = extif_read32(extif, SSB_EXTIF_CLOCK_SB);
 }
  
+void ssb_extif_watchdog_timer_set(struct ssb_extif *extif,
+				  u32 ticks)
+{
+	extif_write32(extif, SSB_EXTIF_WATCHDOG, ticks);
+}
+
 u32 ssb_extif_gpio_in(struct ssb_extif *extif, u32 mask)
 {
 	return extif_read32(extif, SSB_EXTIF_GPIO_IN) & mask;
+/*
+ * 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;
+}
@@ -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>
@@ -171,6 +171,9 @@
 extern void ssb_extif_timing_init(struct ssb_extif *extif,
 				  unsigned long ns);
  
+extern void ssb_extif_watchdog_timer_set(struct ssb_extif *extif,
+					 u32 ticks);
+
 u32 ssb_extif_gpio_in(struct ssb_extif *extif, u32 mask);
  
 void ssb_extif_gpio_out(struct ssb_extif *extif, u32 mask, u32 value);
@@ -197,6 +200,12 @@
 static inline
 void ssb_extif_get_clockcontrol(struct ssb_extif *extif,
 			        u32 *plltype, u32 *n, u32 *m)
+{
+}
+
+static inline
+void ssb_extif_watchdog_timer_set(struct ssb_extif *extif,
+				  u32 ticks)
 {
 }
  
+#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_ */
...	...	@@ -105,6 +105,12 @@
105	105
106	106	If unsure, say N
107	107
	108	+# Assumption: We are on embedded, if we compile the MIPS core.
	109	+config SSB_EMBEDDED
	110	+ bool
	111	+ depends on SSB_DRIVER_MIPS
	112	+ default y
	113	+
108	114	config SSB_DRIVER_EXTIF
109	115	bool "SSB Broadcom EXTIF core driver (EXPERIMENTAL)"
110	116	depends on SSB_DRIVER_MIPS && EXPERIMENTAL
1	1	# core
2	2	ssb-y += main.o scan.o
	3	+ssb-$(CONFIG_SSB_EMBEDDED) += embedded.o
3	4
4	5	# host support
5	6	ssb-$(CONFIG_SSB_PCIHOST) += pci.o pcihost_wrapper.o
...	...	@@ -110,6 +110,12 @@
110	110	*m = extif_read32(extif, SSB_EXTIF_CLOCK_SB);
111	111	}
112	112
	113	+void ssb_extif_watchdog_timer_set(struct ssb_extif *extif,
	114	+ u32 ticks)
	115	+{
	116	+ extif_write32(extif, SSB_EXTIF_WATCHDOG, ticks);
	117	+}
	118	+
113	119	u32 ssb_extif_gpio_in(struct ssb_extif *extif, u32 mask)
114	120	{
115	121	return extif_read32(extif, SSB_EXTIF_GPIO_IN) & mask;
	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	+
	15	+int 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	+}
...	...	@@ -360,6 +360,11 @@
360	360	u16 fast_pwrup_delay;
361	361	};
362	362
	363	+static inline bool ssb_chipco_available(struct ssb_chipcommon *cc)
	364	+{
	365	+ return (cc->dev != NULL);
	366	+}
	367	+
363	368	extern void ssb_chipcommon_init(struct ssb_chipcommon *cc);
364	369
365	370	#include <linux/pm.h>
...	...	@@ -171,6 +171,9 @@
171	171	extern void ssb_extif_timing_init(struct ssb_extif *extif,
172	172	unsigned long ns);
173	173
	174	+extern void ssb_extif_watchdog_timer_set(struct ssb_extif *extif,
	175	+ u32 ticks);
	176	+
174	177	u32 ssb_extif_gpio_in(struct ssb_extif *extif, u32 mask);
175	178
176	179	void ssb_extif_gpio_out(struct ssb_extif *extif, u32 mask, u32 value);
...	...	@@ -197,6 +200,12 @@
197	200	static inline
198	201	void ssb_extif_get_clockcontrol(struct ssb_extif *extif,
199	202	u32 plltype, u32 n, u32 *m)
	203	+{
	204	+}
	205	+
	206	+static inline
	207	+void ssb_extif_watchdog_timer_set(struct ssb_extif *extif,
	208	+ u32 ticks)
200	209	{
201	210	}
202	211
	1	+#ifndef LINUX_SSB_EMBEDDED_H_
	2	+#define LINUX_SSB_EMBEDDED_H_
	3	+
	4	+#include <linux/types.h>
	5	+#include <linux/ssb/ssb.h>
	6	+
	7	+
	8	+extern int ssb_watchdog_timer_set(struct ssb_bus *bus, u32 ticks);
	9	+
	10	+#endif /* LINUX_SSB_EMBEDDED_H_ */