In some new ASUS devices, hotkey Fn+F13 is used for mic mute. If mic-mute
LED is preset by checking WMI ASUS_WMI_DEVID_MICMUTE_LED, we will add a
mic-mute LED classdev, asus::micmute, in the asus-wmi driver to control
it. The binding of mic-mute LED controls will be swithched with LED
trigger.
Signed-off-by: PaddyKP_Yao <[email protected]>
---
drivers/platform/x86/Kconfig | 2 ++
drivers/platform/x86/asus-wmi.c | 26 ++++++++++++++++++++++
include/linux/platform_data/x86/asus-wmi.h | 1 +
3 files changed, 29 insertions(+)
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index f915cf67aa26..74769050b770 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -274,6 +274,8 @@ config ASUS_WMI
select INPUT_SPARSEKMAP
select LEDS_CLASS
select NEW_LEDS
+ select LEDS_TRIGGERS
+ select LEDS_TRIGGER_AUDIO
select ACPI_PLATFORM_PROFILE
help
Say Y here if you have a WMI aware Asus laptop (like Eee PCs or new
diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c
index e14fb5fa7324..f1da083b7cd1 100644
--- a/drivers/platform/x86/asus-wmi.c
+++ b/drivers/platform/x86/asus-wmi.c
@@ -191,6 +191,7 @@ struct asus_wmi {
int kbd_led_wk;
struct led_classdev lightbar_led;
int lightbar_led_wk;
+ struct led_classdev micmute_led;
struct workqueue_struct *led_workqueue;
struct work_struct tpd_led_work;
struct work_struct wlan_led_work;
@@ -906,12 +907,24 @@ static enum led_brightness lightbar_led_get(struct led_classdev *led_cdev)
return result & ASUS_WMI_DSTS_LIGHTBAR_MASK;
}
+static int micmute_led_set(struct led_classdev *led_cdev,
+ enum led_brightness brightness)
+{
+ int state = brightness != LED_OFF;
+ int err;
+
+ err = asus_wmi_set_devstate(ASUS_WMI_DEVID_MICMUTE_LED, state, NULL);
+ pr_info("%s: brightness : %d, state: %d, err=%d\n", __func__, brightness, state, err);
+ return err < 0 ? err : 0;
+}
+
static void asus_wmi_led_exit(struct asus_wmi *asus)
{
led_classdev_unregister(&asus->kbd_led);
led_classdev_unregister(&asus->tpd_led);
led_classdev_unregister(&asus->wlan_led);
led_classdev_unregister(&asus->lightbar_led);
+ led_classdev_unregister(&asus->micmute_led);
if (asus->led_workqueue)
destroy_workqueue(asus->led_workqueue);
@@ -983,6 +996,19 @@ static int asus_wmi_led_init(struct asus_wmi *asus)
&asus->lightbar_led);
}
+ if (asus_wmi_dev_is_present(asus, ASUS_WMI_DEVID_MICMUTE_LED)) {
+ asus->micmute_led.name = "asus::micmute";
+ asus->micmute_led.max_brightness = 1;
+ asus->micmute_led.brightness = ledtrig_audio_get(LED_AUDIO_MICMUTE);
+ asus->micmute_led.brightness_set_blocking = micmute_led_set;
+ asus->micmute_led.default_trigger = "audio-micmute";
+
+ rv = led_classdev_register(&asus->platform_device->dev,
+ &asus->micmute_led);
+ if (rv)
+ goto error;
+ }
+
error:
if (rv)
asus_wmi_led_exit(asus);
diff --git a/include/linux/platform_data/x86/asus-wmi.h b/include/linux/platform_data/x86/asus-wmi.h
index 17dc5cb6f3f2..38ee75874d11 100644
--- a/include/linux/platform_data/x86/asus-wmi.h
+++ b/include/linux/platform_data/x86/asus-wmi.h
@@ -49,6 +49,7 @@
#define ASUS_WMI_DEVID_LED4 0x00020014
#define ASUS_WMI_DEVID_LED5 0x00020015
#define ASUS_WMI_DEVID_LED6 0x00020016
+#define ASUS_WMI_DEVID_MICMUTE_LED 0x00040017
/* Backlight and Brightness */
#define ASUS_WMI_DEVID_ALS_ENABLE 0x00050001 /* Ambient Light Sensor */
--
2.34.1
In some new ASUS devices, hotkey Fn+F13 is used for mic mute. If mic-mute
LED is present by checking WMI ASUS_WMI_DEVID_MICMUTE_LED, we will add a
mic-mute LED classdev, asus::micmute, in the asus-wmi driver to control
it. The binding of mic-mute LED controls will be swithched with LED
trigger.
Signed-off-by: PaddyKP_Yao <[email protected]>
---
drivers/platform/x86/Kconfig | 2 ++
drivers/platform/x86/asus-wmi.c | 25 ++++++++++++++++++++++
include/linux/platform_data/x86/asus-wmi.h | 1 +
3 files changed, 28 insertions(+)
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index f915cf67aa26..74769050b770 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -274,6 +274,8 @@ config ASUS_WMI
select INPUT_SPARSEKMAP
select LEDS_CLASS
select NEW_LEDS
+ select LEDS_TRIGGERS
+ select LEDS_TRIGGER_AUDIO
select ACPI_PLATFORM_PROFILE
help
Say Y here if you have a WMI aware Asus laptop (like Eee PCs or new
diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c
index e14fb5fa7324..40c0e00a4b71 100644
--- a/drivers/platform/x86/asus-wmi.c
+++ b/drivers/platform/x86/asus-wmi.c
@@ -191,6 +191,7 @@ struct asus_wmi {
int kbd_led_wk;
struct led_classdev lightbar_led;
int lightbar_led_wk;
+ struct led_classdev micmute_led;
struct workqueue_struct *led_workqueue;
struct work_struct tpd_led_work;
struct work_struct wlan_led_work;
@@ -906,12 +907,23 @@ static enum led_brightness lightbar_led_get(struct led_classdev *led_cdev)
return result & ASUS_WMI_DSTS_LIGHTBAR_MASK;
}
+static int micmute_led_set(struct led_classdev *led_cdev,
+ enum led_brightness brightness)
+{
+ int state = brightness != LED_OFF;
+ int err;
+
+ err = asus_wmi_set_devstate(ASUS_WMI_DEVID_MICMUTE_LED, state, NULL);
+ return err < 0 ? err : 0;
+}
+
static void asus_wmi_led_exit(struct asus_wmi *asus)
{
led_classdev_unregister(&asus->kbd_led);
led_classdev_unregister(&asus->tpd_led);
led_classdev_unregister(&asus->wlan_led);
led_classdev_unregister(&asus->lightbar_led);
+ led_classdev_unregister(&asus->micmute_led);
if (asus->led_workqueue)
destroy_workqueue(asus->led_workqueue);
@@ -983,6 +995,19 @@ static int asus_wmi_led_init(struct asus_wmi *asus)
&asus->lightbar_led);
}
+ if (asus_wmi_dev_is_present(asus, ASUS_WMI_DEVID_MICMUTE_LED)) {
+ asus->micmute_led.name = "asus::micmute";
+ asus->micmute_led.max_brightness = 1;
+ asus->micmute_led.brightness = ledtrig_audio_get(LED_AUDIO_MICMUTE);
+ asus->micmute_led.brightness_set_blocking = micmute_led_set;
+ asus->micmute_led.default_trigger = "audio-micmute";
+
+ rv = led_classdev_register(&asus->platform_device->dev,
+ &asus->micmute_led);
+ if (rv)
+ goto error;
+ }
+
error:
if (rv)
asus_wmi_led_exit(asus);
diff --git a/include/linux/platform_data/x86/asus-wmi.h b/include/linux/platform_data/x86/asus-wmi.h
index 17dc5cb6f3f2..38ee75874d11 100644
--- a/include/linux/platform_data/x86/asus-wmi.h
+++ b/include/linux/platform_data/x86/asus-wmi.h
@@ -49,6 +49,7 @@
#define ASUS_WMI_DEVID_LED4 0x00020014
#define ASUS_WMI_DEVID_LED5 0x00020015
#define ASUS_WMI_DEVID_LED6 0x00020016
+#define ASUS_WMI_DEVID_MICMUTE_LED 0x00040017
/* Backlight and Brightness */
#define ASUS_WMI_DEVID_ALS_ENABLE 0x00050001 /* Ambient Light Sensor */
--
2.34.1
You have sent two patches with the same version, your submission
confuses everybody, which one are we supposed to consider?
On Fri, Jul 8, 2022 at 11:08 AM PaddyKP_Yao <[email protected]> wrote:
>
> In some new ASUS devices, hotkey Fn+F13 is used for mic mute. If mic-mute
> LED is present by checking WMI ASUS_WMI_DEVID_MICMUTE_LED, we will add a
> mic-mute LED classdev, asus::micmute, in the asus-wmi driver to control
> it. The binding of mic-mute LED controls will be swithched with LED
switched
> trigger.
...
Not reviewing code because of the above.
Hint: `git format-patch -vX ...`, where X is a version number will
help. And when cooking a new version don't forget to add a changelog
between versions.
--
With Best Regards,
Andy Shevchenko
Hi,
On 7/9/22 13:44, Andy Shevchenko wrote:
> You have sent two patches with the same version, your submission
> confuses everybody, which one are we supposed to consider?
Also the From of this email: PaddyKP_Yao <[email protected]> and
the Signed-off-by:
>
> On Fri, Jul 8, 2022 at 11:08 AM PaddyKP_Yao <[email protected]> wrote:
>>
>> In some new ASUS devices, hotkey Fn+F13 is used for mic mute. If mic-mute
>> LED is present by checking WMI ASUS_WMI_DEVID_MICMUTE_LED, we will add a
>> mic-mute LED classdev, asus::micmute, in the asus-wmi driver to control
>> it. The binding of mic-mute LED controls will be swithched with LED
>
> switched
>
>> trigger.
>
> ...
>
> Not reviewing code because of the above.
>
> Hint: `git format-patch -vX ...`, where X is a version number will
> help. And when cooking a new version don't forget to add a changelog
> between versions.
>
<accidentally hit send to soon, trying again>
Hi,
On 7/9/22 13:44, Andy Shevchenko wrote:
> You have sent two patches with the same version, your submission
> confuses everybody, which one are we supposed to consider?
Also the From of this email: PaddyKP_Yao <[email protected]> and
the Signed-off-by:
Signed-off-by: PaddyKP_Yao <[email protected]>
do not match. If you want the Author field of the commit to
bet set to match the Signed-off-by, but have trouble submitting
patches from your Asus email I can fix this up for you when
applying. Please let me know if you want me to do this;
or fix this issue for your next patch.
Regards,
Hans
>
> On Fri, Jul 8, 2022 at 11:08 AM PaddyKP_Yao <[email protected]> wrote:
>>
>> In some new ASUS devices, hotkey Fn+F13 is used for mic mute. If mic-mute
>> LED is present by checking WMI ASUS_WMI_DEVID_MICMUTE_LED, we will add a
>> mic-mute LED classdev, asus::micmute, in the asus-wmi driver to control
>> it. The binding of mic-mute LED controls will be swithched with LED
>
> switched
>
>> trigger.
>
> ...
>
> Not reviewing code because of the above.
>
> Hint: `git format-patch -vX ...`, where X is a version number will
> help. And when cooking a new version don't forget to add a changelog
> between versions.
>
Hi,
> -----Original Message-----
> From: Hans de Goede <[email protected]>
> Sent: Saturday, July 9, 2022 10:50 PM
> To: Andy Shevchenko <[email protected]>; PaddyKP_Yao <[email protected]>
> Cc: Mark Gross <[email protected]>; Corentin Chary <[email protected]>; Luke Jones <[email protected]>; PaddyKP Yao(姚
> 國鵬) <[email protected]>; Platform Driver <[email protected]>; Linux Kernel Mailing List <linux-
> [email protected]>; acpi4asus-user <[email protected]>
> Subject: Re: [PATCH 1/1] platform/x86: asus-wmi: Add mic-mute LED classdev support
>
> <accidentally hit send to soon, trying again>
>
> Hi,
>
> On 7/9/22 13:44, Andy Shevchenko wrote:
> > You have sent two patches with the same version, your submission
> > confuses everybody, which one are we supposed to consider?
>
Many thanks for your feedback
Sorry for confusing. I will send new v2 patch again.
> Also the From of this email: PaddyKP_Yao <[email protected]> and
> the Signed-off-by:
>
> Signed-off-by: PaddyKP_Yao <[email protected]>
>
> do not match. If you want the Author field of the commit to
> bet set to match the Signed-off-by, but have trouble submitting
> patches from your Asus email I can fix this up for you when
> applying. Please let me know if you want me to do this;
> or fix this issue for your next patch.
>
> Regards,
>
> Hans
>
I will resend patch again by my Asus email.
===================================================================================================================================
This email and any attachments to it contain confidential information and are intended solely for the use of the individual to whom it is addressed.If you are not the intended recipient or receive it accidentally, please immediately notify the sender by e-mail and delete the message and any attachments from your computer system, and destroy all hard copies. If any, please be advised that any unauthorized disclosure, copying, distribution or any action taken or omitted in reliance on this, is illegal and prohibited. Furthermore, any views or opinions expressed are solely those of the author and do not represent those of ASUSTeK. Thank you for your cooperation.
===================================================================================================================================
In some new ASUS devices, hotkey Fn+F13 is used for mic mute. If mic-mute
LED is present by checking WMI ASUS_WMI_DEVID_MICMUTE_LED, we will add a
mic-mute LED classdev, asus::micmute, in the asus-wmi driver to control
it. The binding of mic-mute LED controls will be swithched with LED
trigger.
Signed-off-by: PaddyKP_Yao <[email protected]>
---
V1 -> V2: fix typo for 'present' and remove unnecessary pr_info() log
drivers/platform/x86/Kconfig | 2 ++
drivers/platform/x86/asus-wmi.c | 25 ++++++++++++++++++++++
include/linux/platform_data/x86/asus-wmi.h | 1 +
3 files changed, 28 insertions(+)
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index f915cf67aa26..74769050b770 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -274,6 +274,8 @@ config ASUS_WMI
select INPUT_SPARSEKMAP
select LEDS_CLASS
select NEW_LEDS
+ select LEDS_TRIGGERS
+ select LEDS_TRIGGER_AUDIO
select ACPI_PLATFORM_PROFILE
help
Say Y here if you have a WMI aware Asus laptop (like Eee PCs or new
diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c
index e14fb5fa7324..40c0e00a4b71 100644
--- a/drivers/platform/x86/asus-wmi.c
+++ b/drivers/platform/x86/asus-wmi.c
@@ -191,6 +191,7 @@ struct asus_wmi {
int kbd_led_wk;
struct led_classdev lightbar_led;
int lightbar_led_wk;
+ struct led_classdev micmute_led;
struct workqueue_struct *led_workqueue;
struct work_struct tpd_led_work;
struct work_struct wlan_led_work;
@@ -906,12 +907,23 @@ static enum led_brightness lightbar_led_get(struct led_classdev *led_cdev)
return result & ASUS_WMI_DSTS_LIGHTBAR_MASK;
}
+static int micmute_led_set(struct led_classdev *led_cdev,
+ enum led_brightness brightness)
+{
+ int state = brightness != LED_OFF;
+ int err;
+
+ err = asus_wmi_set_devstate(ASUS_WMI_DEVID_MICMUTE_LED, state, NULL);
+ return err < 0 ? err : 0;
+}
+
static void asus_wmi_led_exit(struct asus_wmi *asus)
{
led_classdev_unregister(&asus->kbd_led);
led_classdev_unregister(&asus->tpd_led);
led_classdev_unregister(&asus->wlan_led);
led_classdev_unregister(&asus->lightbar_led);
+ led_classdev_unregister(&asus->micmute_led);
if (asus->led_workqueue)
destroy_workqueue(asus->led_workqueue);
@@ -983,6 +995,19 @@ static int asus_wmi_led_init(struct asus_wmi *asus)
&asus->lightbar_led);
}
+ if (asus_wmi_dev_is_present(asus, ASUS_WMI_DEVID_MICMUTE_LED)) {
+ asus->micmute_led.name = "asus::micmute";
+ asus->micmute_led.max_brightness = 1;
+ asus->micmute_led.brightness = ledtrig_audio_get(LED_AUDIO_MICMUTE);
+ asus->micmute_led.brightness_set_blocking = micmute_led_set;
+ asus->micmute_led.default_trigger = "audio-micmute";
+
+ rv = led_classdev_register(&asus->platform_device->dev,
+ &asus->micmute_led);
+ if (rv)
+ goto error;
+ }
+
error:
if (rv)
asus_wmi_led_exit(asus);
diff --git a/include/linux/platform_data/x86/asus-wmi.h b/include/linux/platform_data/x86/asus-wmi.h
index 17dc5cb6f3f2..38ee75874d11 100644
--- a/include/linux/platform_data/x86/asus-wmi.h
+++ b/include/linux/platform_data/x86/asus-wmi.h
@@ -49,6 +49,7 @@
#define ASUS_WMI_DEVID_LED4 0x00020014
#define ASUS_WMI_DEVID_LED5 0x00020015
#define ASUS_WMI_DEVID_LED6 0x00020016
+#define ASUS_WMI_DEVID_MICMUTE_LED 0x00040017
/* Backlight and Brightness */
#define ASUS_WMI_DEVID_ALS_ENABLE 0x00050001 /* Ambient Light Sensor */
--
2.34.1
From: PaddyKP_Yao <[email protected]>
In some new ASUS devices, hotkey Fn+F13 is used for mic mute. If mic-mute
LED is present by checking WMI ASUS_WMI_DEVID_MICMUTE_LED, we will add a
mic-mute LED classdev, asus::micmute, in the asus-wmi driver to control
it. The binding of mic-mute LED controls will be swithched with LED
trigger.
Signed-off-by: PaddyKP_Yao <[email protected]>
---
V1 -> V2: fix typo for 'present' and remove unnecessary pr_info() log
drivers/platform/x86/Kconfig | 2 ++
drivers/platform/x86/asus-wmi.c | 25 ++++++++++++++++++++++
include/linux/platform_data/x86/asus-wmi.h | 1 +
3 files changed, 28 insertions(+)
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index f915cf67aa26..74769050b770 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -274,6 +274,8 @@ config ASUS_WMI
select INPUT_SPARSEKMAP
select LEDS_CLASS
select NEW_LEDS
+ select LEDS_TRIGGERS
+ select LEDS_TRIGGER_AUDIO
select ACPI_PLATFORM_PROFILE
help
Say Y here if you have a WMI aware Asus laptop (like Eee PCs or new
diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c
index e14fb5fa7324..40c0e00a4b71 100644
--- a/drivers/platform/x86/asus-wmi.c
+++ b/drivers/platform/x86/asus-wmi.c
@@ -191,6 +191,7 @@ struct asus_wmi {
int kbd_led_wk;
struct led_classdev lightbar_led;
int lightbar_led_wk;
+ struct led_classdev micmute_led;
struct workqueue_struct *led_workqueue;
struct work_struct tpd_led_work;
struct work_struct wlan_led_work;
@@ -906,12 +907,23 @@ static enum led_brightness lightbar_led_get(struct led_classdev *led_cdev)
return result & ASUS_WMI_DSTS_LIGHTBAR_MASK;
}
+static int micmute_led_set(struct led_classdev *led_cdev,
+ enum led_brightness brightness)
+{
+ int state = brightness != LED_OFF;
+ int err;
+
+ err = asus_wmi_set_devstate(ASUS_WMI_DEVID_MICMUTE_LED, state, NULL);
+ return err < 0 ? err : 0;
+}
+
static void asus_wmi_led_exit(struct asus_wmi *asus)
{
led_classdev_unregister(&asus->kbd_led);
led_classdev_unregister(&asus->tpd_led);
led_classdev_unregister(&asus->wlan_led);
led_classdev_unregister(&asus->lightbar_led);
+ led_classdev_unregister(&asus->micmute_led);
if (asus->led_workqueue)
destroy_workqueue(asus->led_workqueue);
@@ -983,6 +995,19 @@ static int asus_wmi_led_init(struct asus_wmi *asus)
&asus->lightbar_led);
}
+ if (asus_wmi_dev_is_present(asus, ASUS_WMI_DEVID_MICMUTE_LED)) {
+ asus->micmute_led.name = "asus::micmute";
+ asus->micmute_led.max_brightness = 1;
+ asus->micmute_led.brightness = ledtrig_audio_get(LED_AUDIO_MICMUTE);
+ asus->micmute_led.brightness_set_blocking = micmute_led_set;
+ asus->micmute_led.default_trigger = "audio-micmute";
+
+ rv = led_classdev_register(&asus->platform_device->dev,
+ &asus->micmute_led);
+ if (rv)
+ goto error;
+ }
+
error:
if (rv)
asus_wmi_led_exit(asus);
diff --git a/include/linux/platform_data/x86/asus-wmi.h b/include/linux/platform_data/x86/asus-wmi.h
index 17dc5cb6f3f2..38ee75874d11 100644
--- a/include/linux/platform_data/x86/asus-wmi.h
+++ b/include/linux/platform_data/x86/asus-wmi.h
@@ -49,6 +49,7 @@
#define ASUS_WMI_DEVID_LED4 0x00020014
#define ASUS_WMI_DEVID_LED5 0x00020015
#define ASUS_WMI_DEVID_LED6 0x00020016
+#define ASUS_WMI_DEVID_MICMUTE_LED 0x00040017
/* Backlight and Brightness */
#define ASUS_WMI_DEVID_ALS_ENABLE 0x00050001 /* Ambient Light Sensor */
--
2.34.1
===================================================================================================================================
This email and any attachments to it contain confidential information and are intended solely for the use of the individual to whom it is addressed.If you are not the intended recipient or receive it accidentally, please immediately notify the sender by e-mail and delete the message and any attachments from your computer system, and destroy all hard copies. If any, please be advised that any unauthorized disclosure, copying, distribution or any action taken or omitted in reliance on this, is illegal and prohibited. Furthermore, any views or opinions expressed are solely those of the author and do not represent those of ASUSTeK. Thank you for your cooperation.
===================================================================================================================================
On Mon, Jul 11, 2022 at 4:47 AM <[email protected]> wrote:
>
> From: PaddyKP_Yao <[email protected]>
Besides we got two emails again of the same version...
> ===================================================================================================================================
> This email and any attachments to it contain confidential information and are intended solely for the use of the individual to whom it is addressed.If you are not the intended recipient or receive it accidentally, please immediately notify the sender by e-mail and delete the message and any attachments from your computer system, and destroy all hard copies. If any, please be advised that any unauthorized disclosure, copying, distribution or any action taken or omitted in reliance on this, is illegal and prohibited. Furthermore, any views or opinions expressed are solely those of the author and do not represent those of ASUSTeK. Thank you for your cooperation.
> ===================================================================================================================================
...this is problematic and can't be used in open source projects. Ask
your legal team how to deal with it.
--
With Best Regards,
Andy Shevchenko
<accidentally hit send to soon, trying again>
Hi,
Sorry for mistake about send two patch mail again...
After some try, I cannot remove legal message from asus mail.
I will use my gmail and send patch again.
And may I use author [email protected] instead of my gmail account?
Many thanks for your kind feedback.
On Mon, Jul 11, 2022 at 10:50:29AM +0200, Andy Shevchenko wrote:
> On Mon, Jul 11, 2022 at 4:47 AM <[email protected]> wrote:
> >
> > From: PaddyKP_Yao <[email protected]>
>
> Besides we got two emails again of the same version...
>
> > ===================================================================================================================================
> > This email and any attachments to it contain confidential information and are intended solely for the use of the individual to whom it is addressed.If you are not the intended recipient or receive it accidentally, please immediately notify the sender by e-mail and delete the message and any attachments from your computer system, and destroy all hard copies. If any, please be advised that any unauthorized disclosure, copying, distribution or any action taken or omitted in reliance on this, is illegal and prohibited. Furthermore, any views or opinions expressed are solely those of the author and do not represent those of ASUSTeK. Thank you for your cooperation.
> > ===================================================================================================================================
>
> ...this is problematic and can't be used in open source projects. Ask
> your legal team how to deal with it.
>
> --
> With Best Regards,
> Andy Shevchenko
Hi,
On 7/11/22 13:41, PaddyKP Yao wrote:
> <accidentally hit send to soon, trying again>
>
> Hi,
>
> Sorry for mistake about send two patch mail again...
> After some try, I cannot remove legal message from asus mail.
> I will use my gmail and send patch again.
> And may I use author [email protected] instead of my gmail account?
Yes I can fix that up for you.
Regards,
Hans
>
> Many thanks for your kind feedback.
>
> On Mon, Jul 11, 2022 at 10:50:29AM +0200, Andy Shevchenko wrote:
>> On Mon, Jul 11, 2022 at 4:47 AM <[email protected]> wrote:
>>>
>>> From: PaddyKP_Yao <[email protected]>
>>
>> Besides we got two emails again of the same version...
>>
>>> ===================================================================================================================================
>>> This email and any attachments to it contain confidential information and are intended solely for the use of the individual to whom it is addressed.If you are not the intended recipient or receive it accidentally, please immediately notify the sender by e-mail and delete the message and any attachments from your computer system, and destroy all hard copies. If any, please be advised that any unauthorized disclosure, copying, distribution or any action taken or omitted in reliance on this, is illegal and prohibited. Furthermore, any views or opinions expressed are solely those of the author and do not represent those of ASUSTeK. Thank you for your cooperation.
>>> ===================================================================================================================================
>>
>> ...this is problematic and can't be used in open source projects. Ask
>> your legal team how to deal with it.
>>
>> --
>> With Best Regards,
>> Andy Shevchenko
>
In some new ASUS devices, hotkey Fn+F13 is used for mic mute. If mic-mute
LED is present by checking WMI ASUS_WMI_DEVID_MICMUTE_LED, we will add a
mic-mute LED classdev, asus::micmute, in the asus-wmi driver to control
it. The binding of mic-mute LED controls will be swithched with LED
trigger.
Signed-off-by: PaddyKP_Yao <[email protected]>
---
V1 -> V2: fix typo for 'present' and remove unnecessary pr_info() log
V2 -> V3: resend patch again by gmail to avoid Asus legal in the mail
drivers/platform/x86/Kconfig | 2 ++
drivers/platform/x86/asus-wmi.c | 25 ++++++++++++++++++++++
include/linux/platform_data/x86/asus-wmi.h | 1 +
3 files changed, 28 insertions(+)
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index f915cf67aa26..74769050b770 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -274,6 +274,8 @@ config ASUS_WMI
select INPUT_SPARSEKMAP
select LEDS_CLASS
select NEW_LEDS
+ select LEDS_TRIGGERS
+ select LEDS_TRIGGER_AUDIO
select ACPI_PLATFORM_PROFILE
help
Say Y here if you have a WMI aware Asus laptop (like Eee PCs or new
diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c
index e14fb5fa7324..40c0e00a4b71 100644
--- a/drivers/platform/x86/asus-wmi.c
+++ b/drivers/platform/x86/asus-wmi.c
@@ -191,6 +191,7 @@ struct asus_wmi {
int kbd_led_wk;
struct led_classdev lightbar_led;
int lightbar_led_wk;
+ struct led_classdev micmute_led;
struct workqueue_struct *led_workqueue;
struct work_struct tpd_led_work;
struct work_struct wlan_led_work;
@@ -906,12 +907,23 @@ static enum led_brightness lightbar_led_get(struct led_classdev *led_cdev)
return result & ASUS_WMI_DSTS_LIGHTBAR_MASK;
}
+static int micmute_led_set(struct led_classdev *led_cdev,
+ enum led_brightness brightness)
+{
+ int state = brightness != LED_OFF;
+ int err;
+
+ err = asus_wmi_set_devstate(ASUS_WMI_DEVID_MICMUTE_LED, state, NULL);
+ return err < 0 ? err : 0;
+}
+
static void asus_wmi_led_exit(struct asus_wmi *asus)
{
led_classdev_unregister(&asus->kbd_led);
led_classdev_unregister(&asus->tpd_led);
led_classdev_unregister(&asus->wlan_led);
led_classdev_unregister(&asus->lightbar_led);
+ led_classdev_unregister(&asus->micmute_led);
if (asus->led_workqueue)
destroy_workqueue(asus->led_workqueue);
@@ -983,6 +995,19 @@ static int asus_wmi_led_init(struct asus_wmi *asus)
&asus->lightbar_led);
}
+ if (asus_wmi_dev_is_present(asus, ASUS_WMI_DEVID_MICMUTE_LED)) {
+ asus->micmute_led.name = "asus::micmute";
+ asus->micmute_led.max_brightness = 1;
+ asus->micmute_led.brightness = ledtrig_audio_get(LED_AUDIO_MICMUTE);
+ asus->micmute_led.brightness_set_blocking = micmute_led_set;
+ asus->micmute_led.default_trigger = "audio-micmute";
+
+ rv = led_classdev_register(&asus->platform_device->dev,
+ &asus->micmute_led);
+ if (rv)
+ goto error;
+ }
+
error:
if (rv)
asus_wmi_led_exit(asus);
diff --git a/include/linux/platform_data/x86/asus-wmi.h b/include/linux/platform_data/x86/asus-wmi.h
index 17dc5cb6f3f2..38ee75874d11 100644
--- a/include/linux/platform_data/x86/asus-wmi.h
+++ b/include/linux/platform_data/x86/asus-wmi.h
@@ -49,6 +49,7 @@
#define ASUS_WMI_DEVID_LED4 0x00020014
#define ASUS_WMI_DEVID_LED5 0x00020015
#define ASUS_WMI_DEVID_LED6 0x00020016
+#define ASUS_WMI_DEVID_MICMUTE_LED 0x00040017
/* Backlight and Brightness */
#define ASUS_WMI_DEVID_ALS_ENABLE 0x00050001 /* Ambient Light Sensor */
--
2.34.1
Hi,
On 7/11/22 13:51, PaddyKP_Yao wrote:
> In some new ASUS devices, hotkey Fn+F13 is used for mic mute. If mic-mute
> LED is present by checking WMI ASUS_WMI_DEVID_MICMUTE_LED, we will add a
> mic-mute LED classdev, asus::micmute, in the asus-wmi driver to control
> it. The binding of mic-mute LED controls will be swithched with LED
> trigger.
>
> Signed-off-by: PaddyKP_Yao <[email protected]>
> ---
> V1 -> V2: fix typo for 'present' and remove unnecessary pr_info() log
> V2 -> V3: resend patch again by gmail to avoid Asus legal in the mail
Thank you for your patch, I've applied this patch to my review-hans
branch:
https://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git/log/?h=review-hans
Once I've run some tests on this branch the patches there will be
added to the platform-drivers-x86/for-next branch and eventually
will be included in the pdx86 pull-request to Linus for the next
merge-window.
Regards,
Hans
>
> drivers/platform/x86/Kconfig | 2 ++
> drivers/platform/x86/asus-wmi.c | 25 ++++++++++++++++++++++
> include/linux/platform_data/x86/asus-wmi.h | 1 +
> 3 files changed, 28 insertions(+)
>
> diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
> index f915cf67aa26..74769050b770 100644
> --- a/drivers/platform/x86/Kconfig
> +++ b/drivers/platform/x86/Kconfig
> @@ -274,6 +274,8 @@ config ASUS_WMI
> select INPUT_SPARSEKMAP
> select LEDS_CLASS
> select NEW_LEDS
> + select LEDS_TRIGGERS
> + select LEDS_TRIGGER_AUDIO
> select ACPI_PLATFORM_PROFILE
> help
> Say Y here if you have a WMI aware Asus laptop (like Eee PCs or new
> diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c
> index e14fb5fa7324..40c0e00a4b71 100644
> --- a/drivers/platform/x86/asus-wmi.c
> +++ b/drivers/platform/x86/asus-wmi.c
> @@ -191,6 +191,7 @@ struct asus_wmi {
> int kbd_led_wk;
> struct led_classdev lightbar_led;
> int lightbar_led_wk;
> + struct led_classdev micmute_led;
> struct workqueue_struct *led_workqueue;
> struct work_struct tpd_led_work;
> struct work_struct wlan_led_work;
> @@ -906,12 +907,23 @@ static enum led_brightness lightbar_led_get(struct led_classdev *led_cdev)
> return result & ASUS_WMI_DSTS_LIGHTBAR_MASK;
> }
>
> +static int micmute_led_set(struct led_classdev *led_cdev,
> + enum led_brightness brightness)
> +{
> + int state = brightness != LED_OFF;
> + int err;
> +
> + err = asus_wmi_set_devstate(ASUS_WMI_DEVID_MICMUTE_LED, state, NULL);
> + return err < 0 ? err : 0;
> +}
> +
> static void asus_wmi_led_exit(struct asus_wmi *asus)
> {
> led_classdev_unregister(&asus->kbd_led);
> led_classdev_unregister(&asus->tpd_led);
> led_classdev_unregister(&asus->wlan_led);
> led_classdev_unregister(&asus->lightbar_led);
> + led_classdev_unregister(&asus->micmute_led);
>
> if (asus->led_workqueue)
> destroy_workqueue(asus->led_workqueue);
> @@ -983,6 +995,19 @@ static int asus_wmi_led_init(struct asus_wmi *asus)
> &asus->lightbar_led);
> }
>
> + if (asus_wmi_dev_is_present(asus, ASUS_WMI_DEVID_MICMUTE_LED)) {
> + asus->micmute_led.name = "asus::micmute";
> + asus->micmute_led.max_brightness = 1;
> + asus->micmute_led.brightness = ledtrig_audio_get(LED_AUDIO_MICMUTE);
> + asus->micmute_led.brightness_set_blocking = micmute_led_set;
> + asus->micmute_led.default_trigger = "audio-micmute";
> +
> + rv = led_classdev_register(&asus->platform_device->dev,
> + &asus->micmute_led);
> + if (rv)
> + goto error;
> + }
> +
> error:
> if (rv)
> asus_wmi_led_exit(asus);
> diff --git a/include/linux/platform_data/x86/asus-wmi.h b/include/linux/platform_data/x86/asus-wmi.h
> index 17dc5cb6f3f2..38ee75874d11 100644
> --- a/include/linux/platform_data/x86/asus-wmi.h
> +++ b/include/linux/platform_data/x86/asus-wmi.h
> @@ -49,6 +49,7 @@
> #define ASUS_WMI_DEVID_LED4 0x00020014
> #define ASUS_WMI_DEVID_LED5 0x00020015
> #define ASUS_WMI_DEVID_LED6 0x00020016
> +#define ASUS_WMI_DEVID_MICMUTE_LED 0x00040017
>
> /* Backlight and Brightness */
> #define ASUS_WMI_DEVID_ALS_ENABLE 0x00050001 /* Ambient Light Sensor */
Hi!
> In some new ASUS devices, hotkey Fn+F13 is used for mic mute. If mic-mute
> LED is present by checking WMI ASUS_WMI_DEVID_MICMUTE_LED, we will add a
> mic-mute LED classdev, asus::micmute, in the asus-wmi driver to control
> it. The binding of mic-mute LED controls will be swithched with LED
> trigger.
>
> Signed-off-by: PaddyKP_Yao <[email protected]>
> ---
> V1 -> V2: fix typo for 'present' and remove unnecessary pr_info() log
>
> drivers/platform/x86/Kconfig | 2 ++
> drivers/platform/x86/asus-wmi.c | 25 ++++++++++++++++++++++
> include/linux/platform_data/x86/asus-wmi.h | 1 +
> 3 files changed, 28 insertions(+)
>
> asus->micmute_led.name = "asus::micmute";
Please see/modify well-known-leds.txt file. We want this consistent on all devices.
Best regards,
Pavel
--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
Hi!
> > LED is present by checking WMI ASUS_WMI_DEVID_MICMUTE_LED, we will add a
> > mic-mute LED classdev, asus::micmute, in the asus-wmi driver to control
> > it. The binding of mic-mute LED controls will be swithched with LED
> > trigger.
> >
> > Signed-off-by: PaddyKP_Yao <[email protected]>
> > ---
> > V1 -> V2: fix typo for 'present' and remove unnecessary pr_info() log
> > V2 -> V3: resend patch again by gmail to avoid Asus legal in the mail
>
> Thank you for your patch, I've applied this patch to my review-hans
> branch:
> https://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git/log/?h=review-hans
>
> Once I've run some tests on this branch the patches there will be
> added to the platform-drivers-x86/for-next branch and eventually
> will be included in the pdx86 pull-request to Linus for the next
> merge-window.
> > + if (asus_wmi_dev_is_present(asus, ASUS_WMI_DEVID_MICMUTE_LED)) {
> > + asus->micmute_led.name = "asus::micmute";
It would be good to get the API right before it hits mainline release.
Best regards,
Pavel
--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
Hi Pavel,
On Wed, Aug 24, 2022 at 12:06:22PM +0200, Pavel Machek wrote:
>
> It would be good to get the API right before it hits mainline release.
>
What do you mean about API you mentioned?
Best Regards, Paddy
Hi Pavel,
On Wed, Aug 24, 2022 at 12:06:15PM +0200, Pavel Machek wrote:
> > drivers/platform/x86/asus-wmi.c | 25 ++++++++++++++++++++++
> > include/linux/platform_data/x86/asus-wmi.h | 1 +
> > 3 files changed, 28 insertions(+)
> >
> > asus->micmute_led.name = "asus::micmute";
>
> Please see/modify well-known-leds.txt file. We want this consistent on all devices.
Thanks for your feedback.
Do you mean I should use "platform::micmute" instead of "asus::micmute"?
Best Regards, Paddy
Hi,
On 8/24/22 13:09, PaddyKP Yao wrote:
> Hi Pavel,
>
> On Wed, Aug 24, 2022 at 12:06:15PM +0200, Pavel Machek wrote:
>>> drivers/platform/x86/asus-wmi.c | 25 ++++++++++++++++++++++
>>> include/linux/platform_data/x86/asus-wmi.h | 1 +
>>> 3 files changed, 28 insertions(+)
>>>
>>> asus->micmute_led.name = "asus::micmute";
>>
>> Please see/modify well-known-leds.txt file. We want this consistent on all devices.
>
> Thanks for your feedback.
> Do you mean I should use "platform::micmute" instead of "asus::micmute"?
Yes. Since I have already merged your original patch can you please make
this a new patch on top of your original patch ? In other words just
make this 1 small change in the new patch:
diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c
index 2d9d709aa59f..18e584eb9f0f 100644
--- a/drivers/platform/x86/asus-wmi.c
+++ b/drivers/platform/x86/asus-wmi.c
@@ -1060,7 +1060,7 @@ static int asus_wmi_led_init(struct asus_wmi *asus)
}
if (asus_wmi_dev_is_present(asus, ASUS_WMI_DEVID_MICMUTE_LED)) {
- asus->micmute_led.name = "asus::micmute";
+ asus->micmute_led.name = "platform::micmute";
asus->micmute_led.max_brightness = 1;
asus->micmute_led.brightness = ledtrig_audio_get(LED_AUDIO_MICMUTE);
asus->micmute_led.brightness_set_blocking = micmute_led_set;
Regards,
Hans
Hi Hans,
On Wed, Aug 24, 2022 at 01:11:32PM +0200, Hans de Goede wrote:
> Yes. Since I have already merged your original patch can you please make
> this a new patch on top of your original patch ? In other words just
> make this 1 small change in the new patch:
>
> diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c
> index 2d9d709aa59f..18e584eb9f0f 100644
> --- a/drivers/platform/x86/asus-wmi.c
> +++ b/drivers/platform/x86/asus-wmi.c
> @@ -1060,7 +1060,7 @@ static int asus_wmi_led_init(struct asus_wmi *asus)
> }
>
> if (asus_wmi_dev_is_present(asus, ASUS_WMI_DEVID_MICMUTE_LED)) {
> - asus->micmute_led.name = "asus::micmute";
> + asus->micmute_led.name = "platform::micmute";
> asus->micmute_led.max_brightness = 1;
> asus->micmute_led.brightness = ledtrig_audio_get(LED_AUDIO_MICMUTE);
> asus->micmute_led.brightness_set_blocking = micmute_led_set;
>
> Regards,
>
> Hans
>
Thanks for your advice.
No problem, I will fix it soon.
Best Regards, Paddy
Hi Hans,
On Wed, Aug 24, 2022 at 07:17:34PM +0800, PaddyKP Yao wrote:
> Hi Hans,
>
> On Wed, Aug 24, 2022 at 01:11:32PM +0200, Hans de Goede wrote:
> > Yes. Since I have already merged your original patch can you please make
> > this a new patch on top of your original patch ? In other words just
> > make this 1 small change in the new patch:
Thanks for your help. I already submited new patch by below mail.
And may I use author [email protected] instead of my gmail account for
this new patch?
# mail for new patch:
Subject: [PATCH v1 1/1] platform/x86: asus-wmi: Fix name of mic-mute LED classdev
Date: Thu, 25 Aug 2022 08:43:05 +0800
Message-Id: <[email protected]>
Best Regards, Paddy
On Wed 2022-08-24 18:59:08, PaddyKP Yao wrote:
> Hi Pavel,
>
> On Wed, Aug 24, 2022 at 12:06:22PM +0200, Pavel Machek wrote:
> >
> > It would be good to get the API right before it hits mainline release.
> >
>
> What do you mean about API you mentioned?
We really don't want to see asus: prefix in the sysfs.
Best regards,
Pavel
--
People of Russia, stop Putin before his war on Ukraine escalates.
Hi Pavel,
On Thu, Aug 25, 2022 at 09:55:47AM +0200, Pavel Machek wrote:
> On Wed 2022-08-24 18:59:08, PaddyKP Yao wrote:
> > Hi Pavel,
> >
> > On Wed, Aug 24, 2022 at 12:06:22PM +0200, Pavel Machek wrote:
> > >
> > > It would be good to get the API right before it hits mainline release.
> > >
> >
> > What do you mean about API you mentioned?
>
> We really don't want to see asus: prefix in the sysfs.
>
> Best regards,
> Pavel
> --
> People of Russia, stop Putin before his war on Ukraine escalates.
Understand and thanks for your feedback.
I aready submited new patch to fix this.
https://lore.kernel.org/all/[email protected]/
Best Regards, Paddy
Hi,
On 8/25/22 03:29, PaddyKP Yao wrote:
> Hi Hans,
>
> On Wed, Aug 24, 2022 at 07:17:34PM +0800, PaddyKP Yao wrote:
>> Hi Hans,
>>
>> On Wed, Aug 24, 2022 at 01:11:32PM +0200, Hans de Goede wrote:
>>> Yes. Since I have already merged your original patch can you please make
>>> this a new patch on top of your original patch ? In other words just
>>> make this 1 small change in the new patch:
>
> Thanks for your help. I already submited new patch by below mail.
> And may I use author [email protected] instead of my gmail account for
> this new patch?
Yes I will fix-up the author to match the Signed-off-by when applying
the patch.
Regards,
Hans