November 2016 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH v2 1/2] hid-lenovo: Add support for X1 Tablet special keys and LED control
by Dennis Wassenberg 09 Dec '16

09 Dec '16

The Lenovo X1 Tablet Cover is connected via USB. It constists of 1 device with 3 usb interfaces. Interface 0 represents keyboard, interface 1 the function / special keys and LED control, interface 2 is the Synaptics touchpad and pointing stick. This driver will bind to interfaces 0 and 1 and handle function / special keys including LED control. HID: add device id for Lenovo X1 Tablet Cover Signed-off-by: Dennis Wassenberg <dennis.wassenberg(a)secunet.com> --- Changes v1 -> v2 (suggested by Benjamin Tissoires): * Squashed add of device IDs for Lenovo Thinkpad X1 Tablet Cover together with add of support for Lenovo Thinkpad X1 Tablet Cover into one patch drivers/hid/hid-core.c | 1 + drivers/hid/hid-ids.h | 1 + drivers/hid/hid-lenovo.c | 549 +++++++++++++++++++++++++++++++++++++++++++++ include/linux/hid-lenovo.h | 15 ++ 4 files changed, 566 insertions(+) create mode 100644 include/linux/hid-lenovo.h diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index 6add0b6..ba6a200 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c @@ -2111,6 +2111,7 @@ void hid_disconnect(struct hid_device *hdev) { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_NINTENDO, USB_DEVICE_ID_NINTENDO_WIIMOTE2) }, { HID_USB_DEVICE(USB_VENDOR_ID_RAZER, USB_DEVICE_ID_RAZER_BLADE_14) }, { HID_USB_DEVICE(USB_VENDOR_ID_CMEDIA, USB_DEVICE_ID_CM6533) }, + { HID_USB_DEVICE(USB_VENDOR_ID_LENOVO, USB_DEVICE_ID_LENOVO_X1_COVER) }, { } }; diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index 3466f0d..1f08fb5 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h @@ -615,6 +615,7 @@ #define USB_DEVICE_ID_LENOVO_CUSBKBD 0x6047 #define USB_DEVICE_ID_LENOVO_CBTKBD 0x6048 #define USB_DEVICE_ID_LENOVO_TPPRODOCK 0x6067 +#define USB_DEVICE_ID_LENOVO_X1_COVER 0x6085 #define USB_VENDOR_ID_LG 0x1fd2 #define USB_DEVICE_ID_LG_MULTITOUCH 0x0064 diff --git a/drivers/hid/hid-lenovo.c b/drivers/hid/hid-lenovo.c index 1ac4ff4..4251aac 100644 --- a/drivers/hid/hid-lenovo.c +++ b/drivers/hid/hid-lenovo.c @@ -3,9 +3,11 @@ * - ThinkPad USB Keyboard with TrackPoint (tpkbd) * - ThinkPad Compact Bluetooth Keyboard with TrackPoint (cptkbd) * - ThinkPad Compact USB Keyboard with TrackPoint (cptkbd) + * - ThinkPad X1 Cover USB Keyboard with TrackPoint and Touchpad (tpx1cover) * * Copyright (c) 2012 Bernhard Seibold * Copyright (c) 2014 Jamie Lentin <jm(a)lentin.co.uk> + * Copyright (c) 2016 Dennis Wassenberg <dennis.wassenberg(a)secunet.com> */ /* @@ -19,11 +21,19 @@ #include <linux/sysfs.h> #include <linux/device.h> #include <linux/hid.h> +#include <linux/hid-lenovo.h> #include <linux/input.h> #include <linux/leds.h> #include "hid-ids.h" +struct led_table_entry { + struct led_classdev *dev; + uint8_t state; +}; + +static struct led_table_entry hid_lenovo_led_table[HID_LENOVO_LED_MAX]; + struct lenovo_drvdata_tpkbd { int led_state; struct led_classdev led_mute; @@ -42,6 +52,37 @@ struct lenovo_drvdata_cptkbd { int sensitivity; }; +struct lenovo_drvdata_tpx1cover { + uint16_t led_state; + uint8_t fnlock_state; + uint8_t led_present; + struct led_classdev led_mute; + struct led_classdev led_micmute; + struct led_classdev led_fnlock; +}; + +int hid_lenovo_led_set(int led_num, bool on) +{ + struct led_classdev *dev; + + if (led_num >= HID_LENOVO_LED_MAX) + return -EINVAL; + + dev = hid_lenovo_led_table[led_num].dev; + hid_lenovo_led_table[led_num].state = on; + + if (!dev) + return -ENODEV; + + if (!dev->brightness_set) + return -ENODEV; + + dev->brightness_set(dev, on ? LED_FULL : LED_OFF); + + return 0; +} +EXPORT_SYMBOL_GPL(hid_lenovo_led_set); + #define map_key_clear(c) hid_map_usage_clear(hi, usage, bit, max, EV_KEY, (c)) static const __u8 lenovo_pro_dock_need_fixup_collection[] = { @@ -86,6 +127,84 @@ static int lenovo_input_mapping_tpkbd(struct hid_device *hdev, return 0; } +static int lenovo_input_mapping_tpx1cover(struct hid_device *hdev, + struct hid_input *hi, struct hid_field *field, + struct hid_usage *usage, unsigned long **bit, int *max) +{ + if ((usage->hid & HID_USAGE_PAGE) == HID_UP_CONSUMER) { + switch (usage->hid & HID_USAGE) { + case 0x0001: // Unknown keys -> Idenditied by usage index! + map_key_clear(KEY_UNKNOWN); + switch (usage->usage_index) { + case 0x8: + input_set_capability(hi->input, EV_KEY, KEY_FN); + break; + + case 0x9: + input_set_capability(hi->input, EV_KEY, KEY_MICMUTE); + break; + + case 0xa: + input_set_capability(hi->input, EV_KEY, KEY_CONFIG); + break; + + case 0xb: + input_set_capability(hi->input, EV_KEY, KEY_SEARCH); + break; + + case 0xc: + input_set_capability(hi->input, EV_KEY, KEY_SETUP); + break; + + case 0xd: + input_set_capability(hi->input, EV_KEY, KEY_SWITCHVIDEOMODE); + break; + + case 0xe: + input_set_capability(hi->input, EV_KEY, KEY_RFKILL); + break; + + default: + return -1; + } + + return 1; + + case 0x006f: // Consumer.006f ---> Key.BrightnessUp + map_key_clear(KEY_BRIGHTNESSUP); + return 1; + + case 0x0070: // Consumer.0070 ---> Key.BrightnessDown + map_key_clear(KEY_BRIGHTNESSDOWN); + return 1; + + case 0x00b7:// Consumer.00b7 ---> Key.StopCD + map_key_clear(KEY_STOPCD); + return 1; + + case 0x00cd: // Consumer.00cd ---> Key.PlayPause + map_key_clear(KEY_PLAYPAUSE); + return 1; + + case 0x00e0: // Consumer.00e0 ---> Absolute.Volume + return 0; + case 0x00e2: // Consumer.00e2 ---> Key.Mute + map_key_clear(KEY_MUTE); + return 1; + + case 0x00e9: // Consumer.00e9 ---> Key.VolumeUp + map_key_clear(KEY_VOLUMEUP); + return 1; + + case 0x00ea: // Consumer.00ea ---> Key.VolumeDown + map_key_clear(KEY_VOLUMEDOWN); + return 1; + } + } + + return 0; +} + static int lenovo_input_mapping_cptkbd(struct hid_device *hdev, struct hid_input *hi, struct hid_field *field, struct hid_usage *usage, unsigned long **bit, int *max) @@ -172,6 +291,9 @@ static int lenovo_input_mapping(struct hid_device *hdev, case USB_DEVICE_ID_LENOVO_CBTKBD: return lenovo_input_mapping_cptkbd(hdev, hi, field, usage, bit, max); + case USB_DEVICE_ID_LENOVO_X1_COVER: + return lenovo_input_mapping_tpx1cover(hdev, hi, field, + usage, bit, max); default: return 0; } @@ -362,6 +484,143 @@ static int lenovo_event_cptkbd(struct hid_device *hdev, return 0; } +static enum led_brightness lenovo_led_brightness_get_tpx1cover( + struct led_classdev *led_cdev) +{ + struct device *dev = led_cdev->dev->parent; + struct hid_device *hdev = to_hid_device(dev); + struct lenovo_drvdata_tpx1cover *drv_data = hid_get_drvdata(hdev); + int led_nr = 0; + + if (led_cdev == &drv_data->led_mute) + led_nr = 0; + else if (led_cdev == &drv_data->led_micmute) + led_nr = 1; + else if (led_cdev == &drv_data->led_fnlock) + led_nr = 2; + else + return LED_OFF; + + return drv_data->led_state & (1 << led_nr) + ? LED_FULL + : LED_OFF; +} + +static void lenovo_led_brightness_set_tpx1cover(struct led_classdev *led_cdev, + enum led_brightness value) +{ + struct device *dev = led_cdev->dev->parent; + struct hid_device *hdev = to_hid_device(dev); + struct lenovo_drvdata_tpx1cover *drv_data = hid_get_drvdata(hdev); + struct hid_report *report; + int led_nr = -1; + int led_nr_hw = -1; + + if (led_cdev == &drv_data->led_mute) { + led_nr = 0; + led_nr_hw = 0x64; + } else if (led_cdev == &drv_data->led_micmute) { + led_nr = 1; + led_nr_hw = 0x74; + } else if (led_cdev == &drv_data->led_fnlock) { + led_nr = 2; + led_nr_hw = 0x54; + } else { + hid_warn(hdev, "Invalid LED to set.\n"); + return; + } + + if (value == LED_OFF) + drv_data->led_state &= ~(1 << led_nr); + else + drv_data->led_state |= 1 << led_nr; + + report = hdev->report_enum[HID_OUTPUT_REPORT].report_id_hash[9]; + if (report) { + report->field[0]->value[0] = led_nr_hw; + report->field[0]->value[1] = (drv_data->led_state & (1 << led_nr)) + ? 0x02 : 0x01; + hid_hw_request(hdev, report, HID_REQ_SET_REPORT); + } +} + +static int lenovo_event_tpx1cover(struct hid_device *hdev, + struct hid_field *field, struct hid_usage *usage, __s32 value) +{ + int ret = 0; + + if ((usage->hid & HID_USAGE_PAGE) == HID_UP_CONSUMER + && (usage->hid & HID_USAGE) == 0x0001) { + + if (usage->usage_index == 0x8 && value == 1) { + struct lenovo_drvdata_tpx1cover *drv_data = hid_get_drvdata(hdev); + + if (drv_data && drv_data->led_present) { + drv_data->fnlock_state = lenovo_led_brightness_get_tpx1cover( + &drv_data->led_fnlock) == LED_OFF ? 1 : 0; + lenovo_led_brightness_set_tpx1cover( + &drv_data->led_fnlock, + drv_data->fnlock_state ? LED_FULL : LED_OFF); + } + } + + if (usage->usage_index == 0x9 && value == 1) { + input_event(field->hidinput->input, EV_KEY, KEY_MICMUTE, 1); + input_sync(field->hidinput->input); + input_event(field->hidinput->input, EV_KEY, KEY_MICMUTE, 0); + input_sync(field->hidinput->input); + ret = 1; + } + + if (usage->usage_index == 0xa && value == 1) { + input_event(field->hidinput->input, EV_KEY, KEY_CONFIG, 1); + input_sync(field->hidinput->input); + input_event(field->hidinput->input, EV_KEY, KEY_CONFIG, 0); + input_sync(field->hidinput->input); + + ret = 1; + } + + if (usage->usage_index == 0xb && value == 1) { + input_event(field->hidinput->input, EV_KEY, KEY_SEARCH, 1); + input_sync(field->hidinput->input); + input_event(field->hidinput->input, EV_KEY, KEY_SEARCH, 0); + input_sync(field->hidinput->input); + + ret = 1; + } + + if (usage->usage_index == 0xc && value == 1) { + input_event(field->hidinput->input, EV_KEY, KEY_SETUP, 1); + input_sync(field->hidinput->input); + input_event(field->hidinput->input, EV_KEY, KEY_SETUP, 0); + input_sync(field->hidinput->input); + + ret = 1; + } + + if (usage->usage_index == 0xd && value == 1) { + input_event(field->hidinput->input, EV_KEY, KEY_SWITCHVIDEOMODE, 1); + input_sync(field->hidinput->input); + input_event(field->hidinput->input, EV_KEY, KEY_SWITCHVIDEOMODE, 0); + input_sync(field->hidinput->input); + + ret = 1; + } + + if (usage->usage_index == 0xe && value == 1) { + input_event(field->hidinput->input, EV_KEY, KEY_RFKILL, 1); + input_sync(field->hidinput->input); + input_event(field->hidinput->input, EV_KEY, KEY_RFKILL, 0); + input_sync(field->hidinput->input); + + ret = 1; + } + } + + return ret; +} + static int lenovo_event(struct hid_device *hdev, struct hid_field *field, struct hid_usage *usage, __s32 value) { @@ -369,6 +628,8 @@ static int lenovo_event(struct hid_device *hdev, struct hid_field *field, case USB_DEVICE_ID_LENOVO_CUSBKBD: case USB_DEVICE_ID_LENOVO_CBTKBD: return lenovo_event_cptkbd(hdev, field, usage, value); + case USB_DEVICE_ID_LENOVO_X1_COVER: + return lenovo_event_tpx1cover(hdev, field, usage, value); default: return 0; } @@ -731,6 +992,251 @@ static int lenovo_probe_tpkbd(struct hid_device *hdev) return ret; } +static int lenovo_probe_tpx1cover_configure(struct hid_device *hdev) +{ + struct hid_report *report = hdev->report_enum[HID_OUTPUT_REPORT].report_id_hash[9]; + struct lenovo_drvdata_tpx1cover *drv_data = hid_get_drvdata(hdev); + + if (!drv_data) + return -ENODEV; + + if (!report) + return -ENOENT; + + report->field[0]->value[0] = 0x54; + report->field[0]->value[1] = 0x20; + hid_hw_request(hdev, report, HID_REQ_SET_REPORT); + hid_hw_wait(hdev); + + report->field[0]->value[0] = 0x54; + report->field[0]->value[1] = 0x08; + hid_hw_request(hdev, report, HID_REQ_SET_REPORT); + hid_hw_wait(hdev); + + report->field[0]->value[0] = 0xA0; + report->field[0]->value[1] = 0x02; + hid_hw_request(hdev, report, HID_REQ_SET_REPORT); + hid_hw_wait(hdev); + + lenovo_led_brightness_set_tpx1cover(&drv_data->led_mute, + hid_lenovo_led_table[HID_LENOVO_LED_MUTE].state ? LED_FULL : LED_OFF); + hid_hw_wait(hdev); + + lenovo_led_brightness_set_tpx1cover(&drv_data->led_micmute, + hid_lenovo_led_table[HID_LENOVO_LED_MICMUTE].state ? LED_FULL : LED_OFF); + hid_hw_wait(hdev); + + lenovo_led_brightness_set_tpx1cover(&drv_data->led_fnlock, LED_FULL); + + return 0; +} + +static int lenovo_probe_tpx1cover_special_functions(struct hid_device *hdev) +{ + struct device *dev = &hdev->dev; + struct lenovo_drvdata_tpx1cover *drv_data = NULL; + + size_t name_sz = strlen(dev_name(dev)) + 16; + char *name_led = NULL; + + struct hid_report *report; + bool report_match = 1; + + int ret = 0; + + report = hid_validate_values(hdev, HID_INPUT_REPORT, 2, 0, 3); + report_match &= report ? 1 : 0; + report = hid_validate_values(hdev, HID_INPUT_REPORT, 3, 0, 16); + report_match &= report ? 1 : 0; + report = hid_validate_values(hdev, HID_OUTPUT_REPORT, 9, 0, 2); + report_match &= report ? 1 : 0; + report = hid_validate_values(hdev, HID_FEATURE_REPORT, 32, 0, 1); + report_match &= report ? 1 : 0; + report = hid_validate_values(hdev, HID_FEATURE_REPORT, 84, 0, 1); + report_match &= report ? 1 : 0; + report = hid_validate_values(hdev, HID_FEATURE_REPORT, 100, 0, 1); + report_match &= report ? 1 : 0; + report = hid_validate_values(hdev, HID_FEATURE_REPORT, 116, 0, 1); + report_match &= report ? 1 : 0; + report = hid_validate_values(hdev, HID_FEATURE_REPORT, 132, 0, 1); + report_match &= report ? 1 : 0; + report = hid_validate_values(hdev, HID_FEATURE_REPORT, 144, 0, 1); + report_match &= report ? 1 : 0; + report = hid_validate_values(hdev, HID_FEATURE_REPORT, 162, 0, 1); + report_match &= report ? 1 : 0; + + if (!report_match) { + ret = -ENODEV; + goto err; + } + + drv_data = devm_kzalloc(&hdev->dev, + sizeof(struct lenovo_drvdata_tpx1cover), + GFP_KERNEL); + + if (!drv_data) { + hid_err(hdev, + "Could not allocate memory for tpx1cover driver data\n"); + ret = -ENOMEM; + goto err; + } + + name_led = devm_kzalloc(&hdev->dev, name_sz, GFP_KERNEL); + if (!name_led) { + hid_err(hdev, "Could not allocate memory for mute led data\n"); + ret = -ENOMEM; + goto err_cleanup; + } + snprintf(name_led, name_sz, "%s:amber:mute", dev_name(dev)); + + drv_data->led_mute.name = name_led; + drv_data->led_mute.brightness_get = lenovo_led_brightness_get_tpx1cover; + drv_data->led_mute.brightness_set = lenovo_led_brightness_set_tpx1cover; + drv_data->led_mute.dev = dev; + hid_lenovo_led_table[HID_LENOVO_LED_MUTE].dev = &drv_data->led_mute; + led_classdev_register(dev, &drv_data->led_mute); + + + name_led = devm_kzalloc(&hdev->dev, name_sz, GFP_KERNEL); + if (!name_led) { + hid_err(hdev, + "Could not allocate memory for mic mute led data\n"); + ret = -ENOMEM; + goto err_cleanup; + } + snprintf(name_led, name_sz, "%s:amber:micmute", dev_name(dev)); + + drv_data->led_micmute.name = name_led; + drv_data->led_micmute.brightness_get = lenovo_led_brightness_get_tpx1cover; + drv_data->led_micmute.brightness_set = lenovo_led_brightness_set_tpx1cover; + drv_data->led_micmute.dev = dev; + hid_lenovo_led_table[HID_LENOVO_LED_MICMUTE].dev = &drv_data->led_micmute; + led_classdev_register(dev, &drv_data->led_micmute); + + + name_led = devm_kzalloc(&hdev->dev, name_sz, GFP_KERNEL); + if (!name_led) { + hid_err(hdev, + "Could not allocate memory for FN lock led data\n"); + ret = -ENOMEM; + goto err_cleanup; + } + + snprintf(name_led, name_sz, "%s:amber:fnlock", dev_name(dev)); + + drv_data->led_fnlock.name = name_led; + drv_data->led_fnlock.brightness_get = lenovo_led_brightness_get_tpx1cover; + drv_data->led_fnlock.brightness_set = lenovo_led_brightness_set_tpx1cover; + drv_data->led_fnlock.dev = dev; + hid_lenovo_led_table[HID_LENOVO_LED_FNLOCK].dev = &drv_data->led_fnlock; + led_classdev_register(dev, &drv_data->led_fnlock); + + drv_data->led_state = 0; + drv_data->fnlock_state = 1; + drv_data->led_present = 1; + + hid_set_drvdata(hdev, drv_data); + + return lenovo_probe_tpx1cover_configure(hdev); + +err_cleanup: + if (drv_data->led_fnlock.name) { + led_classdev_unregister(&drv_data->led_fnlock); + devm_kfree(&hdev->dev, (void *) drv_data->led_fnlock.name); + } + + if (drv_data->led_micmute.name) { + led_classdev_unregister(&drv_data->led_micmute); + devm_kfree(&hdev->dev, (void *) drv_data->led_micmute.name); + } + + if (drv_data->led_mute.name) { + led_classdev_unregister(&drv_data->led_mute); + devm_kfree(&hdev->dev, (void *) drv_data->led_mute.name); + } + + if (drv_data) + kfree(drv_data); + +err: + return ret; +} + +static int lenovo_probe_tpx1cover_touch(struct hid_device *hdev) +{ + struct hid_report *report; + bool report_match = 1; + int ret = 0; + + report = hid_validate_values(hdev, HID_INPUT_REPORT, 2, 0, 2); + report_match &= report ? 1 : 0; + report = hid_validate_values(hdev, HID_INPUT_REPORT, 2, 1, 2); + report_match &= report ? 1 : 0; + report = hid_validate_values(hdev, HID_INPUT_REPORT, 11, 0, 61); + report_match &= report ? 1 : 0; + report = hid_validate_values(hdev, HID_INPUT_REPORT, 12, 0, 61); + report_match &= report ? 1 : 0; + report = hid_validate_values(hdev, HID_INPUT_REPORT, 16, 0, 3); + report_match &= report ? 1 : 0; + report = hid_validate_values(hdev, HID_INPUT_REPORT, 16, 1, 2); + report_match &= report ? 1 : 0; + report = hid_validate_values(hdev, HID_OUTPUT_REPORT, 9, 0, 20); + report_match &= report ? 1 : 0; + report = hid_validate_values(hdev, HID_OUTPUT_REPORT, 10, 0, 20); + report_match &= report ? 1 : 0; + report = hid_validate_values(hdev, HID_FEATURE_REPORT, 14, 0, 1); + report_match &= report ? 1 : 0; + report = hid_validate_values(hdev, HID_FEATURE_REPORT, 15, 0, 3); + report_match &= report ? 1 : 0; + + if (!report_match) + ret = -ENODEV; + + return ret; +} + +static int lenovo_probe_tpx1cover(struct hid_device *hdev) +{ + int ret = 0; + + /* + * Probing for special function keys and LED control -> usb intf 1 + * Probing for touch input -> usb intf 2 (handled by rmi4 driver) + * Other (keyboard) -> usb intf 0 + */ + if (!lenovo_probe_tpx1cover_special_functions(hdev)) { + // special function keys and LED control + ret = 0; + } else if (!lenovo_probe_tpx1cover_touch(hdev)) { + // handled by rmi + ret = -ENODEV; + } else { + // keyboard + struct lenovo_drvdata_tpx1cover *drv_data; + + drv_data = devm_kzalloc(&hdev->dev, + sizeof(struct lenovo_drvdata_tpx1cover), + GFP_KERNEL); + + if (!drv_data) { + hid_err(hdev, + "Could not allocate memory for tpx1cover driver data\n"); + ret = -ENOMEM; + goto out; + } + + drv_data->led_state = 0; + drv_data->led_present = 0; + drv_data->fnlock_state = 0; + hid_set_drvdata(hdev, drv_data); + + ret = 0; + } + +out: + return ret; +} + static int lenovo_probe_cptkbd(struct hid_device *hdev) { int ret; @@ -803,6 +1309,9 @@ static int lenovo_probe(struct hid_device *hdev, case USB_DEVICE_ID_LENOVO_CBTKBD: ret = lenovo_probe_cptkbd(hdev); break; + case USB_DEVICE_ID_LENOVO_X1_COVER: + ret = lenovo_probe_tpx1cover(hdev); + break; default: ret = 0; break; @@ -843,6 +1352,42 @@ static void lenovo_remove_cptkbd(struct hid_device *hdev) &lenovo_attr_group_cptkbd); } +static void lenovo_remove_tpx1cover(struct hid_device *hdev) +{ + struct lenovo_drvdata_tpx1cover *drv_data = hid_get_drvdata(hdev); + + if (!drv_data) + return; + + if (drv_data->led_present) { + if (drv_data->led_fnlock.name) { + hid_lenovo_led_table[HID_LENOVO_LED_FNLOCK].dev = NULL; + + led_classdev_unregister(&drv_data->led_fnlock); + devm_kfree(&hdev->dev, (void *) drv_data->led_fnlock.name); + } + + if (drv_data->led_micmute.name) { + hid_lenovo_led_table[HID_LENOVO_LED_MICMUTE].dev = NULL; + + led_classdev_unregister(&drv_data->led_micmute); + devm_kfree(&hdev->dev, (void *) drv_data->led_micmute.name); + } + + if (drv_data->led_mute.name) { + hid_lenovo_led_table[HID_LENOVO_LED_MUTE].dev = NULL; + + led_classdev_unregister(&drv_data->led_mute); + devm_kfree(&hdev->dev, (void *) drv_data->led_mute.name); + } + } + + if (drv_data) + devm_kfree(&hdev->dev, drv_data); + + hid_set_drvdata(hdev, NULL); +} + static void lenovo_remove(struct hid_device *hdev) { switch (hdev->product) { @@ -853,6 +1398,9 @@ static void lenovo_remove(struct hid_device *hdev) case USB_DEVICE_ID_LENOVO_CBTKBD: lenovo_remove_cptkbd(hdev); break; + case USB_DEVICE_ID_LENOVO_X1_COVER: + lenovo_remove_tpx1cover(hdev); + break; } hid_hw_stop(hdev); @@ -883,6 +1431,7 @@ static int lenovo_input_configured(struct hid_device *hdev, { HID_USB_DEVICE(USB_VENDOR_ID_LENOVO, USB_DEVICE_ID_LENOVO_CUSBKBD) }, { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_LENOVO, USB_DEVICE_ID_LENOVO_CBTKBD) }, { HID_USB_DEVICE(USB_VENDOR_ID_LENOVO, USB_DEVICE_ID_LENOVO_TPPRODOCK) }, + { HID_USB_DEVICE(USB_VENDOR_ID_LENOVO, USB_DEVICE_ID_LENOVO_X1_COVER) }, { } }; diff --git a/include/linux/hid-lenovo.h b/include/linux/hid-lenovo.h new file mode 100644 index 0000000..d0b0145 --- /dev/null +++ b/include/linux/hid-lenovo.h @@ -0,0 +1,15 @@ + +#ifndef __HID_LENOVO_H__ +#define __HID_LENOVO_H__ + + +enum { + HID_LENOVO_LED_MUTE, + HID_LENOVO_LED_MICMUTE, + HID_LENOVO_LED_FNLOCK, + HID_LENOVO_LED_MAX, +}; + +int hid_lenovo_led_set(int led_num, bool on); + +#endif /* __HID_LENOVO_H_ */ -- 1.9.1

