diff options
author | Michael Buesch <mb@bu3sch.de> | 2008-04-03 12:01:12 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-04-08 16:44:41 -0400 |
commit | 7b584163979a9fe2ebfdd57a9d64cbe27166ab70 (patch) | |
tree | dfea5d287564ecb38513f71ed21c68d54059c5bb /drivers/net/wireless/b43/main.c | |
parent | 9cfb0009dab6d6b4c5a15c5d74ab60d7a7a7371b (diff) |
b43: Add more N-PHY stuff
This adds some minor stuff for N-PHY support. Nothing special.
Adds Analog switching and some TODOs for RSSI processing.
Just a patch I had floating around for quite some time now.
Signed-off-by: Michael Buesch <mb@bu3sch.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/b43/main.c')
-rw-r--r-- | drivers/net/wireless/b43/main.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c index 355f28a2f7f5..3fb4ef816842 100644 --- a/drivers/net/wireless/b43/main.c +++ b/drivers/net/wireless/b43/main.c | |||
@@ -46,6 +46,7 @@ | |||
46 | #include "main.h" | 46 | #include "main.h" |
47 | #include "debugfs.h" | 47 | #include "debugfs.h" |
48 | #include "phy.h" | 48 | #include "phy.h" |
49 | #include "nphy.h" | ||
49 | #include "dma.h" | 50 | #include "dma.h" |
50 | #include "pio.h" | 51 | #include "pio.h" |
51 | #include "sysfs.h" | 52 | #include "sysfs.h" |
@@ -1019,7 +1020,18 @@ void b43_power_saving_ctl_bits(struct b43_wldev *dev, unsigned int ps_flags) | |||
1019 | /* Turn the Analog ON/OFF */ | 1020 | /* Turn the Analog ON/OFF */ |
1020 | static void b43_switch_analog(struct b43_wldev *dev, int on) | 1021 | static void b43_switch_analog(struct b43_wldev *dev, int on) |
1021 | { | 1022 | { |
1022 | b43_write16(dev, B43_MMIO_PHY0, on ? 0 : 0xF4); | 1023 | switch (dev->phy.type) { |
1024 | case B43_PHYTYPE_A: | ||
1025 | case B43_PHYTYPE_G: | ||
1026 | b43_write16(dev, B43_MMIO_PHY0, on ? 0 : 0xF4); | ||
1027 | break; | ||
1028 | case B43_PHYTYPE_N: | ||
1029 | b43_phy_write(dev, B43_NPHY_AFECTL_OVER, | ||
1030 | on ? 0 : 0x7FFF); | ||
1031 | break; | ||
1032 | default: | ||
1033 | B43_WARN_ON(1); | ||
1034 | } | ||
1023 | } | 1035 | } |
1024 | 1036 | ||
1025 | void b43_wireless_core_reset(struct b43_wldev *dev, u32 flags) | 1037 | void b43_wireless_core_reset(struct b43_wldev *dev, u32 flags) |