Commit 973d6904 authored by Jiri Kosina's avatar Jiri Kosina
Browse files

Merge branches 'for-6.14/wacom' and 'for-6.14/wacom-pci' into for-linus 

- improvement of behavior for non-standard LED brightness values (Jason Gerecke)
- PCI Wacom device supports (depends on Intel THC support) (Even Xu)
parents 5a68172a d2c34233 c4c12350

drivers/hid/wacom.h

+8 −0
Original line number Diff line number Diff line
@@ -218,6 +218,14 @@ static inline __u32 wacom_s32tou(s32 value, __u8 n) 
	return value & (1 << (n - 1)) ? value & (~(~0U << n)) : value;

}



static inline u32 wacom_rescale(u32 value, u32 in_max, u32 out_max)

{

	if (in_max == 0 || out_max == 0)

		return 0;

	value = clamp(value, 0, in_max);

	return DIV_ROUND_CLOSEST(value * out_max, in_max);

}



extern const struct hid_device_id wacom_ids[];



void wacom_wac_irq(struct wacom_wac *wacom_wac, size_t len);

drivers/hid/wacom_sys.c

+15 −4
Original line number Diff line number Diff line
@@ -1084,6 +1084,17 @@ static ssize_t wacom_luminance_store(struct wacom *wacom, u8 *dest, 
	mutex_lock(&wacom->lock);



	*dest = value & 0x7f;

	for (unsigned int i = 0; i < wacom->led.count; i++) {

		struct wacom_group_leds *group = &wacom->led.groups[i];



		for (unsigned int j = 0; j < group->count; j++) {

			if (dest == &wacom->led.llv)

				group->leds[j].llv = *dest;

			else if (dest == &wacom->led.hlv)

				group->leds[j].hlv = *dest;

		}

	}



	err = wacom_led_control(wacom);



	mutex_unlock(&wacom->lock);
@@ -1302,10 +1313,10 @@ enum led_brightness wacom_leds_brightness_get(struct wacom_led *led) 
	struct wacom *wacom = led->wacom;



	if (wacom->led.max_hlv)

		return led->hlv * LED_FULL / wacom->led.max_hlv;

		return wacom_rescale(led->hlv, wacom->led.max_hlv, LED_FULL);



	if (wacom->led.max_llv)

		return led->llv * LED_FULL / wacom->led.max_llv;

		return wacom_rescale(led->llv, wacom->led.max_llv, LED_FULL);



	/* device doesn't support brightness tuning */

	return LED_FULL;
@@ -1337,8 +1348,8 @@ static int wacom_led_brightness_set(struct led_classdev *cdev, 
		goto out;

	}



	led->llv = wacom->led.llv = wacom->led.max_llv * brightness / LED_FULL;

	led->hlv = wacom->led.hlv = wacom->led.max_hlv * brightness / LED_FULL;

	led->llv = wacom->led.llv = wacom_rescale(brightness, LED_FULL, wacom->led.max_llv);

	led->hlv = wacom->led.hlv = wacom_rescale(brightness, LED_FULL, wacom->led.max_hlv);



	wacom->led.groups[led->group].select = led->id;

drivers/hid/wacom_wac.c

+5 −0
Original line number Diff line number Diff line
@@ -4946,6 +4946,10 @@ static const struct wacom_features wacom_features_0x94 = 
	HID_DEVICE(BUS_I2C, HID_GROUP_WACOM, USB_VENDOR_ID_WACOM, prod),\

	.driver_data = (kernel_ulong_t)&wacom_features_##prod



#define PCI_DEVICE_WACOM(prod)						\

	HID_DEVICE(BUS_PCI, HID_GROUP_WACOM, USB_VENDOR_ID_WACOM, prod),\

	.driver_data = (kernel_ulong_t)&wacom_features_##prod



#define USB_DEVICE_LENOVO(prod)					\

	HID_USB_DEVICE(USB_VENDOR_ID_LENOVO, prod),			\

	.driver_data = (kernel_ulong_t)&wacom_features_##prod
@@ -5115,6 +5119,7 @@ const struct hid_device_id wacom_ids[] = { 


	{ USB_DEVICE_WACOM(HID_ANY_ID) },

	{ I2C_DEVICE_WACOM(HID_ANY_ID) },

	{ PCI_DEVICE_WACOM(HID_ANY_ID) },

	{ BT_DEVICE_WACOM(HID_ANY_ID) },

	{ }

};