2 4

[alsa-devel] [PATCH v2 0/8] ASoC: sunxi: Add support for audio codec in A23/H3 SoCs
by Chen-Yu Tsai 09 Dec '16

09 Dec '16

Hi everyone, This is v2 of my Allwinner A23 and H3 audio codec support series. Changes since v1: - Use DEFINE_RES_MEM for the analog path controls block resources. - Added Rob's ack. This series adds support for the audio codec found in Allwinner A23 and H3 SoCs. The design and data paths are similar to the audio codec found in earlier SoCs such as the A31. The analog audio paths are symmetrical with left/right channels and down-mix selectors for mono differential output. What deviates from previous SoCs is that the analog path controls have been moved to a separate control bus, accessed through a message box like register interface in the PRCM block. This necessitates writing a separate component driver for it, which is then tied into the sound card as an ASoC auxiliary device. Patch 1 adds the analog path controls block to the sun6i-prcm driver as a sub-device, for the A23. The H3 currently does not use the PRCM driver. Patch 2 adds PCM and card support for the A23 codec to the sun4i-codec driver. Patch 3 adds a device node for the analog path controls block to the A23 dtsi. Patch 4 adds a device node for the audio codec, and the phandle for the analog path controls block to the A23 dtsi. Patch 5 enables the audio codec for the A23 Q8 tablets. On these tablets the headphone output is driven in DC coupled, or "direct drive", mode. Patch 6 adds PCM and card support for the H3 codec to the sun4i-codec driver. Patch 7 adds device nodes for the audio codec and analog path controls block to the H3 dtsi. Patch 8 enables the audio codec on the Orange Pi PC. The audio output jack on the board is tied to the line out pins on the SoC. Please take a look and let me know what you think. In addition, the sun4i-codec driver is getting pretty large. Maybe we want to split the different parts into different files? Regards ChenYu Chen-Yu Tsai (8): mfd: sun6i-prcm: Add codec analog controls sub-device for Allwinner A23 ASoC: sun4i-codec: Add support for A23 codec ARM: dts: sun8i: Add codec analog path controls node in PRCM for A23/A33 ARM: dts: sun8i-a23: Add device node for internal audio codec ARM: dts: sun8i-a23: q8-tablet: Enable internal audio codec ASoC: sun4i-codec: Add support for H3 codec ARM: dts: sun8i-h3: Add device nodes for audio codec and its analog controls ARM: dts: sun8i-h3: orange-pi-pc: Enable audio codec .../devicetree/bindings/sound/sun4i-codec.txt | 14 +- arch/arm/boot/dts/sun8i-a23-a33.dtsi | 4 + arch/arm/boot/dts/sun8i-a23-q8-tablet.dts | 23 +++ arch/arm/boot/dts/sun8i-a23.dtsi | 16 ++ arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts | 8 + arch/arm/boot/dts/sun8i-h3.dtsi | 19 +++ drivers/mfd/sun6i-prcm.c | 13 ++ sound/soc/sunxi/sun4i-codec.c | 179 +++++++++++++++++++++ 8 files changed, 274 insertions(+), 2 deletions(-) -- 2.10.2

