From c7a59f885d9372e0a8695f6906587a2fa0931e20 Mon Sep 17 00:00:00 2001 From: nbd Date: Wed, 14 Mar 2007 01:19:24 +0000 Subject: add diag and switch support for brcm47xx-2.6 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6562 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/switch/src/gpio-bcm947xx.h | 86 ++++++++++++++++++++++++++++++++++++++ package/switch/src/gpio.h | 41 ++---------------- package/switch/src/switch-adm.c | 34 +++++++-------- 3 files changed, 106 insertions(+), 55 deletions(-) create mode 100644 package/switch/src/gpio-bcm947xx.h (limited to 'package/switch/src') diff --git a/package/switch/src/gpio-bcm947xx.h b/package/switch/src/gpio-bcm947xx.h new file mode 100644 index 0000000000..384ea3ea18 --- /dev/null +++ b/package/switch/src/gpio-bcm947xx.h @@ -0,0 +1,86 @@ +#ifndef __SWITCH_GPIO_H +#define __SWITCH_GPIO_H +#include + +#ifndef BCMDRIVER +#include +#include +#include + +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); +} + +#else + +#include +#include +#include +#include +#include +#include +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) +#include +#else +#include +#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_intmask(mask, value) sb_gpiointmask(sbh, mask, value, GPIO_DRV_PRIORITY) +#define gpio_intpolarity(mask, value) sb_gpiointpolarity(sbh, mask, value, GPIO_DRV_PRIORITY) + +#endif /* BCMDRIVER */ +#endif /* __SWITCH_GPIO_H */ diff --git a/package/switch/src/gpio.h b/package/switch/src/gpio.h index 800ae25a9f..f4fadfc640 100644 --- a/package/switch/src/gpio.h +++ b/package/switch/src/gpio.h @@ -8,45 +8,10 @@ #ifndef __GPIO_H #define __GPIO_H -#if defined(BCMGPIO2) - -#ifdef LINUX_2_4 -#define sbh bcm947xx_sbh -extern void *bcm947xx_sbh; -#else -extern void *sbh; -#endif - -extern __u32 sb_gpioin(void *sbh); -extern __u32 sb_gpiointpolarity(void *sbh, __u32 mask, __u32 val, __u8 prio); -extern __u32 sb_gpiointmask(void *sbh, __u32 mask, __u32 val, __u8 prio); -extern __u32 sb_gpioouten(void *sbh, __u32 mask, __u32 val, __u8 prio); -extern __u32 sb_gpioout(void *sbh, __u32 mask, __u32 val, __u8 prio); - -#define gpioin() sb_gpioin(sbh) -#define gpiointpolarity(mask,val) sb_gpiointpolarity(sbh, mask, val, 0) -#define gpiointmask(mask,val) sb_gpiointmask(sbh, mask, val, 0) -#define gpioouten(mask,val) sb_gpioouten(sbh, mask, val, 0) -#define gpioout(mask,val) sb_gpioout(sbh, mask, val, 0) - -#elif defined(BCMGPIO) - -#define sbh bcm947xx_sbh -extern void *bcm947xx_sbh; -extern __u32 sb_gpioin(void *sbh); -extern __u32 sb_gpiointpolarity(void *sbh, __u32 mask, __u32 val); -extern __u32 sb_gpiointmask(void *sbh, __u32 mask, __u32 val); -extern __u32 sb_gpioouten(void *sbh, __u32 mask, __u32 val); -extern __u32 sb_gpioout(void *sbh, __u32 mask, __u32 val); - -#define gpioin() sb_gpioin(sbh) -#define gpiointpolarity(mask,val) sb_gpiointpolarity(sbh, mask, val) -#define gpiointmask(mask,val) sb_gpiointmask(sbh, mask, val) -#define gpioouten(mask,val) sb_gpioouten(sbh, mask, val) -#define gpioout(mask,val) sb_gpioout(sbh, mask, val) - +#ifdef BROADCOM +#include "gpio-bcm947xx.h" #else -#error Unsupported/unknown GPIO configuration +#error "Unsupported configuration." #endif #endif /* __GPIO_H */ diff --git a/package/switch/src/switch-adm.c b/package/switch/src/switch-adm.c index 85805f6b3a..8d96316b7c 100644 --- a/package/switch/src/switch-adm.c +++ b/package/switch/src/switch-adm.c @@ -109,7 +109,7 @@ static void adm_write(int cs, char *buf, unsigned int bits) int i, len = (bits + 7) / 8; __u8 mask; - gpioout(eecs, (cs ? eecs : 0)); + gpio_out(eecs, (cs ? eecs : 0)); udelay(EECK_EDGE_TIME); /* Byte assemble from MSB to LSB */ @@ -117,25 +117,25 @@ static void adm_write(int cs, char *buf, unsigned int bits) /* Bit bang from MSB to LSB */ for (mask = 0x80; mask && bits > 0; mask >>= 1, bits --) { /* Clock low */ - gpioout(eesk, 0); + gpio_out(eesk, 0); udelay(EECK_EDGE_TIME); /* Output on rising edge */ - gpioout(eedi, ((mask & buf[i]) ? eedi : 0)); + gpio_out(eedi, ((mask & buf[i]) ? eedi : 0)); udelay(EEDI_SETUP_TIME); /* Clock high */ - gpioout(eesk, eesk); + gpio_out(eesk, eesk); udelay(EECK_EDGE_TIME); } } /* Clock low */ - gpioout(eesk, 0); + gpio_out(eesk, 0); udelay(EECK_EDGE_TIME); if (cs) - gpioout(eecs, 0); + gpio_out(eecs, 0); } @@ -144,7 +144,7 @@ static void adm_read(int cs, char *buf, unsigned int bits) int i, len = (bits + 7) / 8; __u8 mask; - gpioout(eecs, (cs ? eecs : 0)); + gpio_out(eecs, (cs ? eecs : 0)); udelay(EECK_EDGE_TIME); /* Byte assemble from MSB to LSB */ @@ -156,16 +156,16 @@ static void adm_read(int cs, char *buf, unsigned int bits) __u8 gp; /* Clock low */ - gpioout(eesk, 0); + gpio_out(eesk, 0); udelay(EECK_EDGE_TIME); /* Input on rising edge */ - gp = gpioin(); + gp = gpio_in(); if (gp & eedi) byte |= mask; /* Clock high */ - gpioout(eesk, eesk); + gpio_out(eesk, eesk); udelay(EECK_EDGE_TIME); } @@ -173,11 +173,11 @@ static void adm_read(int cs, char *buf, unsigned int bits) } /* Clock low */ - gpioout(eesk, 0); + gpio_out(eesk, 0); udelay(EECK_EDGE_TIME); if (cs) - gpioout(eecs, 0); + gpio_out(eecs, 0); } @@ -185,10 +185,10 @@ static void adm_read(int cs, char *buf, unsigned int bits) static void adm_enout(__u8 pins, __u8 val) { /* Prepare GPIO output value */ - gpioout(pins, val); + gpio_out(pins, val); /* Enable GPIO outputs */ - gpioouten(pins, pins); + gpio_outen(pins, pins); udelay(EECK_EDGE_TIME); } @@ -197,7 +197,7 @@ static void adm_enout(__u8 pins, __u8 val) static void adm_disout(__u8 pins) { /* Disable GPIO outputs */ - gpioouten(pins, 0); + gpio_outen(pins, 0); udelay(EECK_EDGE_TIME); } @@ -208,11 +208,11 @@ static void adm_adclk(int clocks) int i; for (i = 0; i < clocks; i++) { /* Clock high */ - gpioout(eesk, eesk); + gpio_out(eesk, eesk); udelay(EECK_EDGE_TIME); /* Clock low */ - gpioout(eesk, 0); + gpio_out(eesk, 0); udelay(EECK_EDGE_TIME); } } -- cgit v1.2.3