summaryrefslogtreecommitdiff
path: root/target/linux/brcm47xx/patches-2.6.23/621-ssb-common-gpio-api.patch
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/brcm47xx/patches-2.6.23/621-ssb-common-gpio-api.patch')
-rw-r--r--target/linux/brcm47xx/patches-2.6.23/621-ssb-common-gpio-api.patch36
1 files changed, 18 insertions, 18 deletions
diff --git a/target/linux/brcm47xx/patches-2.6.23/621-ssb-common-gpio-api.patch b/target/linux/brcm47xx/patches-2.6.23/621-ssb-common-gpio-api.patch
index d1debcfe3a..5b96c29952 100644
--- a/target/linux/brcm47xx/patches-2.6.23/621-ssb-common-gpio-api.patch
+++ b/target/linux/brcm47xx/patches-2.6.23/621-ssb-common-gpio-api.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.23.16/drivers/ssb/driver_chipcommon.c
+Index: linux-2.6.23.17/drivers/ssb/driver_chipcommon.c
===================================================================
---- linux-2.6.23.16.orig/drivers/ssb/driver_chipcommon.c 2008-02-19 15:50:42.000000000 +0100
-+++ linux-2.6.23.16/drivers/ssb/driver_chipcommon.c 2008-02-19 15:50:44.000000000 +0100
+--- linux-2.6.23.17.orig/drivers/ssb/driver_chipcommon.c
++++ linux-2.6.23.17/drivers/ssb/driver_chipcommon.c
@@ -361,37 +361,31 @@ u32 ssb_chipco_gpio_in(struct ssb_chipco
{
return chipco_read32(cc, SSB_CHIPCO_GPIOIN) & mask;
@@ -40,10 +40,10 @@ Index: linux-2.6.23.16/drivers/ssb/driver_chipcommon.c
#ifdef CONFIG_SSB_SERIAL
int ssb_chipco_serial_init(struct ssb_chipcommon *cc,
-Index: linux-2.6.23.16/drivers/ssb/driver_extif.c
+Index: linux-2.6.23.17/drivers/ssb/driver_extif.c
===================================================================
---- linux-2.6.23.16.orig/drivers/ssb/driver_extif.c 2008-02-19 15:50:42.000000000 +0100
-+++ linux-2.6.23.16/drivers/ssb/driver_extif.c 2008-02-19 15:50:44.000000000 +0100
+--- linux-2.6.23.17.orig/drivers/ssb/driver_extif.c
++++ linux-2.6.23.17/drivers/ssb/driver_extif.c
@@ -122,30 +122,25 @@ u32 ssb_extif_gpio_in(struct ssb_extif *
{
return extif_read32(extif, SSB_EXTIF_GPIO_IN) & mask;
@@ -75,10 +75,10 @@ Index: linux-2.6.23.16/drivers/ssb/driver_extif.c
return extif_write32_masked(extif, SSB_EXTIF_GPIO_INTMASK, mask, value);
}
-EXPORT_SYMBOL(ssb_extif_gpio_intmask);
-Index: linux-2.6.23.16/drivers/ssb/embedded.c
+Index: linux-2.6.23.17/drivers/ssb/embedded.c
===================================================================
---- linux-2.6.23.16.orig/drivers/ssb/embedded.c 2008-02-19 15:50:42.000000000 +0100
-+++ linux-2.6.23.16/drivers/ssb/embedded.c 2008-02-19 15:51:01.000000000 +0100
+--- linux-2.6.23.17.orig/drivers/ssb/embedded.c
++++ linux-2.6.23.17/drivers/ssb/embedded.c
@@ -11,6 +11,8 @@
#include <linux/ssb/ssb.h>
#include <linux/ssb/ssb_embedded.h>
@@ -196,10 +196,10 @@ Index: linux-2.6.23.16/drivers/ssb/embedded.c
+ return res;
+}
+EXPORT_SYMBOL(ssb_gpio_polarity);
-Index: linux-2.6.23.16/include/linux/ssb/ssb.h
+Index: linux-2.6.23.17/include/linux/ssb/ssb.h
===================================================================
---- linux-2.6.23.16.orig/include/linux/ssb/ssb.h 2008-02-19 15:50:42.000000000 +0100
-+++ linux-2.6.23.16/include/linux/ssb/ssb.h 2008-02-19 15:50:44.000000000 +0100
+--- linux-2.6.23.17.orig/include/linux/ssb/ssb.h
++++ linux-2.6.23.17/include/linux/ssb/ssb.h
@@ -283,6 +283,11 @@ struct ssb_bus {
/* Contents of the SPROM. */
struct ssb_sprom sprom;
@@ -212,10 +212,10 @@ Index: linux-2.6.23.16/include/linux/ssb/ssb.h
/* Internal-only stuff follows. Do not touch. */
struct list_head list;
#ifdef CONFIG_SSB_DEBUG
-Index: linux-2.6.23.16/include/linux/ssb/ssb_embedded.h
+Index: linux-2.6.23.17/include/linux/ssb/ssb_embedded.h
===================================================================
---- linux-2.6.23.16.orig/include/linux/ssb/ssb_embedded.h 2008-02-19 15:50:42.000000000 +0100
-+++ linux-2.6.23.16/include/linux/ssb/ssb_embedded.h 2008-02-19 15:50:44.000000000 +0100
+--- linux-2.6.23.17.orig/include/linux/ssb/ssb_embedded.h
++++ linux-2.6.23.17/include/linux/ssb/ssb_embedded.h
@@ -7,4 +7,12 @@
extern int ssb_watchdog_timer_set(struct ssb_bus *bus, u32 ticks);
@@ -229,10 +229,10 @@ Index: linux-2.6.23.16/include/linux/ssb/ssb_embedded.h
+u32 ssb_gpio_polarity(struct ssb_bus *bus, u32 mask, u32 value);
+
#endif /* LINUX_SSB_EMBEDDED_H_ */
-Index: linux-2.6.23.16/drivers/ssb/main.c
+Index: linux-2.6.23.17/drivers/ssb/main.c
===================================================================
---- linux-2.6.23.16.orig/drivers/ssb/main.c 2008-02-19 15:50:42.000000000 +0100
-+++ linux-2.6.23.16/drivers/ssb/main.c 2008-02-19 15:50:44.000000000 +0100
+--- linux-2.6.23.17.orig/drivers/ssb/main.c
++++ linux-2.6.23.17/drivers/ssb/main.c
@@ -571,6 +571,9 @@ static int ssb_bus_register(struct ssb_b
spin_lock_init(&bus->bar_lock);