3 12

[alsa-devel] [PATCH 0/2] alsa-lib: dynamically adapt the avail_min on the slave
by Jiada Wang 09 Dec '16

09 Dec '16

When configuring avail_min to multiple of slave period size it can happen that user waits one slave period longer than needed for available data. Root cause is implicit grabbing of slave samples in avail_update operation. On next entering poll, the slave will wait for the avail_min threshold reached again, as he is not aware that there are already pending samples in the above layer which are not yet provided to user. Solution is to dynamically adapt the avail_min on the slave. Andreas Pape (2): plugin: dynamically update avail_min on slave rate: dynamic update avail_min on slave src/pcm/pcm_plugin.c | 48 +++++++++++++++++++++++++++++++++++++++++++++++- src/pcm/pcm_plugin.h | 3 +++ src/pcm/pcm_rate.c | 2 +- 3 files changed, 51 insertions(+), 2 deletions(-) -- 2.9.3

2 5

[alsa-devel] [PATCH v5 00/14] ASoC: add OF graph base simple-card
by Kuninori Morimoto 08 Dec '16

08 Dec '16

Hi Rob, Mark These are v5 of OF graph base simple-card patch-set. I removed new "type" property on v4 patch-set, but I noticed that it is necessary for ALSA SoC binding purpose. Thus, this v5 has it again. For example HDMI case, its DT will has video and sound ports. This DT will be used from HDMI Video driver and HDMI sound driver. HDMI video side can handle all somehow, because it is fully under its control. HDMI sound side will just references it. But it can't know total Video/Sound ports number which is necessary for ALSA SoC side. For example, if HDMI video had 4 ports, sound had 2 ports, this case, HDMI sound ports will be port@4, port@5. Here, ALSA SoC side needs to know total 2 sound port, and, it should be handled as 1st / 2nd port. It is impossible without "type" property. 1) - 7) : OF graph new feature 8) - 14) : OF graph base simple-card Kuninori Morimoto (14): 1) Documentation: of: add type property 2) of_graph: add of_graph_get_remote_endpoint() 3) of_graph: add of_graph_port_type_is() 4) of_graph: add of_graph_get_port_parent() 5) of_graph: add of_graph_get_top_port() 6) of_graph: add for_each_of_port() / for_each_of_endpoint_in_port() 7) of_graph: add of_graph_get_endpoint_count() 8) ASoC: simple-card-utils: adjust for graph on asoc_simple_card_parse_card_name 9) ASoC: simple-card-utils: add asoc_simple_card_parse_graph_dai() 10) ASoC: simple-card-utils: add asoc_simple_card_try_to_probe_graph_card() 11) ASoC: add simple-graph-card document 12) ASoC: add simple-graph-card support 13) ASoC: add simple-graph-scu-card document 14) ASoC: add simple-graph-scu-card support Documentation/devicetree/bindings/graph.txt | 21 + .../bindings/sound/simple-graph-card.txt | 67 +++ .../bindings/sound/simple-graph-scu-card.txt | 69 +++ drivers/of/base.c | 166 +++++++- include/linux/of_graph.h | 67 +++ include/sound/simple_card_utils.h | 13 + sound/soc/generic/Kconfig | 15 + sound/soc/generic/Makefile | 4 + sound/soc/generic/simple-card-utils.c | 98 ++++- sound/soc/generic/simple-card.c | 2 +- sound/soc/generic/simple-graph-card.c | 461 +++++++++++++++++++++ sound/soc/generic/simple-graph-scu-card.c | 441 ++++++++++++++++++++ sound/soc/generic/simple-scu-card.c | 2 +- 13 files changed, 1413 insertions(+), 13 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/simple-graph-card.txt create mode 100644 Documentation/devicetree/bindings/sound/simple-graph-scu-card.txt create mode 100644 sound/soc/generic/simple-graph-card.c create mode 100644 sound/soc/generic/simple-graph-scu-card.c -- 1.9.1

