aboutsummaryrefslogtreecommitdiffstats
path: root/package/broadcom-diag
diff options
context:
space:
mode:
Diffstat (limited to 'package/broadcom-diag')
-rw-r--r--package/broadcom-diag/src/diag.c73
-rw-r--r--package/broadcom-diag/src/gpio.h115
2 files changed, 46 insertions, 142 deletions
diff --git a/package/broadcom-diag/src/diag.c b/package/broadcom-diag/src/diag.c
index 00a72e9076..8e7ffa6cc7 100644
--- a/package/broadcom-diag/src/diag.c
+++ b/package/broadcom-diag/src/diag.c
@@ -149,9 +149,9 @@ static void __init bcm4780_init(void) {
/* Enables GPIO 3 that controls HDD and led power on ASUS WL-700gE */
printk(MODULE_NAME ": Spinning up HDD and enabling leds\n");
- gpio_outen(pin, pin);
- gpio_control(pin, 0);
- gpio_out(pin, pin);
+ ssb_gpio_outen(&ssb_bcm47xx, pin, pin);
+ ssb_gpio_control(&ssb_bcm47xx, pin, 0);
+ ssb_gpio_out(&ssb_bcm47xx, pin, pin);
/* Wait 5s, so the HDD can spin up */
set_current_state(TASK_INTERRUPTIBLE);
@@ -161,14 +161,14 @@ static void __init bcm4780_init(void) {
static void __init NetCenter_init(void) {
/* unset pin 6 (+12V) */
int pin = 1 << 6;
- gpio_outen(pin, pin);
- gpio_control(pin, 0);
- gpio_out(pin, pin);
+ ssb_gpio_outen(&ssb_bcm47xx, pin, pin);
+ ssb_gpio_control(&ssb_bcm47xx, pin, 0);
+ ssb_gpio_out(&ssb_bcm47xx, pin, pin);
/* unset pin 1 (turn off red led, blue will light alone if +5V comes up) */
pin = 1 << 1;
- gpio_outen(pin, pin);
- gpio_control(pin, 0);
- gpio_out(pin, pin);
+ ssb_gpio_outen(&ssb_bcm47xx, pin, pin);
+ ssb_gpio_control(&ssb_bcm47xx, pin, 0);
+ ssb_gpio_out(&ssb_bcm47xx, pin, pin);
/* unset pin 3 (+5V) and wait 5 seconds (harddisk spin up) */
bcm4780_init();
}
@@ -177,9 +177,9 @@ static void __init bcm57xx_init(void) {
int pin = 1 << 2;
/* FIXME: switch comes up, but port mappings/vlans not right */
- gpio_outen(pin, pin);
- gpio_control(pin, 0);
- gpio_out(pin, pin);
+ ssb_gpio_outen(&ssb_bcm47xx, pin, pin);
+ ssb_gpio_control(&ssb_bcm47xx, pin, 0);
+ ssb_gpio_out(&ssb_bcm47xx, pin, pin);
}
static struct platform_t __initdata platforms[] = {
@@ -1166,18 +1166,18 @@ static void register_buttons(struct button_t *b)
platform.button_mask &= ~gpiomask;
- gpio_outen(platform.button_mask, 0);
- gpio_control(platform.button_mask, 0);
- platform.button_polarity = gpio_in() & platform.button_mask;
- gpio_intpolarity(platform.button_mask, platform.button_polarity);
- gpio_setintmask(platform.button_mask, platform.button_mask);
+ ssb_gpio_outen(&ssb_bcm47xx, platform.button_mask, 0);
+ ssb_gpio_control(&ssb_bcm47xx, platform.button_mask, 0);
+ platform.button_polarity = ssb_gpio_in(&ssb_bcm47xx, ~0) & platform.button_mask;
+ ssb_gpio_polarity(&ssb_bcm47xx, platform.button_mask, platform.button_polarity);
+ ssb_gpio_intmask(&ssb_bcm47xx, platform.button_mask, platform.button_mask);
gpio_set_irqenable(1, button_handler);
}
static void unregister_buttons(struct button_t *b)
{
- gpio_setintmask(platform.button_mask, 0);
+ ssb_gpio_intmask(&ssb_bcm47xx, platform.button_mask, 0);
gpio_set_irqenable(0, button_handler);
}
@@ -1237,12 +1237,12 @@ static irqreturn_t button_handler(int irq, void *dev_id)
struct button_t *b;
u32 in, changed;
- in = gpio_in() & platform.button_mask;
- gpio_intpolarity(platform.button_mask, in);
+ in = ssb_gpio_in(&ssb_bcm47xx, ~0) & platform.button_mask;
+ ssb_gpio_polarity(&ssb_bcm47xx, platform.button_mask, in);
changed = platform.button_polarity ^ in;
platform.button_polarity = in;
- changed &= ~gpio_outen(0, 0);
+ changed &= ~ssb_gpio_outen(&ssb_bcm47xx, 0, 0);
for (b = platform.buttons; b->name; b++) {
struct event_t *event;
@@ -1298,10 +1298,10 @@ static void register_leds(struct led_t *l)
}
}
- gpio_outen(mask, oe_mask);
- gpio_control(mask, 0);
- gpio_out(mask, val);
- gpio_setintmask(mask, 0);
+ ssb_gpio_outen(&ssb_bcm47xx, mask, oe_mask);
+ ssb_gpio_control(&ssb_bcm47xx, mask, 0);
+ ssb_gpio_out(&ssb_bcm47xx, mask, val);
+ ssb_gpio_intmask(&ssb_bcm47xx, mask, 0);
}
static void unregister_leds(struct led_t *l)
@@ -1336,11 +1336,11 @@ static void led_flash(unsigned long dummy) {
mask &= ~gpiomask;
if (mask) {
- u32 val = ~gpio_in();
+ u32 val = ~ssb_gpio_in(&ssb_bcm47xx, ~0);
- gpio_outen(mask, mask);
- gpio_control(mask, 0);
- gpio_out(mask, val);
+ ssb_gpio_outen(&ssb_bcm47xx, mask, mask);
+ ssb_gpio_control(&ssb_bcm47xx, mask, 0);
+ ssb_gpio_out(&ssb_bcm47xx, mask, val);
}
if (mask || extif_blink) {
mod_timer(&led_timer, jiffies + FLASH_TIME);
@@ -1367,7 +1367,7 @@ static ssize_t diag_proc_read(struct file *file, char *buf, size_t count, loff_t
if (led->gpio & GPIO_TYPE_EXTIF) {
len = sprintf(page, "%d\n", led->state);
} else {
- u32 in = (gpio_in() & led->gpio ? 1 : 0);
+ u32 in = (ssb_gpio_in(&ssb_bcm47xx, ~0) & led->gpio ? 1 : 0);
u8 p = (led->polarity == NORMAL ? 0 : 1);
len = sprintf(page, "%d\n", ((in ^ p) ? 1 : 0));
}
@@ -1431,9 +1431,9 @@ static ssize_t diag_proc_write(struct file *file, const char *buf, size_t count,
led->state = p ^ ((page[0] == '1') ? 1 : 0);
set_led_extif(led);
} else {
- gpio_outen(led->gpio, led->gpio);
- gpio_control(led->gpio, 0);
- gpio_out(led->gpio, ((p ^ (page[0] == '1')) ? led->gpio : 0));
+ ssb_gpio_outen(&ssb_bcm47xx, led->gpio, led->gpio);
+ ssb_gpio_control(&ssb_bcm47xx, led->gpio, 0);
+ ssb_gpio_out(&ssb_bcm47xx, led->gpio, ((p ^ (page[0] == '1')) ? led->gpio : 0));
}
}
break;
@@ -1464,6 +1464,13 @@ static int __init diag_init(void)
static struct proc_dir_entry *p;
static struct platform_t *detected;
+#ifdef CONFIG_BCM47XX_SSB
+ if (bcm47xx_active_bus_type != BCM47XX_BUS_TYPE_SSB) {
+ printk(MODULE_NAME ": bcma bus is not supported.\n");
+ return -ENODEV;
+ }
+#endif
+
detected = platform_detect();
if (!detected) {
printk(MODULE_NAME ": Router model not detected.\n");
diff --git a/package/broadcom-diag/src/gpio.h b/package/broadcom-diag/src/gpio.h
index cd48637b20..575fd8c471 100644
--- a/package/broadcom-diag/src/gpio.h
+++ b/package/broadcom-diag/src/gpio.h
@@ -1,46 +1,12 @@
#ifndef __DIAG_GPIO_H
#define __DIAG_GPIO_H
#include <linux/interrupt.h>
-
-#ifndef BCMDRIVER
-#include <linux/ssb/ssb_embedded.h>
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25)
#include <linux/gpio.h>
-#define ssb ssb_bcm47xx
-#endif
-extern struct ssb_bus ssb;
+#include <asm/mach-bcm47xx/bcm47xx.h>
-
-static inline u32 gpio_in(void)
-{
- return ssb_gpio_in(&ssb, ~0);
-}
-
-static inline u32 gpio_out(u32 mask, u32 value)
-{
- return ssb_gpio_out(&ssb, mask, value);
-}
-
-static inline u32 gpio_outen(u32 mask, u32 value)
-{
- return ssb_gpio_outen(&ssb, mask, value);
-}
-
-static inline u32 gpio_control(u32 mask, u32 value)
-{
- return ssb_gpio_control(&ssb, mask, value);
-}
-
-static inline u32 gpio_setintmask(u32 mask, u32 value)
-{
- return ssb_gpio_intmask(&ssb, mask, value);
-}
-
-static inline u32 gpio_intpolarity(u32 mask, u32 value)
-{
- return ssb_gpio_polarity(&ssb, mask, value);
-}
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,0,0)
+#define ssb_bcm47xx bcm47xx_bus.ssb
+#endif
static inline u32 __ssb_write32_masked(struct ssb_device *dev, u16 offset,
u32 mask, u32 value)
@@ -55,16 +21,8 @@ static void gpio_set_irqenable(int enabled, irqreturn_t (*handler)(int, void *))
{
int irq;
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25)
irq = gpio_to_irq(0);
if (irq == -EINVAL) return;
-#else
- 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;
-#endif
if (enabled) {
if (request_irq(irq, handler, IRQF_SHARED | IRQF_SAMPLE_RANDOM, "gpio", handler))
@@ -73,71 +31,10 @@ static void gpio_set_irqenable(int enabled, irqreturn_t (*handler)(int, void *))
free_irq(irq, handler);
}
- if (ssb.chipco.dev)
- __ssb_write32_masked(ssb.chipco.dev, SSB_CHIPCO_IRQMASK, SSB_CHIPCO_IRQ_GPIO, (enabled ? SSB_CHIPCO_IRQ_GPIO : 0));
+ if (ssb_bcm47xx.chipco.dev)
+ __ssb_write32_masked(ssb_bcm47xx.chipco.dev, SSB_CHIPCO_IRQMASK, SSB_CHIPCO_IRQ_GPIO, (enabled ? SSB_CHIPCO_IRQ_GPIO : 0));
}
-#else
-
-#include <typedefs.h>
-#include <osl.h>
-#include <bcmdevs.h>
-#include <sbutils.h>
-#include <sbconfig.h>
-#include <sbchipc.h>
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-#include <sbmips.h>
-#else
-#include <hndcpu.h>
-#endif
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-#define sbh bcm947xx_sbh
-#define sbh_lock bcm947xx_sbh_lock
-#endif
-
-extern void *sbh;
-extern spinlock_t sbh_lock;
-
-#define gpio_in() sb_gpioin(sbh)
-#define gpio_out(mask, value) sb_gpioout(sbh, mask, ((value) & (mask)), GPIO_DRV_PRIORITY)
-#define gpio_outen(mask, value) sb_gpioouten(sbh, mask, value, GPIO_DRV_PRIORITY)
-#define gpio_control(mask, value) sb_gpiocontrol(sbh, mask, value, GPIO_DRV_PRIORITY)
-#define gpio_setintmask(mask, value) sb_gpiointmask(sbh, mask, value, GPIO_DRV_PRIORITY)
-#define gpio_intpolarity(mask, value) sb_gpiointpolarity(sbh, mask, value, GPIO_DRV_PRIORITY)
-
-static void gpio_set_irqenable(int enabled, irqreturn_t (*handler)(int, void *, struct pt_regs *))
-{
- unsigned int coreidx;
- unsigned long flags;
- chipcregs_t *cc;
- int irq;
-
- spin_lock_irqsave(sbh_lock, flags);
- coreidx = sb_coreidx(sbh);
-
- irq = sb_irq(sbh) + 2;
- if (enabled)
- request_irq(irq, handler, SA_SHIRQ | SA_SAMPLE_RANDOM, "gpio", handler);
- else
- free_irq(irq, handler);
-
- if ((cc = sb_setcore(sbh, SB_CC, 0))) {
- int intmask;
-
- intmask = readl(&cc->intmask);
- if (enabled)
- intmask |= CI_GPIO;
- else
- intmask &= ~CI_GPIO;
- writel(intmask, &cc->intmask);
- }
- sb_setcoreidx(sbh, coreidx);
- spin_unlock_irqrestore(sbh_lock, flags);
-}
-
-#endif /* BCMDRIVER */
-
#define EXTIF_ADDR 0x1f000000
#define EXTIF_UART (EXTIF_ADDR + 0x00800000)
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 22:14:42 +0000