summaryrefslogtreecommitdiffstats
path: root/package/broadcom-diag/src
diff options
context:
space:
mode:
Diffstat (limited to 'package/broadcom-diag/src')
-rw-r--r--package/broadcom-diag/src/diag.c7
-rw-r--r--package/broadcom-diag/src/diag.h1
-rw-r--r--package/broadcom-diag/src/gpio.h91
3 files changed, 88 insertions, 11 deletions
diff --git a/package/broadcom-diag/src/diag.c b/package/broadcom-diag/src/diag.c
index 5b9ff027f..a47d13993 100644
--- a/package/broadcom-diag/src/diag.c
+++ b/package/broadcom-diag/src/diag.c
@@ -539,8 +539,11 @@ static struct platform_t __init *platform_detect(void)
boardnum = getvar("boardnum");
boardtype = getvar("boardtype");
- if (strncmp(getvar("model_no"), "WL700",5) == 0) {
- return &platforms[WL700GE]; }
+ if (strcmp(getvar("nvram_type"), "cfe") == 0)
+ return &platforms[WGT634U];
+
+ if (strncmp(getvar("model_no"), "WL700",5) == 0)
+ return &platforms[WL700GE];
if (strncmp(getvar("pmon_ver"), "CFE", 3) == 0) {
/* CFE based - newer hardware */
diff --git a/package/broadcom-diag/src/diag.h b/package/broadcom-diag/src/diag.h
index af30823aa..dcc122ad2 100644
--- a/package/broadcom-diag/src/diag.h
+++ b/package/broadcom-diag/src/diag.h
@@ -21,6 +21,7 @@
* $Id:$
*/
+#include <linux/irq.h>
#define MODULE_NAME "diag"
#define MAX_GPIO 8
diff --git a/package/broadcom-diag/src/gpio.h b/package/broadcom-diag/src/gpio.h
index c6f34bdea..982caddae 100644
--- a/package/broadcom-diag/src/gpio.h
+++ b/package/broadcom-diag/src/gpio.h
@@ -1,5 +1,77 @@
#ifndef __DIAG_GPIO_H
#define __DIAG_GPIO_H
+#include <linux/interrupt.h>
+
+#ifndef BCMDRIVER
+#include <linux/ssb/ssb.h>
+#include <linux/ssb/ssb_driver_chipcommon.h>
+#include <linux/ssb/ssb_driver_extif.h>
+
+extern struct ssb_bus ssb;
+
+#define gpio_op(op, param...) \
+ do { \
+ if (ssb.chipco.dev) \
+ return ssb_chipco_gpio_##op(&ssb.chipco, param); \
+ else if (ssb.extif.dev) \
+ return ssb_extif_gpio_##op(&ssb.extif, param); \
+ else \
+ return 0; \
+ } while (0);
+
+
+static inline u32 gpio_in(void)
+{
+ gpio_op(in, ~0);
+}
+
+static inline u32 gpio_out(u32 mask, u32 value)
+{
+ gpio_op(out, mask, value);
+}
+
+static inline u32 gpio_outen(u32 mask, u32 value)
+{
+ gpio_op(outen, mask, value);
+}
+
+static inline u32 gpio_control(u32 mask, u32 value)
+{
+ if (ssb.chipco.dev)
+ return ssb_chipco_gpio_control(&ssb.chipco, mask, value);
+ else
+ return 0;
+}
+
+static inline u32 gpio_intmask(u32 mask, u32 value)
+{
+ gpio_op(intmask, mask, value);
+}
+
+static inline u32 gpio_intpolarity(u32 mask, u32 value)
+{
+ gpio_op(polarity, mask, value);
+}
+
+static void gpio_set_irqenable(int enabled, irqreturn_t (*handler)(int, void *, struct pt_regs *))
+{
+ int irq;
+
+ if (ssb.chipco.dev)
+ irq = ssb_mips_irq(ssb.chipco.dev) + 2;
+ else if (ssb.extif.dev)
+ irq = ssb_mips_irq(ssb.extif.dev) + 2;
+ else return;
+
+ if (enabled)
+ request_irq(irq, handler, SA_SHIRQ | SA_SAMPLE_RANDOM, "gpio", handler);
+ else
+ free_irq(irq, handler);
+
+ gpio_intmask(1, (enabled ? 1 : 0));
+}
+
+#else
#include <typedefs.h>
#include <osl.h>
@@ -18,13 +90,6 @@
#define sbh_lock bcm947xx_sbh_lock
#endif
-#define EXTIF_ADDR 0x1f000000
-#define EXTIF_UART (EXTIF_ADDR + 0x00800000)
-
-#define GPIO_TYPE_NORMAL (0x0 << 24)
-#define GPIO_TYPE_EXTIF (0x1 << 24)
-#define GPIO_TYPE_MASK (0xf << 24)
-
extern void *sbh;
extern spinlock_t sbh_lock;
@@ -65,6 +130,15 @@ static void gpio_set_irqenable(int enabled, irqreturn_t (*handler)(int, void *,
spin_unlock_irqrestore(sbh_lock, flags);
}
+#endif /* BCMDRIVER */
+
+#define EXTIF_ADDR 0x1f000000
+#define EXTIF_UART (EXTIF_ADDR + 0x00800000)
+
+#define GPIO_TYPE_NORMAL (0x0 << 24)
+#define GPIO_TYPE_EXTIF (0x1 << 24)
+#define GPIO_TYPE_MASK (0xf << 24)
+
static inline void gpio_set_extif(int gpio, int value)
{
volatile u8 *addr = (volatile u8 *) KSEG1ADDR(EXTIF_UART) + (gpio & ~GPIO_TYPE_MASK);
@@ -74,5 +148,4 @@ static inline void gpio_set_extif(int gpio, int value)
*addr;
}
-
-#endif
+#endif /* __DIAG_GPIO_H */