928e893a11
The removed patches were applied upstream. The type of the RT2X00_LIB_EEPROM config option was changed to bool, because boolean is an invalid value and the new kconfig system complained about this. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
38 lines
1.4 KiB
Diff
38 lines
1.4 KiB
Diff
--- a/drivers/net/wireless/broadcom/b43/b43.h
|
|
+++ b/drivers/net/wireless/broadcom/b43/b43.h
|
|
@@ -840,6 +840,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 */
|
|
+ int gpiomask; /* GPIO LED mask as a module parameter */
|
|
|
|
/* PHY/Radio device. */
|
|
struct b43_phy phy;
|
|
--- a/drivers/net/wireless/broadcom/b43/main.c
|
|
+++ b/drivers/net/wireless/broadcom/b43/main.c
|
|
@@ -72,6 +72,11 @@ MODULE_FIRMWARE("b43/ucode40.fw");
|
|
MODULE_FIRMWARE("b43/ucode42.fw");
|
|
MODULE_FIRMWARE("b43/ucode9.fw");
|
|
|
|
+static int modparam_gpiomask = 0x000F;
|
|
+module_param_named(gpiomask, modparam_gpiomask, int, 0444);
|
|
+MODULE_PARM_DESC(gpiomask,
|
|
+ "GPIO mask for LED control (default 0x000F)");
|
|
+
|
|
static int modparam_bad_frames_preempt;
|
|
module_param_named(bad_frames_preempt, modparam_bad_frames_preempt, int, 0444);
|
|
MODULE_PARM_DESC(bad_frames_preempt,
|
|
@@ -2867,10 +2872,10 @@ static int b43_gpio_init(struct b43_wlde
|
|
u32 mask, set;
|
|
|
|
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->chip_id == 0x4301) {
|
|
mask |= 0x0060;
|
|
set |= 0x0060;
|