3 30

[alsa-devel] [PATCH v4 0/2] ALSA controls management using index/device/sub-devices fields
by Arnaud Pouliquen 07 Dec '16

07 Dec '16

Previous discussions summary: - Topic of the patchset: Patch concerns ASoc DAI drivers. Aim is to be able to instantiate PCM control using device field according to the associated PCM char device. For this, a relationship between DAIs PCM control and PCM char device needs to be establish. => Proposal is to add field in DAI driver struct to declare PCM controls that need to be linked to PCM character device on DAI link probing. - Limitation of the patchset: This patchset seems only a first step as 2 concerns are been highlighted: - Patch is limited to "static" DAI-link. This not responds to backend (no_pcm dai links) and some none-DAI codecs, that could register PCm controls. In theses cases it is not possible to establish relationship during probe. => No solution proposed for time beeing. - This patchset does not fix conflict of 2 "identical" PCM controls declared by 2 drivers. For instance, a conflict can exist between a PCM control created in DAI driver and the same control declared in a codec driver. As index field is forced to 0, prefix should be used in codec. => To discuss solution in a separate thread as issue already present without this patchset several approaches seem possible like using index field ( control auto indexation in ASoC) or prefix in Naming. V4: - [PATCH v4 1/2] ASoC: core: allow DAI PCM controls bound to PCM device Fix and rework error management in soc_link_dai_pcm_controls function. - [PATCH v4 2/2] ASoC: sti: bind pcm controls to pcm device. No change since V2. V3: - [PATCH v3 1/2] ASoC: core: allow DAI PCM controls bound to PCM device Code optimization based on Takashi Sakamoto suggestion - [RFC V2 3/3] ASoC: hdmi-codec: Example of PCM control bound to PCM device for multi patch suppressed as it was send as example in previous version. Patch is valid but can have impact on existing drivers as control device field value is updated - [PATCH v3 2/2] ASoC: sti: bind pcm controls to pcm device. No change vs V2 V2: http://www.spinics.net/lists/alsa-devel/msg57045.html Aim of this version is to continue discussion on DAI PCM control focused on ASoC drivers. In this V2 implementation in Soc-core is simplified to limit impact on existing code. Update of the RFC V1 based on discussions: - [RFC 4/4] iecset: allow to select control with device and sub-device numbers no more part of the RFC V2, will be discussed in a separate thread - [RFC 2/4] ALSA: control: increment index field for duplicated control. no more part of the RFC V2, no more need as RFC subject is PCM controls - [RFC V2 1/3] ASoC: core: allow DAI PCM controls bound to PCM device Patch reworked from V1 to simplify implementation - Binding is not done for Dai links tagged with no_pcm (DPCM). - no more possibility to add the controls after the DAI link probing. - [RFC V2 2/3] ASoC: sti: bind PCM controls to PCM device. - [RFC V2 3/3] ASoC: hdmi-codec: Example of PCM control bound to PCM device for multi Example of implementation in STI DAI driver and HDMI-codec drivers V1: http://www.spinics.net/lists/alsa-devel/msg56479.html 1) Alsa-utils patch - iecset: allow to select control with device and sub-device numbers This patch allows to access to 2 iec controls differentiated by device/sub-devices numbers => For me, this patch is mandatory to be able to address the ASoC IEC controls, in case of no fix is implemented to allows index field update in ASoC. 2) Alsa driver patches - ASoC: core: allow PCM control binding to PCM device Add relationship between DAIs PCM controls and PCM device. - ALSA: control: increment index field for duplicated control. Generic implementation of the patch proposed in HDA driver (http://git.kernel.org/cgit/linux/kernel/git/tiwai/sound.git/commit/?id=ea9b…) - ASoC: sti: use bind_pcm_ctl implementation of bind_pcm_ctl for sti driver. Arnaud Pouliquen (2): ASoC: core: allow DAI PCM controls bound to PCM device ASoC: sti: bind pcm controls to pcm device. include/sound/soc-dai.h | 4 ++++ sound/soc/soc-core.c | 35 +++++++++++++++++++++++++++++++++++ sound/soc/sti/sti_uniperif.c | 33 ++++----------------------------- 3 files changed, 43 insertions(+), 29 deletions(-) -- 1.9.1

