Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-23 03:11:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

rt2x00: Enable WLAN LED on Ralink SoC (rt305x) devices

Browse Source 
This patch adds WLAN LED support to the mac80211 rt2x00 driver for
Ralink SoC (rt305x) devices.  The current WLAN LED drivers in
rt2800lib.c set the LED brightness via an MCU request, but do nothing
for SoC.  This patch checks for SoC and sets the register to enable the
WLAN LED (instead of an MCU request).  This enables the WLAN LED for
RT305x devices.

Signed-off-by: Layne Edwards <ledwards@astrumtech.net>
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Layne Edwards 2011-04-18 15:26:00 +02:00 committed by John W. Linville
parent 93ae2dd223
commit 44704e5d7d
1 changed files with 42 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
drivers/net/wireless/rt2x00/rt2800lib.c
View File

@ -949,25 +949,49 @@ static void rt2800_brightness_set(struct led_classdev *led_cdev,
unsigned int ledmode = unsigned int ledmode =
rt2x00_get_field16(led->rt2x00dev->led_mcu_reg, rt2x00_get_field16(led->rt2x00dev->led_mcu_reg,
EEPROM_FREQ_LED_MODE); EEPROM_FREQ_LED_MODE);
u32 reg;
if (led->type == LED_TYPE_RADIO) { /* Check for SoC (SOC devices don't support MCU requests) */
rt2800_mcu_request(led->rt2x00dev, MCU_LED, 0xff, ledmode, if (rt2x00_is_soc(led->rt2x00dev)) {
enabled ? 0x20 : 0); rt2800_register_read(led->rt2x00dev, LED_CFG, &reg);
} else if (led->type == LED_TYPE_ASSOC) {
rt2800_mcu_request(led->rt2x00dev, MCU_LED, 0xff, ledmode, /* Set LED Polarity */
enabled ? (bg_mode ? 0x60 : 0xa0) : 0x20); rt2x00_set_field32(&reg, LED_CFG_LED_POLAR, polarity);
} else if (led->type == LED_TYPE_QUALITY) {
/* /* Set LED Mode */
* The brightness is divided into 6 levels (0 - 5), if (led->type == LED_TYPE_RADIO) {
* The specs tell us the following levels: rt2x00_set_field32(&reg, LED_CFG_G_LED_MODE,
* 0, 1 ,3, 7, 15, 31 enabled ? 3 : 0);
* to determine the level in a simple way we can simply } else if (led->type == LED_TYPE_ASSOC) {
* work with bitshifting: rt2x00_set_field32(&reg, LED_CFG_Y_LED_MODE,
* (1 << level) - 1 enabled ? 3 : 0);
*/ } else if (led->type == LED_TYPE_QUALITY) {
rt2800_mcu_request(led->rt2x00dev, MCU_LED_STRENGTH, 0xff, rt2x00_set_field32(&reg, LED_CFG_R_LED_MODE,
(1 << brightness / (LED_FULL / 6)) - 1, enabled ? 3 : 0);
polarity); }
rt2800_register_write(led->rt2x00dev, LED_CFG, reg);
} else {
if (led->type == LED_TYPE_RADIO) {
rt2800_mcu_request(led->rt2x00dev, MCU_LED, 0xff, ledmode,
enabled ? 0x20 : 0);
} else if (led->type == LED_TYPE_ASSOC) {
rt2800_mcu_request(led->rt2x00dev, MCU_LED, 0xff, ledmode,
enabled ? (bg_mode ? 0x60 : 0xa0) : 0x20);
} else if (led->type == LED_TYPE_QUALITY) {
/*
* The brightness is divided into 6 levels (0 - 5),
* The specs tell us the following levels:
* 0, 1 ,3, 7, 15, 31
* to determine the level in a simple way we can simply
* work with bitshifting:
* (1 << level) - 1
*/
rt2800_mcu_request(led->rt2x00dev, MCU_LED_STRENGTH, 0xff,
(1 << brightness / (LED_FULL / 6)) - 1,
polarity);
}
} }
} }