X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=package%2Fmac80211%2Fpatches%2F800-b43-gpio-mask-module-option.patch;h=fc874ad0497232a20d7e424a605db7d2b98fb414;hp=eebda2ad6c6213ac01462cb156aaab0b5e9e6a6f;hb=0376d94b7ab39043a5039685b992e7873d3c617a;hpb=38f6e84016818b615ac6e30bd687cc4f7b404357;ds=sidebyside

diff --git a/package/mac80211/patches/800-b43-gpio-mask-module-option.patch b/package/mac80211/patches/800-b43-gpio-mask-module-option.patch
index eebda2ad6c..fc874ad049 100644
--- a/package/mac80211/patches/800-b43-gpio-mask-module-option.patch
+++ b/package/mac80211/patches/800-b43-gpio-mask-module-option.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/b43/b43.h
 +++ b/drivers/net/wireless/b43/b43.h
-@@ -718,6 +718,7 @@ struct b43_wldev {
+@@ -820,6 +820,7 @@ struct b43_wldev {
  	bool qos_enabled;		/* TRUE, if QoS is used. */
  	bool hwcrypto_enabled;		/* TRUE, if HW crypto acceleration is enabled. */
  	bool use_pio;			/* TRUE if next init should use PIO */
@@ -10,7 +10,7 @@
  	struct b43_phy phy;
 --- a/drivers/net/wireless/b43/main.c
 +++ b/drivers/net/wireless/b43/main.c
-@@ -75,6 +75,11 @@ MODULE_FIRMWARE("b43/ucode15.fw");
+@@ -76,6 +76,11 @@ MODULE_FIRMWARE("b43/ucode16_mimo.fw");
  MODULE_FIRMWARE("b43/ucode5.fw");
  MODULE_FIRMWARE("b43/ucode9.fw");
  
@@ -22,29 +22,16 @@
  static int modparam_bad_frames_preempt;
  module_param_named(bad_frames_preempt, modparam_bad_frames_preempt, int, 0444);
  MODULE_PARM_DESC(bad_frames_preempt,
-@@ -2542,10 +2547,10 @@ static int b43_gpio_init(struct b43_wlde
- 		    & ~B43_MACCTL_GPOUTSMSK);
+@@ -2747,10 +2752,10 @@ static int b43_gpio_init(struct b43_wlde
+ 	u32 mask, set;
  
- 	b43_write16(dev, B43_MMIO_GPIO_MASK, b43_read16(dev, B43_MMIO_GPIO_MASK)
--		    | 0x000F);
-+		    | modparam_gpiomask);
+ 	b43_maskset32(dev, B43_MMIO_MACCTL, ~B43_MACCTL_GPOUTSMSK, 0);
+-	b43_maskset16(dev, B43_MMIO_GPIO_MASK, ~0, 0xF);
++	b43_maskset16(dev, B43_MMIO_GPIO_MASK, ~0, modparam_gpiomask);
  
  	mask = 0x0000001F;
 -	set = 0x0000000F;
 +	set = modparam_gpiomask;
- 	if (dev->dev->bus->chip_id == 0x4301) {
+ 	if (dev->dev->chip_id == 0x4301) {
  		mask |= 0x0060;
  		set |= 0x0060;
-@@ -5102,10 +5107,10 @@ static void b43_print_driverinfo(void)
- 	feat_sdio = "S";
- #endif
- 	printk(KERN_INFO "Broadcom 43xx driver loaded "
--	       "[ Features: %s%s%s%s%s, Firmware-ID: "
-+	       "[ Features: %s%s%s%s%s, GPIO LED Mask: 0x%04x, Firmware-ID: "
- 	       B43_SUPPORTED_FIRMWARE_ID " ]\n",
- 	       feat_pci, feat_pcmcia, feat_nphy,
--	       feat_leds, feat_sdio);
-+	       feat_leds, feat_sdio, modparam_gpiomask);
- }
- 
- static int __init b43_init(void)