3 5

[alsa-devel] [PATCH v2 0/3] ASoC: intel: atom: Add FW version information
by Sebastien Guiriec 05 Dec '16

05 Dec '16

This patch series is adding FW version information of SST. Version is both log as dev_info and sysfs entry. Update since V1: - sysfs entry is set to "FW not yet loaded" in case we do not have loaded the FW once Sebastien Guiriec (3): ASoC: intel: atom: Add debug information related to FW version ASoC: Intel: atom: save FW version ASoC: Intel: atom: Add sysfs entry in order to store FW version sound/soc/intel/atom/sst/sst.c | 39 ++++++++++++++++++++++++++++++++++++++ sound/soc/intel/atom/sst/sst.h | 1 + sound/soc/intel/atom/sst/sst_ipc.c | 10 +++++++++- 3 files changed, 49 insertions(+), 1 deletion(-) -- 2.9.3 --------------------------------------------------------------------- Intel Corporation SAS (French simplified joint stock company) Registered headquarters: "Les Montalets"- 2, rue de Paris, 92196 Meudon Cedex, France Registration Number: 302 456 199 R.C.S. NANTERRE Capital: 4,572,000 Euros This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). Any review or distribution by others is strictly prohibited. If you are not the intended recipient, please contact the sender and delete all copies.

