diff options
-rw-r--r-- | package/broadcom-diag/src/diag.c | 73 | ||||
-rw-r--r-- | package/broadcom-diag/src/gpio.h | 123 |
2 files changed, 151 insertions, 45 deletions
diff --git a/package/broadcom-diag/src/diag.c b/package/broadcom-diag/src/diag.c index 5ff1c278b..00a72e907 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"); - ssb_gpio_outen(&ssb_bcm47xx, pin, pin); - ssb_gpio_control(&ssb_bcm47xx, pin, 0); - ssb_gpio_out(&ssb_bcm47xx, pin, pin); + gpio_outen(pin, pin); + gpio_control(pin, 0); + gpio_out(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; - ssb_gpio_outen(&ssb_bcm47xx, pin, pin); - ssb_gpio_control(&ssb_bcm47xx, pin, 0); - ssb_gpio_out(&ssb_bcm47xx, pin, pin); + gpio_outen(pin, pin); + gpio_control(pin, 0); + gpio_out(pin, pin); /* unset pin 1 (turn off red led, blue will light alone if +5V comes up) */ pin = 1 << 1; - ssb_gpio_outen(&ssb_bcm47xx, pin, pin); - ssb_gpio_control(&ssb_bcm47xx, pin, 0); - ssb_gpio_out(&ssb_bcm47xx, pin, pin); + gpio_outen(pin, pin); + gpio_control(pin, 0); + gpio_out(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 */ - ssb_gpio_outen(&ssb_bcm47xx, pin, pin); - ssb_gpio_control(&ssb_bcm47xx, pin, 0); - ssb_gpio_out(&ssb_bcm47xx, pin, pin); + gpio_outen(pin, pin); + gpio_control(pin, 0); + gpio_out(pin, pin); } static struct platform_t __initdata platforms[] = { @@ -1166,18 +1166,18 @@ static void register_buttons(struct button_t *b) platform.button_mask &= ~gpiomask; - 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_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); gpio_set_irqenable(1, button_handler); } static void unregister_buttons(struct button_t *b) { - ssb_gpio_intmask(&ssb_bcm47xx, platform.button_mask, 0); + gpio_setintmask(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 = ssb_gpio_in(&ssb_bcm47xx, ~0) & platform.button_mask; - ssb_gpio_polarity(&ssb_bcm47xx, platform.button_mask, in); + in = gpio_in() & platform.button_mask; + gpio_intpolarity(platform.button_mask, in); changed = platform.button_polarity ^ in; platform.button_polarity = in; - changed &= ~ssb_gpio_outen(&ssb_bcm47xx, 0, 0); + changed &= ~gpio_outen(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) } } - 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); + gpio_outen(mask, oe_mask); + gpio_control(mask, 0); + gpio_out(mask, val); + gpio_setintmask(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 = ~ssb_gpio_in(&ssb_bcm47xx, ~0); + u32 val = ~gpio_in(); - ssb_gpio_outen(&ssb_bcm47xx, mask, mask); - ssb_gpio_control(&ssb_bcm47xx, mask, 0); - ssb_gpio_out(&ssb_bcm47xx, mask, val); + gpio_outen(mask, mask); + gpio_control(mask, 0); + gpio_out(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 = (ssb_gpio_in(&ssb_bcm47xx, ~0) & led->gpio ? 1 : 0); + u32 in = (gpio_in() & 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 { - 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)); + gpio_outen(led->gpio, led->gpio); + gpio_control(led->gpio, 0); + gpio_out(led->gpio, ((p ^ (page[0] == '1')) ? led->gpio : 0)); } } break; @@ -1464,13 +1464,6 @@ static int __init diag_init(void) static struct proc_dir_entry *p; static struct platform_t *detected; -#ifdef CONFIG_BCM47XX_SSB - if (bcm47xx_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 575fd8c47..71917787c 100644 --- a/package/broadcom-diag/src/gpio.h +++ b/package/broadcom-diag/src/gpio.h @@ -1,13 +1,104 @@ #ifndef __DIAG_GPIO_H #define __DIAG_GPIO_H + #include <linux/interrupt.h> +#include <linux/ssb/ssb_embedded.h> #include <linux/gpio.h> -#include <asm/mach-bcm47xx/bcm47xx.h> +#include <bcm47xx.h> + +static inline u32 gpio_in(void) +{ + switch (bcm47xx_bus_type) { +#ifdef CONFIG_BCM47XX_SSB + case BCM47XX_BUS_TYPE_SSB: + return ssb_gpio_in(&bcm47xx_bus.ssb, ~0); +#endif +#ifdef CONFIG_BCM47XX_BCMA + case BCM47XX_BUS_TYPE_BCMA: + return bcma_chipco_gpio_in(&bcm47xx_bus.bcma.bus.drv_cc, ~0); +#endif + } + return -EINVAL; +} + +static inline u32 gpio_out(u32 mask, u32 value) +{ + switch (bcm47xx_bus_type) { +#ifdef CONFIG_BCM47XX_SSB + case BCM47XX_BUS_TYPE_SSB: + return ssb_gpio_out(&bcm47xx_bus.ssb, mask, value); +#endif +#ifdef CONFIG_BCM47XX_BCMA + case BCM47XX_BUS_TYPE_BCMA: + return bcma_chipco_gpio_out(&bcm47xx_bus.bcma.bus.drv_cc, mask, value); +#endif + } + return -EINVAL; +} + +static inline u32 gpio_outen(u32 mask, u32 value) +{ + switch (bcm47xx_bus_type) { +#ifdef CONFIG_BCM47XX_SSB + case BCM47XX_BUS_TYPE_SSB: + ssb_gpio_outen(&bcm47xx_bus.ssb, mask, value); + return 0; +#endif +#ifdef CONFIG_BCM47XX_BCMA + case BCM47XX_BUS_TYPE_BCMA: + bcma_chipco_gpio_outen(&bcm47xx_bus.bcma.bus.drv_cc, mask, value); + return 0; +#endif + } + return -EINVAL; +} + +static inline u32 gpio_control(u32 mask, u32 value) +{ + switch (bcm47xx_bus_type) { +#ifdef CONFIG_BCM47XX_SSB + case BCM47XX_BUS_TYPE_SSB: + return ssb_gpio_control(&bcm47xx_bus.ssb, mask, value); +#endif +#ifdef CONFIG_BCM47XX_BCMA + case BCM47XX_BUS_TYPE_BCMA: + return bcma_chipco_gpio_control(&bcm47xx_bus.bcma.bus.drv_cc, mask, value); +#endif + } + return -EINVAL; +} + +static inline u32 gpio_setintmask(u32 mask, u32 value) +{ + switch (bcm47xx_bus_type) { +#ifdef CONFIG_BCM47XX_SSB + case BCM47XX_BUS_TYPE_SSB: + return ssb_gpio_intmask(&bcm47xx_bus.ssb, mask, value); +#endif +#ifdef CONFIG_BCM47XX_BCMA + case BCM47XX_BUS_TYPE_BCMA: + return bcma_chipco_gpio_intmask(&bcm47xx_bus.bcma.bus.drv_cc, mask, value); +#endif + } + return -EINVAL; +} -#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,0,0) -#define ssb_bcm47xx bcm47xx_bus.ssb +static inline u32 gpio_intpolarity(u32 mask, u32 value) +{ + switch (bcm47xx_bus_type) { +#ifdef CONFIG_BCM47XX_SSB + case BCM47XX_BUS_TYPE_SSB: + return ssb_gpio_polarity(&bcm47xx_bus.ssb, mask, value); #endif +#ifdef CONFIG_BCM47XX_BCMA + case BCM47XX_BUS_TYPE_BCMA: + return bcma_chipco_gpio_polarity(&bcm47xx_bus.bcma.bus.drv_cc, mask, value); +#endif + } + return -EINVAL; +} +#ifdef CONFIG_BCM47XX_SSB static inline u32 __ssb_write32_masked(struct ssb_device *dev, u16 offset, u32 mask, u32 value) { @@ -16,6 +107,18 @@ static inline u32 __ssb_write32_masked(struct ssb_device *dev, u16 offset, ssb_write32(dev, offset, value); return value; } +#endif + +#ifdef CONFIG_BCM47XX_BCMA +static inline u32 __bcma_write32_masked(struct bcma_device *dev, u16 offset, + u32 mask, u32 value) +{ + value &= mask; + value |= bcma_read32(dev, offset) & ~mask; + bcma_write32(dev, offset, value); + return value; +} +#endif static void gpio_set_irqenable(int enabled, irqreturn_t (*handler)(int, void *)) { @@ -31,8 +134,18 @@ static void gpio_set_irqenable(int enabled, irqreturn_t (*handler)(int, void *)) free_irq(irq, handler); } - 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)); + switch (bcm47xx_bus_type) { +#ifdef CONFIG_BCM47XX_SSB + case BCM47XX_BUS_TYPE_SSB: + if (bcm47xx_bus.ssb.chipco.dev) + __ssb_write32_masked(bcm47xx_bus.ssb.chipco.dev, SSB_CHIPCO_IRQMASK, SSB_CHIPCO_IRQ_GPIO, (enabled ? SSB_CHIPCO_IRQ_GPIO : 0)); +#endif +#ifdef CONFIG_BCM47XX_BCMA + case BCM47XX_BUS_TYPE_BCMA: + if (bcm47xx_bus.bcma.bus.drv_cc.core) + __bcma_write32_masked(bcm47xx_bus.bcma.bus.drv_cc.core, BCMA_CC_IRQMASK, BCMA_CC_IRQ_GPIO, (enabled ? BCMA_CC_IRQ_GPIO : 0)); +#endif + } } #define EXTIF_ADDR 0x1f000000 |