diff options
Diffstat (limited to 'target/linux/brcm47xx/patches-2.6.25/001-ssb-fix-gpio-api.patch')
-rw-r--r-- | target/linux/brcm47xx/patches-2.6.25/001-ssb-fix-gpio-api.patch | 160 |
1 files changed, 0 insertions, 160 deletions
diff --git a/target/linux/brcm47xx/patches-2.6.25/001-ssb-fix-gpio-api.patch b/target/linux/brcm47xx/patches-2.6.25/001-ssb-fix-gpio-api.patch deleted file mode 100644 index f8d454f5a4..0000000000 --- a/target/linux/brcm47xx/patches-2.6.25/001-ssb-fix-gpio-api.patch +++ /dev/null @@ -1,160 +0,0 @@ -Index: linux-2.6.23.16/drivers/ssb/driver_chipcommon.c -=================================================================== ---- linux-2.6.23.16.orig/drivers/ssb/driver_chipcommon.c 2008-02-19 14:37:06.000000000 +0100 -+++ linux-2.6.23.16/drivers/ssb/driver_chipcommon.c 2008-02-19 14:37:08.000000000 +0100 -@@ -39,12 +39,14 @@ static inline void chipco_write32(struct - ssb_write32(cc->dev, offset, value); - } - --static inline void chipco_write32_masked(struct ssb_chipcommon *cc, u16 offset, -- u32 mask, u32 value) -+static inline u32 chipco_write32_masked(struct ssb_chipcommon *cc, u16 offset, -+ u32 mask, u32 value) - { - value &= mask; - value |= chipco_read32(cc, offset) & ~mask; - chipco_write32(cc, offset, value); -+ -+ return value; - } - - void ssb_chipco_set_clockmode(struct ssb_chipcommon *cc, -@@ -355,16 +357,37 @@ u32 ssb_chipco_gpio_in(struct ssb_chipco - { - return chipco_read32(cc, SSB_CHIPCO_GPIOIN) & mask; - } -+EXPORT_SYMBOL(ssb_chipco_gpio_in); -+ -+u32 ssb_chipco_gpio_out(struct ssb_chipcommon *cc, u32 mask, u32 value) -+{ -+ return chipco_write32_masked(cc, SSB_CHIPCO_GPIOOUT, mask, value); -+} -+EXPORT_SYMBOL(ssb_chipco_gpio_out); -+ -+u32 ssb_chipco_gpio_outen(struct ssb_chipcommon *cc, u32 mask, u32 value) -+{ -+ return chipco_write32_masked(cc, SSB_CHIPCO_GPIOOUTEN, mask, value); -+} -+EXPORT_SYMBOL(ssb_chipco_gpio_outen); -+ -+u32 ssb_chipco_gpio_control(struct ssb_chipcommon *cc, u32 mask, u32 value) -+{ -+ return chipco_write32_masked(cc, SSB_CHIPCO_GPIOCTL, mask, value); -+} -+EXPORT_SYMBOL(ssb_chipco_gpio_control); - --void ssb_chipco_gpio_out(struct ssb_chipcommon *cc, u32 mask, u32 value) -+u32 ssb_chipco_gpio_intmask(struct ssb_chipcommon *cc, u32 mask, u32 value) - { -- chipco_write32_masked(cc, SSB_CHIPCO_GPIOOUT, mask, value); -+ return chipco_write32_masked(cc, SSB_CHIPCO_GPIOIRQ, mask, value); - } -+EXPORT_SYMBOL(ssb_chipco_gpio_intmask); - --void ssb_chipco_gpio_outen(struct ssb_chipcommon *cc, u32 mask, u32 value) -+u32 ssb_chipco_gpio_polarity(struct ssb_chipcommon *cc, u32 mask, u32 value) - { -- chipco_write32_masked(cc, SSB_CHIPCO_GPIOOUTEN, mask, value); -+ return chipco_write32_masked(cc, SSB_CHIPCO_GPIOPOL, mask, value); - } -+EXPORT_SYMBOL(ssb_chipco_gpio_polarity); - - #ifdef CONFIG_SSB_SERIAL - int ssb_chipco_serial_init(struct ssb_chipcommon *cc, -Index: linux-2.6.23.16/drivers/ssb/driver_extif.c -=================================================================== ---- linux-2.6.23.16.orig/drivers/ssb/driver_extif.c 2008-02-19 14:37:06.000000000 +0100 -+++ linux-2.6.23.16/drivers/ssb/driver_extif.c 2008-02-19 14:37:08.000000000 +0100 -@@ -27,12 +27,14 @@ static inline void extif_write32(struct - ssb_write32(extif->dev, offset, value); - } - --static inline void extif_write32_masked(struct ssb_extif *extif, u16 offset, -- u32 mask, u32 value) -+static inline u32 extif_write32_masked(struct ssb_extif *extif, u16 offset, -+ u32 mask, u32 value) - { - value &= mask; - value |= extif_read32(extif, offset) & ~mask; - extif_write32(extif, offset, value); -+ -+ return value; - } - - #ifdef CONFIG_SSB_SERIAL -@@ -114,16 +116,30 @@ u32 ssb_extif_gpio_in(struct ssb_extif * - { - return extif_read32(extif, SSB_EXTIF_GPIO_IN) & mask; - } -+EXPORT_SYMBOL(ssb_extif_gpio_in); - --void ssb_extif_gpio_out(struct ssb_extif *extif, u32 mask, u32 value) -+u32 ssb_extif_gpio_out(struct ssb_extif *extif, u32 mask, u32 value) - { - return extif_write32_masked(extif, SSB_EXTIF_GPIO_OUT(0), - mask, value); - } -+EXPORT_SYMBOL(ssb_extif_gpio_out); - --void ssb_extif_gpio_outen(struct ssb_extif *extif, u32 mask, u32 value) -+u32 ssb_extif_gpio_outen(struct ssb_extif *extif, u32 mask, u32 value) - { - return extif_write32_masked(extif, SSB_EXTIF_GPIO_OUTEN(0), - mask, value); - } -+EXPORT_SYMBOL(ssb_extif_gpio_outen); -+ -+u32 ssb_extif_gpio_polarity(struct ssb_extif *extif, u32 mask, u32 value) -+{ -+ return extif_write32_masked(extif, SSB_EXTIF_GPIO_INTPOL, mask, value); -+} -+EXPORT_SYMBOL(ssb_extif_gpio_polarity); - -+u32 ssb_extif_gpio_intmask(struct ssb_extif *extif, u32 mask, u32 value) -+{ -+ return extif_write32_masked(extif, SSB_EXTIF_GPIO_INTMASK, mask, value); -+} -+EXPORT_SYMBOL(ssb_extif_gpio_intmask); -Index: linux-2.6.23.16/include/linux/ssb/ssb_driver_chipcommon.h -=================================================================== ---- linux-2.6.23.16.orig/include/linux/ssb/ssb_driver_chipcommon.h 2008-02-19 14:37:06.000000000 +0100 -+++ linux-2.6.23.16/include/linux/ssb/ssb_driver_chipcommon.h 2008-02-19 14:37:08.000000000 +0100 -@@ -382,11 +382,13 @@ extern void ssb_chipco_set_clockmode(str - extern void ssb_chipco_watchdog_timer_set(struct ssb_chipcommon *cc, - u32 ticks); - -+/* Chipcommon GPIO pin access. */ - u32 ssb_chipco_gpio_in(struct ssb_chipcommon *cc, u32 mask); -- --void ssb_chipco_gpio_out(struct ssb_chipcommon *cc, u32 mask, u32 value); -- --void ssb_chipco_gpio_outen(struct ssb_chipcommon *cc, u32 mask, u32 value); -+u32 ssb_chipco_gpio_out(struct ssb_chipcommon *cc, u32 mask, u32 value); -+u32 ssb_chipco_gpio_outen(struct ssb_chipcommon *cc, u32 mask, u32 value); -+u32 ssb_chipco_gpio_control(struct ssb_chipcommon *cc, u32 mask, u32 value); -+u32 ssb_chipco_gpio_intmask(struct ssb_chipcommon *cc, u32 mask, u32 value); -+u32 ssb_chipco_gpio_polarity(struct ssb_chipcommon *cc, u32 mask, u32 value); - - #ifdef CONFIG_SSB_SERIAL - extern int ssb_chipco_serial_init(struct ssb_chipcommon *cc, -Index: linux-2.6.23.16/include/linux/ssb/ssb_driver_extif.h -=================================================================== ---- linux-2.6.23.16.orig/include/linux/ssb/ssb_driver_extif.h 2008-02-19 14:37:06.000000000 +0100 -+++ linux-2.6.23.16/include/linux/ssb/ssb_driver_extif.h 2008-02-19 14:37:08.000000000 +0100 -@@ -171,11 +171,12 @@ extern void ssb_extif_get_clockcontrol(s - extern void ssb_extif_timing_init(struct ssb_extif *extif, - unsigned long ns); - -+/* Extif GPIO pin access */ - u32 ssb_extif_gpio_in(struct ssb_extif *extif, u32 mask); -- --void ssb_extif_gpio_out(struct ssb_extif *extif, u32 mask, u32 value); -- --void ssb_extif_gpio_outen(struct ssb_extif *extif, u32 mask, u32 value); -+u32 ssb_extif_gpio_out(struct ssb_extif *extif, u32 mask, u32 value); -+u32 ssb_extif_gpio_outen(struct ssb_extif *extif, u32 mask, u32 value); -+u32 ssb_extif_gpio_polarity(struct ssb_extif *extif, u32 mask, u32 value); -+u32 ssb_extif_gpio_intmask(struct ssb_extif *extif, u32 mask, u32 value); - - #ifdef CONFIG_SSB_SERIAL - extern int ssb_extif_serial_init(struct ssb_extif *extif, |