3 5

[alsa-devel] [PATCH] ASoC: cs42l56: Fix misuse of regmap_update_bits
by Florian Vaussard 05 Dec '16

05 Dec '16

Using regmap_update_bits(..., mask, 1) with 'mask' following (1 << k) and k greater than 0 is wrong. Indeed, _regmap_update_bits will perform (mask & 1), which results in 0 if LSB of mask is 0. Thus the call regmap_update_bits(..., mask, 1) is in reality equivalent to regmap_update_bits(..., mask, 0). In such a case, the correct use is regmap_update_bits(..., mask, mask). This driver is performing such a mistake with the CS42L56_AIN*_REF_MASK masks, which equal 0x10, 0x20, 0x40 and 0x80. Fix the driver to make it consistent with the API. Please note that this change is untested, as I do not have this piece of hardware. Testers are welcome! Signed-off-by: Florian Vaussard <florian.vaussard(a)heig-vd.ch> --- sound/soc/codecs/cs42l56.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/sound/soc/codecs/cs42l56.c b/sound/soc/codecs/cs42l56.c index 3e2c046..cb6ca85 100644 --- a/sound/soc/codecs/cs42l56.c +++ b/sound/soc/codecs/cs42l56.c @@ -1277,19 +1277,23 @@ static int cs42l56_i2c_probe(struct i2c_client *i2c_client, if (cs42l56->pdata.ain1a_ref_cfg) regmap_update_bits(cs42l56->regmap, CS42L56_AIN_REFCFG_ADC_MUX, - CS42L56_AIN1A_REF_MASK, 1); + CS42L56_AIN1A_REF_MASK, + CS42L56_AIN1A_REF_MASK); if (cs42l56->pdata.ain1b_ref_cfg) regmap_update_bits(cs42l56->regmap, CS42L56_AIN_REFCFG_ADC_MUX, - CS42L56_AIN1B_REF_MASK, 1); + CS42L56_AIN1B_REF_MASK, + CS42L56_AIN1B_REF_MASK); if (cs42l56->pdata.ain2a_ref_cfg) regmap_update_bits(cs42l56->regmap, CS42L56_AIN_REFCFG_ADC_MUX, - CS42L56_AIN2A_REF_MASK, 1); + CS42L56_AIN2A_REF_MASK, + CS42L56_AIN2A_REF_MASK); if (cs42l56->pdata.ain2b_ref_cfg) regmap_update_bits(cs42l56->regmap, CS42L56_AIN_REFCFG_ADC_MUX, - CS42L56_AIN2B_REF_MASK, 1); + CS42L56_AIN2B_REF_MASK, + CS42L56_AIN2B_REF_MASK); if (cs42l56->pdata.micbias_lvl) regmap_update_bits(cs42l56->regmap, CS42L56_GAIN_BIAS_CTL, -- 2.5.5

4 3

[alsa-devel] [PATCH 1/2] ASoC: topology: Allow a widget to have multiple enum controls
by mengdong.lin＠linux.intel.com 05 Dec '16

05 Dec '16

From: Mengdong Lin <mengdong.lin(a)linux.intel.com> This patch can create multiple enumerated mixer controls for a widget. Previously topology kernel driver assumes a widget can have only one emumerated mixer control. We need to remove this restriction for Broxton. Its firmware modules (widgets) may need multiple enum controls based on the channel and MIC combination. No ABI change is needed. The ABI allows a widget to embed multiple controls. Reported-by: G Kranthi <gudishax.kranthikumar(a)intel.com> Signed-off-by: Mengdong Lin <mengdong.lin(a)linux.intel.com> diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c index 4dfdc65..63e1a50 100644 --- a/sound/soc/soc-topology.c +++ b/sound/soc/soc-topology.c @@ -486,21 +486,24 @@ static void remove_widget(struct snd_soc_component *comp, dobj->ops->widget_unload(comp, dobj); /* - * Dynamic Widgets either have 1 enum kcontrol or 1..N mixers. + * Dynamic Widgets either have 1..N enum kcontrols or mixers. * The enum may either have an array of values or strings. */ if (dobj->widget.kcontrol_enum) { /* enumerated widget mixer */ - struct soc_enum *se = - (struct soc_enum *)w->kcontrols[0]->private_value; + for (i = 0; i < w->num_kcontrols; i++) { + struct snd_kcontrol *kcontrol = w->kcontrols[i]; + struct soc_enum *se = + (struct soc_enum *)kcontrol->private_value; - snd_ctl_remove(card, w->kcontrols[0]); + snd_ctl_remove(card, kcontrol); - kfree(se->dobj.control.dvalues); - for (i = 0; i < se->items; i++) - kfree(se->dobj.control.dtexts[i]); + kfree(se->dobj.control.dvalues); + for (i = 0; i < se->items; i++) + kfree(se->dobj.control.dtexts[i]); - kfree(se); + kfree(se); + } kfree(w->kcontrol_news); } else { /* non enumerated widget mixer */ @@ -1256,98 +1259,105 @@ static struct snd_kcontrol_new *soc_tplg_dapm_widget_dmixer_create( } static struct snd_kcontrol_new *soc_tplg_dapm_widget_denum_create( - struct soc_tplg *tplg) + struct soc_tplg *tplg, int num_kcontrols) { struct snd_kcontrol_new *kc; struct snd_soc_tplg_enum_control *ec; struct soc_enum *se; - int i, err; - - ec = (struct snd_soc_tplg_enum_control *)tplg->pos; - tplg->pos += (sizeof(struct snd_soc_tplg_enum_control) + - ec->priv.size); - - /* validate kcontrol */ - if (strnlen(ec->hdr.name, SNDRV_CTL_ELEM_ID_NAME_MAXLEN) == - SNDRV_CTL_ELEM_ID_NAME_MAXLEN) - return NULL; + int i, j, err; - kc = kzalloc(sizeof(*kc), GFP_KERNEL); + kc = kcalloc(num_kcontrols, sizeof(*kc), GFP_KERNEL); if (kc == NULL) return NULL; - se = kzalloc(sizeof(*se), GFP_KERNEL); - if (se == NULL) - goto err; + for (i = 0; i < num_kcontrols; i++) { + ec = (struct snd_soc_tplg_enum_control *)tplg->pos; + /* validate kcontrol */ + if (strnlen(ec->hdr.name, SNDRV_CTL_ELEM_ID_NAME_MAXLEN) == + SNDRV_CTL_ELEM_ID_NAME_MAXLEN) + return NULL; + + se = kzalloc(sizeof(*se), GFP_KERNEL); + if (se == NULL) + goto err; - dev_dbg(tplg->dev, " adding DAPM widget enum control %s\n", - ec->hdr.name); + dev_dbg(tplg->dev, " adding DAPM widget enum control %s\n", + ec->hdr.name); - kc->name = ec->hdr.name; - kc->private_value = (long)se; - kc->iface = SNDRV_CTL_ELEM_IFACE_MIXER; - kc->access = ec->hdr.access; + kc[i].name = ec->hdr.name; + kc[i].private_value = (long)se; + kc[i].iface = SNDRV_CTL_ELEM_IFACE_MIXER; + kc[i].access = ec->hdr.access; - /* we only support FL/FR channel mapping atm */ - se->reg = tplc_chan_get_reg(tplg, ec->channel, SNDRV_CHMAP_FL); - se->shift_l = tplc_chan_get_shift(tplg, ec->channel, SNDRV_CHMAP_FL); - se->shift_r = tplc_chan_get_shift(tplg, ec->channel, SNDRV_CHMAP_FR); + /* we only support FL/FR channel mapping atm */ + se->reg = tplc_chan_get_reg(tplg, ec->channel, SNDRV_CHMAP_FL); + se->shift_l = tplc_chan_get_shift(tplg, ec->channel, + SNDRV_CHMAP_FL); + se->shift_r = tplc_chan_get_shift(tplg, ec->channel, + SNDRV_CHMAP_FR); - se->items = ec->items; - se->mask = ec->mask; - se->dobj.index = tplg->index; + se->items = ec->items; + se->mask = ec->mask; + se->dobj.index = tplg->index; - switch (ec->hdr.ops.info) { - case SND_SOC_TPLG_CTL_ENUM_VALUE: - case SND_SOC_TPLG_DAPM_CTL_ENUM_VALUE: - err = soc_tplg_denum_create_values(se, ec); - if (err < 0) { - dev_err(tplg->dev, "ASoC: could not create values for %s\n", - ec->hdr.name); + switch (ec->hdr.ops.info) { + case SND_SOC_TPLG_CTL_ENUM_VALUE: + case SND_SOC_TPLG_DAPM_CTL_ENUM_VALUE: + err = soc_tplg_denum_create_values(se, ec); + if (err < 0) { + dev_err(tplg->dev, "ASoC: could not create values for %s\n", + ec->hdr.name); + goto err_se; + } + /* fall through to create texts */ + case SND_SOC_TPLG_CTL_ENUM: + case SND_SOC_TPLG_DAPM_CTL_ENUM_DOUBLE: + case SND_SOC_TPLG_DAPM_CTL_ENUM_VIRT: + err = soc_tplg_denum_create_texts(se, ec); + if (err < 0) { + dev_err(tplg->dev, "ASoC: could not create texts for %s\n", + ec->hdr.name); + goto err_se; + } + break; + default: + dev_err(tplg->dev, "ASoC: invalid enum control type %d for %s\n", + ec->hdr.ops.info, ec->hdr.name); goto err_se; } - /* fall through to create texts */ - case SND_SOC_TPLG_CTL_ENUM: - case SND_SOC_TPLG_DAPM_CTL_ENUM_DOUBLE: - case SND_SOC_TPLG_DAPM_CTL_ENUM_VIRT: - err = soc_tplg_denum_create_texts(se, ec); + + /* map io handlers */ + err = soc_tplg_kcontrol_bind_io(&ec->hdr, &kc[i], tplg); + if (err) { + soc_control_err(tplg, &ec->hdr, ec->hdr.name); + goto err_se; + } + + /* pass control to driver for optional further init */ + err = soc_tplg_init_kcontrol(tplg, &kc[i], + (struct snd_soc_tplg_ctl_hdr *)ec); if (err < 0) { - dev_err(tplg->dev, "ASoC: could not create texts for %s\n", + dev_err(tplg->dev, "ASoC: failed to init %s\n", ec->hdr.name); goto err_se; } - break; - default: - dev_err(tplg->dev, "ASoC: invalid enum control type %d for %s\n", - ec->hdr.ops.info, ec->hdr.name); - goto err_se; - } - /* map io handlers */ - err = soc_tplg_kcontrol_bind_io(&ec->hdr, kc, tplg); - if (err) { - soc_control_err(tplg, &ec->hdr, ec->hdr.name); - goto err_se; - } - - /* pass control to driver for optional further init */ - err = soc_tplg_init_kcontrol(tplg, kc, - (struct snd_soc_tplg_ctl_hdr *)ec); - if (err < 0) { - dev_err(tplg->dev, "ASoC: failed to init %s\n", - ec->hdr.name); - goto err_se; + tplg->pos += (sizeof(struct snd_soc_tplg_enum_control) + + ec->priv.size); } return kc; err_se: - /* free values and texts */ - kfree(se->dobj.control.dvalues); - for (i = 0; i < ec->items; i++) - kfree(se->dobj.control.dtexts[i]); + for (; i >= 0; i--) { + /* free values and texts */ + se = (struct soc_enum *)kc[i].private_value; + kfree(se->dobj.control.dvalues); + for (j = 0; j < ec->items; j++) + kfree(se->dobj.control.dtexts[j]); - kfree(se); + kfree(se); + } err: kfree(kc); @@ -1499,9 +1509,10 @@ static int soc_tplg_dapm_widget_create(struct soc_tplg *tplg, case SND_SOC_TPLG_DAPM_CTL_ENUM_VIRT: case SND_SOC_TPLG_DAPM_CTL_ENUM_VALUE: template.dobj.widget.kcontrol_enum = 1; - template.num_kcontrols = 1; + template.num_kcontrols = w->num_kcontrols; template.kcontrol_news = - soc_tplg_dapm_widget_denum_create(tplg); + soc_tplg_dapm_widget_denum_create(tplg, + template.num_kcontrols); if (!template.kcontrol_news) { ret = -ENOMEM; goto hdr_err; -- 2.5.0

2 1

[alsa-devel] [PATCH 2/2] ASoC: topology: Only free TLV for volume mixers of a widget
by mengdong.lin＠linux.intel.com 05 Dec '16

05 Dec '16

From: Mengdong Lin <mengdong.lin(a)linux.intel.com> This patch will check the type of embedded controls for a widget, and only free the TLV of volume mixers. Bytes controls don't have TLV. Just free the private value which is used as struct soc_mixer_control for volume mixers or soc_bytes_ext for bytes controls. No need to cast to these types before freeing it. Signed-off-by: Mengdong Lin <mengdong.lin(a)linux.intel.com> diff --git a/include/sound/soc-topology.h b/include/sound/soc-topology.h index d318fe4..86c884a 100644 --- a/include/sound/soc-topology.h +++ b/include/sound/soc-topology.h @@ -53,7 +53,7 @@ struct snd_soc_dobj_control { /* dynamic widget object */ struct snd_soc_dobj_widget { - unsigned int kcontrol_enum:1; /* this widget is an enum kcontrol */ + unsigned int kcontrol_type; /* kcontrol type: mixer, enum, bytes */ }; /* generic dynamic object - all dynamic objects belong to this struct */ diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c index 63e1a50..11feb19 100644 --- a/sound/soc/soc-topology.c +++ b/sound/soc/soc-topology.c @@ -489,7 +489,7 @@ static void remove_widget(struct snd_soc_component *comp, * Dynamic Widgets either have 1..N enum kcontrols or mixers. * The enum may either have an array of values or strings. */ - if (dobj->widget.kcontrol_enum) { + if (dobj->widget.kcontrol_type == SND_SOC_TPLG_TYPE_ENUM) { /* enumerated widget mixer */ for (i = 0; i < w->num_kcontrols; i++) { struct snd_kcontrol *kcontrol = w->kcontrols[i]; @@ -506,16 +506,21 @@ static void remove_widget(struct snd_soc_component *comp, } kfree(w->kcontrol_news); } else { - /* non enumerated widget mixer */ + /* volume mixer or bytes controls */ for (i = 0; i < w->num_kcontrols; i++) { struct snd_kcontrol *kcontrol = w->kcontrols[i]; - struct soc_mixer_control *sm = - (struct soc_mixer_control *) kcontrol->private_value; - kfree(w->kcontrols[i]->tlv.p); + if (dobj->widget.kcontrol_type + == SND_SOC_TPLG_TYPE_MIXER) + kfree(kcontrol->tlv.p); - snd_ctl_remove(card, w->kcontrols[i]); - kfree(sm); + snd_ctl_remove(card, kcontrol); + + /* Private value is used as struct soc_mixer_control + * for volume mixers or soc_bytes_ext for bytes + * controls. + */ + kfree((void *)kcontrol->private_value); } kfree(w->kcontrol_news); } @@ -1439,6 +1444,7 @@ static int soc_tplg_dapm_widget_create(struct soc_tplg *tplg, struct snd_soc_dapm_widget template, *widget; struct snd_soc_tplg_ctl_hdr *control_hdr; struct snd_soc_card *card = tplg->comp->card; + unsigned int kcontrol_type; int ret = 0; if (strnlen(w->name, SNDRV_CTL_ELEM_ID_NAME_MAXLEN) == @@ -1494,6 +1500,7 @@ static int soc_tplg_dapm_widget_create(struct soc_tplg *tplg, case SND_SOC_TPLG_CTL_VOLSW_XR_SX: case SND_SOC_TPLG_CTL_RANGE: case SND_SOC_TPLG_DAPM_CTL_VOLSW: + kcontrol_type = SND_SOC_TPLG_TYPE_MIXER; /* volume mixer */ template.num_kcontrols = w->num_kcontrols; template.kcontrol_news = soc_tplg_dapm_widget_dmixer_create(tplg, @@ -1508,7 +1515,7 @@ static int soc_tplg_dapm_widget_create(struct soc_tplg *tplg, case SND_SOC_TPLG_DAPM_CTL_ENUM_DOUBLE: case SND_SOC_TPLG_DAPM_CTL_ENUM_VIRT: case SND_SOC_TPLG_DAPM_CTL_ENUM_VALUE: - template.dobj.widget.kcontrol_enum = 1; + kcontrol_type = SND_SOC_TPLG_TYPE_ENUM; /* enumerated mixer */ template.num_kcontrols = w->num_kcontrols; template.kcontrol_news = soc_tplg_dapm_widget_denum_create(tplg, @@ -1519,6 +1526,7 @@ static int soc_tplg_dapm_widget_create(struct soc_tplg *tplg, } break; case SND_SOC_TPLG_CTL_BYTES: + kcontrol_type = SND_SOC_TPLG_TYPE_BYTES; /* bytes control */ template.num_kcontrols = w->num_kcontrols; template.kcontrol_news = soc_tplg_dapm_widget_dbytes_create(tplg, @@ -1555,6 +1563,7 @@ static int soc_tplg_dapm_widget_create(struct soc_tplg *tplg, } widget->dobj.type = SND_SOC_DOBJ_WIDGET; + widget->dobj.widget.kcontrol_type = kcontrol_type; widget->dobj.ops = tplg->ops; widget->dobj.index = tplg->index; kfree(template.sname); -- 2.5.0

3 2

[alsa-devel] [PATCH 0/2] ASoC: cq93vc: enable compiling on COMPILE_TEST
by Kuninori Morimoto 05 Dec '16

05 Dec '16

Hi Lee, Mark Current cq93vc sound codec indicates that it has MFD_DAVINCI_VOICECODEC dependency, but it doesn't. This means we can compile it from non DAVINCE environment by COMPILE_TEST. These patches solve this issue. I tested this on ARCH=x86 + make allyesconfig, and ARCH=ARM + shmobile_defconfig + COMPILE_TEST. Kuninori Morimoto (2): mfd: davinci_voicecodec: tidyup header difinitions ASoC: cq93vc: remove MFD_DAVINCI_VOICECODEC dependency for CQ0093VC drivers/mfd/davinci_voicecodec.c | 1 + include/linux/mfd/davinci_voicecodec.h | 4 ---- sound/soc/codecs/Kconfig | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) -- 1.9.1

3 9