| Message ID | 20250319191320.10092-5-lkml@antheas.dev (mailing list archive) |
|---|---|
| State | New |
| Delegated to: | Jiri Kosina |
| Headers | show |
| Series | HID: asus: hid-asus and asus-wmi backlight unification, Z13 QOL improvements | expand |
On 20/03/25 08:13, Antheas Kapenekakis wrote: > Rename the generic keyboard3 to Z13_FOLIO as it refers to the folio of > the Z13. Both 2023 and 2025 variants. > > Signed-off-by: Antheas Kapenekakis <lkml@antheas.dev> > --- > drivers/hid/hid-asus.c | 2 +- > drivers/hid/hid-ids.h | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/hid/hid-asus.c b/drivers/hid/hid-asus.c > index 490a7ea369961..cdd9d9c4fc95f 100644 > --- a/drivers/hid/hid-asus.c > +++ b/drivers/hid/hid-asus.c > @@ -1332,7 +1332,7 @@ static const struct hid_device_id asus_devices[] = { > USB_DEVICE_ID_ASUSTEK_ROG_NKEY_KEYBOARD2), > QUIRK_USE_KBD_BACKLIGHT | QUIRK_ROG_NKEY_KEYBOARD }, > { HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK, > - USB_DEVICE_ID_ASUSTEK_ROG_NKEY_KEYBOARD3), > + USB_DEVICE_ID_ASUSTEK_ROG_Z13_FOLIO), > QUIRK_USE_KBD_BACKLIGHT | QUIRK_ROG_NKEY_KEYBOARD }, > { HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK, > USB_DEVICE_ID_ASUSTEK_ROG_Z13_LIGHTBAR), > diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h > index 7e400624908e3..b1fe7582324ff 100644 > --- a/drivers/hid/hid-ids.h > +++ b/drivers/hid/hid-ids.h > @@ -209,7 +209,7 @@ > #define USB_DEVICE_ID_ASUSTEK_ROG_KEYBOARD3 0x1822 > #define USB_DEVICE_ID_ASUSTEK_ROG_NKEY_KEYBOARD 0x1866 > #define USB_DEVICE_ID_ASUSTEK_ROG_NKEY_KEYBOARD2 0x19b6 > -#define USB_DEVICE_ID_ASUSTEK_ROG_NKEY_KEYBOARD3 0x1a30 > +#define USB_DEVICE_ID_ASUSTEK_ROG_Z13_FOLIO 0x1a30 Hi Antheas, I checked history of the Z13 and use of the 0x1a30 PID and it appears only the Z13 folio ever used this PID. Reviewed-by: Luke D. Jones <luke@ljones.dev> > #define USB_DEVICE_ID_ASUSTEK_ROG_Z13_LIGHTBAR 0x18c6 > #define USB_DEVICE_ID_ASUSTEK_ROG_NKEY_ALLY 0x1abe > #define USB_DEVICE_ID_ASUSTEK_ROG_NKEY_ALLY_X 0x1b4c
diff --git a/drivers/hid/hid-asus.c b/drivers/hid/hid-asus.c index 490a7ea369961..cdd9d9c4fc95f 100644 --- a/drivers/hid/hid-asus.c +++ b/drivers/hid/hid-asus.c @@ -1332,7 +1332,7 @@ static const struct hid_device_id asus_devices[] = { USB_DEVICE_ID_ASUSTEK_ROG_NKEY_KEYBOARD2), QUIRK_USE_KBD_BACKLIGHT | QUIRK_ROG_NKEY_KEYBOARD }, { HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK, - USB_DEVICE_ID_ASUSTEK_ROG_NKEY_KEYBOARD3), + USB_DEVICE_ID_ASUSTEK_ROG_Z13_FOLIO), QUIRK_USE_KBD_BACKLIGHT | QUIRK_ROG_NKEY_KEYBOARD }, { HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK, USB_DEVICE_ID_ASUSTEK_ROG_Z13_LIGHTBAR), diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index 7e400624908e3..b1fe7582324ff 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h @@ -209,7 +209,7 @@ #define USB_DEVICE_ID_ASUSTEK_ROG_KEYBOARD3 0x1822 #define USB_DEVICE_ID_ASUSTEK_ROG_NKEY_KEYBOARD 0x1866 #define USB_DEVICE_ID_ASUSTEK_ROG_NKEY_KEYBOARD2 0x19b6 -#define USB_DEVICE_ID_ASUSTEK_ROG_NKEY_KEYBOARD3 0x1a30 +#define USB_DEVICE_ID_ASUSTEK_ROG_Z13_FOLIO 0x1a30 #define USB_DEVICE_ID_ASUSTEK_ROG_Z13_LIGHTBAR 0x18c6 #define USB_DEVICE_ID_ASUSTEK_ROG_NKEY_ALLY 0x1abe #define USB_DEVICE_ID_ASUSTEK_ROG_NKEY_ALLY_X 0x1b4c
Rename the generic keyboard3 to Z13_FOLIO as it refers to the folio of the Z13. Both 2023 and 2025 variants. Signed-off-by: Antheas Kapenekakis <lkml@antheas.dev> --- drivers/hid/hid-asus.c | 2 +- drivers/hid/hid-ids.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)