summaryrefslogtreecommitdiff
path: root/openwrt/target/linux/linux-2.4/patches
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-11-08 17:11:40 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-11-08 17:11:40 +0000
commite6f2e06d246df0b2c5d54e53a6f31d397fa6b7f5 (patch)
treeeac67e90a4fd66b2c9cc46393bb9f72dd0140f25 /openwrt/target/linux/linux-2.4/patches
parenteddab67494c78e80c717b1ac80d2ac7f2c495a4a (diff)
add compatibility hack for gpio stuff
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@2396 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'openwrt/target/linux/linux-2.4/patches')
-rw-r--r--openwrt/target/linux/linux-2.4/patches/brcm/001-bcm47xx.patch18
1 files changed, 16 insertions, 2 deletions
diff --git a/openwrt/target/linux/linux-2.4/patches/brcm/001-bcm47xx.patch b/openwrt/target/linux/linux-2.4/patches/brcm/001-bcm47xx.patch
index 7a61637022..9fb53d0879 100644
--- a/openwrt/target/linux/linux-2.4/patches/brcm/001-bcm47xx.patch
+++ b/openwrt/target/linux/linux-2.4/patches/brcm/001-bcm47xx.patch
@@ -19210,8 +19210,8 @@ diff -urN linux.old/drivers/net/hnd/linux_osl.c linux.dev/drivers/net/hnd/linux_
+#endif /* BINOSL */
diff -urN linux.old/drivers/net/hnd/sbutils.c linux.dev/drivers/net/hnd/sbutils.c
--- linux.old/drivers/net/hnd/sbutils.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/drivers/net/hnd/sbutils.c 2005-11-08 12:54:06.123274250 +0100
-@@ -0,0 +1,2823 @@
++++ linux.dev/drivers/net/hnd/sbutils.c 2005-11-08 17:58:18.918914500 +0100
+@@ -0,0 +1,2837 @@
+/*
+ * Misc utility routines for accessing chip-specific features
+ * of the SiliconBackplane-based Broadcom chips.
@@ -21068,6 +21068,8 @@ diff -urN linux.old/drivers/net/hnd/sbutils.c linux.dev/drivers/net/hnd/sbutils.
+ si = SB_INFO(sbh);
+ regoff = 0;
+
++ priority = GPIO_DRV_PRIORITY; /* compatibility hack */
++
+ /* gpios could be shared on router platforms */
+ if ((BUSTYPE(si->sb.bustype) == SB_BUS) && (val || mask)) {
+ mask = priority ? (sb_gpioreservation & mask) :
@@ -21101,6 +21103,8 @@ diff -urN linux.old/drivers/net/hnd/sbutils.c linux.dev/drivers/net/hnd/sbutils.
+ si = SB_INFO(sbh);
+ regoff = 0;
+
++ priority = GPIO_DRV_PRIORITY; /* compatibility hack */
++
+ /* gpios could be shared on router platforms */
+ if ((BUSTYPE(si->sb.bustype) == SB_BUS) && (val || mask)) {
+ mask = priority ? (sb_gpioreservation & mask) :
@@ -21135,6 +21139,8 @@ diff -urN linux.old/drivers/net/hnd/sbutils.c linux.dev/drivers/net/hnd/sbutils.
+ si = SB_INFO(sbh);
+ regoff = 0;
+
++ priority = GPIO_DRV_PRIORITY; /* compatibility hack */
++
+ /* gpios could be shared on router platforms */
+ if ((BUSTYPE(si->sb.bustype) == SB_BUS) && (val || mask)) {
+ mask = priority ? (sb_gpioreservation & mask) :
@@ -21167,6 +21173,8 @@ diff -urN linux.old/drivers/net/hnd/sbutils.c linux.dev/drivers/net/hnd/sbutils.
+
+ si = SB_INFO(sbh);
+
++ priority = GPIO_DRV_PRIORITY; /* compatibility hack */
++
+ /* only cores on SB_BUS share GPIO's and only applcation users need to reserve/release GPIO */
+ if ( (BUSTYPE(si->sb.bustype) != SB_BUS) || (!priority)) {
+ ASSERT((BUSTYPE(si->sb.bustype) == SB_BUS) && (priority));
@@ -21200,6 +21208,8 @@ diff -urN linux.old/drivers/net/hnd/sbutils.c linux.dev/drivers/net/hnd/sbutils.
+
+ si = SB_INFO(sbh);
+
++ priority = GPIO_DRV_PRIORITY; /* compatibility hack */
++
+ /* only cores on SB_BUS share GPIO's and only applcation users need to reserve/release GPIO */
+ if ( (BUSTYPE(si->sb.bustype) != SB_BUS) || (!priority)) {
+ ASSERT((BUSTYPE(si->sb.bustype) == SB_BUS) && (priority));
@@ -21258,6 +21268,8 @@ diff -urN linux.old/drivers/net/hnd/sbutils.c linux.dev/drivers/net/hnd/sbutils.
+ si = SB_INFO(sbh);
+ regoff = 0;
+
++ priority = GPIO_DRV_PRIORITY; /* compatibility hack */
++
+ /* gpios could be shared on router platforms */
+ if ((BUSTYPE(si->sb.bustype) == SB_BUS) && (val || mask)) {
+ mask = priority ? (sb_gpioreservation & mask) :
@@ -21293,6 +21305,8 @@ diff -urN linux.old/drivers/net/hnd/sbutils.c linux.dev/drivers/net/hnd/sbutils.
+ si = SB_INFO(sbh);
+ regoff = 0;
+
++ priority = GPIO_DRV_PRIORITY; /* compatibility hack */
++
+ /* gpios could be shared on router platforms */
+ if ((BUSTYPE(si->sb.bustype) == SB_BUS) && (val || mask)) {
+ mask = priority ? (sb_gpioreservation & mask) :