Commit 4e1d0924 authored by Takashi Iwai's avatar Takashi Iwai

platform/x86: thinkpad_acpi: Add audio mute LED classdev support

In the upcoming change, the binding of audio mute / mic-mute LED
controls will be switched with LED trigger.  This patch is the last
piece of preparation: adding the audio mute / mic-mute LED class
devices to thinkpad_acpi driver.

Two devices, platform::mute and platform::micmute, will be added for
controlling the mute LED and mic-mute LED, respectively.  The new
prefix "platform" is the suggestion by upstream for indicating the
generic laptop attribute.

Also this selects CONFIG_LEDS_TRIGGERS and CONFIG_LEDS_TRIGGERS_AUDIO
unconditionally.  Strictly speaking, these aren't 100% mandatory, but
leaving these manual selections would lead to a functional regression
easily once after converting from the dynamic symbol binding to the
LEDs trigger in a later patch.
Acked-by: default avatarJacek Anaszewski <jacek.anaszewski@gmail.com>
Acked-by: default avatarPavel Machek <pavel@ucw.cz>
Acked-by: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
Acked-by: default avatarHenrique de Moraes Holschuh <hmh@hmh.eng.br>
Acked-by: default avatarPali Rohár <pali.rohar@gmail.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent d00fa46e
...@@ -495,6 +495,8 @@ config THINKPAD_ACPI ...@@ -495,6 +495,8 @@ config THINKPAD_ACPI
select NVRAM select NVRAM
select NEW_LEDS select NEW_LEDS
select LEDS_CLASS select LEDS_CLASS
select LEDS_TRIGGERS
select LEDS_TRIGGER_AUDIO
---help--- ---help---
This is a driver for the IBM and Lenovo ThinkPad laptops. It adds This is a driver for the IBM and Lenovo ThinkPad laptops. It adds
support for Fn-Fx key combinations, Bluetooth control, video support for Fn-Fx key combinations, Bluetooth control, video
......
...@@ -9203,17 +9203,58 @@ int tpacpi_led_set(int whichled, bool on) ...@@ -9203,17 +9203,58 @@ int tpacpi_led_set(int whichled, bool on)
} }
EXPORT_SYMBOL_GPL(tpacpi_led_set); EXPORT_SYMBOL_GPL(tpacpi_led_set);
static int tpacpi_led_mute_set(struct led_classdev *led_cdev,
enum led_brightness brightness)
{
return tpacpi_led_set(TPACPI_LED_MUTE, brightness != LED_OFF);
}
static int tpacpi_led_micmute_set(struct led_classdev *led_cdev,
enum led_brightness brightness)
{
return tpacpi_led_set(TPACPI_LED_MICMUTE, brightness != LED_OFF);
}
static struct led_classdev mute_led_cdev[] = {
[TPACPI_LED_MUTE] = {
.name = "platform::mute",
.max_brightness = 1,
.brightness_set_blocking = tpacpi_led_mute_set,
.default_trigger = "audio-mute",
},
[TPACPI_LED_MICMUTE] = {
.name = "platform::micmute",
.max_brightness = 1,
.brightness_set_blocking = tpacpi_led_micmute_set,
.default_trigger = "audio-micmute",
},
};
static int mute_led_init(struct ibm_init_struct *iibm) static int mute_led_init(struct ibm_init_struct *iibm)
{ {
static enum led_audio types[] = {
[TPACPI_LED_MUTE] = LED_AUDIO_MUTE,
[TPACPI_LED_MICMUTE] = LED_AUDIO_MICMUTE,
};
acpi_handle temp; acpi_handle temp;
int i; int i, err;
for (i = 0; i < TPACPI_LED_MAX; i++) { for (i = 0; i < TPACPI_LED_MAX; i++) {
struct tp_led_table *t = &led_tables[i]; struct tp_led_table *t = &led_tables[i];
if (ACPI_SUCCESS(acpi_get_handle(hkey_handle, t->name, &temp))) if (ACPI_FAILURE(acpi_get_handle(hkey_handle, t->name, &temp))) {
mute_led_on_off(t, false);
else
t->state = -ENODEV; t->state = -ENODEV;
continue;
}
mute_led_cdev[i].brightness = ledtrig_audio_get(types[i]);
err = led_classdev_register(&tpacpi_pdev->dev, &mute_led_cdev[i]);
if (err < 0) {
while (i--) {
if (led_tables[i].state >= 0)
led_classdev_unregister(&mute_led_cdev[i]);
}
return err;
}
} }
return 0; return 0;
} }
...@@ -9222,8 +9263,12 @@ static void mute_led_exit(void) ...@@ -9222,8 +9263,12 @@ static void mute_led_exit(void)
{ {
int i; int i;
for (i = 0; i < TPACPI_LED_MAX; i++) for (i = 0; i < TPACPI_LED_MAX; i++) {
tpacpi_led_set(i, false); if (led_tables[i].state >= 0) {
led_classdev_unregister(&mute_led_cdev[i]);
tpacpi_led_set(i, false);
}
}
} }
static void mute_led_resume(void) static void mute_led_resume(void)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment