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

[alsa-devel] [PATCH V3 1/2] ASoC: samsung: include gpio consumer.h
by Fabian Frederick 09 Dec '16

09 Dec '16

Fix the following build errors on X86_32 !GPIOLIB sound/soc/samsung/tm2_wm5110.c:220:3: error: implicit declaration of function 'gpiod_set_value_cansleep' [-Werror=implicit-function-declaration] sound/soc/samsung/tm2_wm5110.c:438:24: error: implicit declaration of function 'devm_gpiod_get' [-Werror=implicit-function-declaration] Reviewed-by: Krzysztof Kozlowski <krzk(a)kernel.org> Signed-off-by: Fabian Frederick <fabf(a)skynet.be> --- V3: -Add reviewed-by V2: -Add configuration settings (suggested by Krzysztof Kozlowski) sound/soc/samsung/tm2_wm5110.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/samsung/tm2_wm5110.c b/sound/soc/samsung/tm2_wm5110.c index 5cdf7d1..24cc9d6 100644 --- a/sound/soc/samsung/tm2_wm5110.c +++ b/sound/soc/samsung/tm2_wm5110.c @@ -12,6 +12,7 @@ #include <linux/clk.h> #include <linux/gpio.h> +#include <linux/gpio/consumer.h> #include <linux/module.h> #include <linux/of.h> #include <sound/pcm_params.h> -- 2.7.4

1 0

[alsa-devel] [PATCH v5 0/2] Add platform clock for BayTrail platforms
by Irina Tirdea 09 Dec '16

09 Dec '16

These patches specifically enable the audio MCLK required by Baytrail CR devices. It is the remaining part of a bigger set of patches (already merged in Mark's tree) that enable sound for Baytrail CR devices (especially Asus T100TAF) [1]. They include the clock driver and a move of the non-architectural pmc_atom driver code into drivers/platform/x86. [1] http://mailman.alsa-project.org/pipermail/alsa-devel/2016-August/111704.html Changes from v4: - move the pmc_atom driver from arch/x86/platform/atom to drivers/platform/x86 Changes from v3: - replace devm_kzalloc with devm_kcalloc - add x86 architecture maintainers Changes from v2: - move clk platform data structures to a separate include file - store clk_hw pointer for the fixed rate clocks Changes from v1: - register the clk device as child of pmc device - pass iomem pointer from pmc driver to clk driver to avoid using pmc_atom_read()/write() and use readl/writel API instead - use devm_clk_hw_register/clkdev_hw_create instead of clk_register/clkdev_create Irina Tirdea (2): arch/x86/platform/atom: Move pmc_atom to drivers/platform/x86 clk: x86: Add Atom PMC platform clocks arch/x86/Kconfig | 4 - arch/x86/platform/atom/Makefile | 1 - drivers/acpi/acpi_lpss.c | 2 +- drivers/clk/x86/Makefile | 1 + drivers/clk/x86/clk-byt-plt.c | 380 +++++++++++++++++++++ drivers/platform/x86/Kconfig | 6 + drivers/platform/x86/Makefile | 1 + .../atom => drivers/platform/x86}/pmc_atom.c | 81 ++++- include/linux/platform_data/x86/clk-byt-plt.h | 31 ++ .../linux/platform_data/x86}/pmc_atom.h | 3 + 10 files changed, 499 insertions(+), 11 deletions(-) create mode 100644 drivers/clk/x86/clk-byt-plt.c rename {arch/x86/platform/atom => drivers/platform/x86}/pmc_atom.c (88%) create mode 100644 include/linux/platform_data/x86/clk-byt-plt.h rename {arch/x86/include/asm => include/linux/platform_data/x86}/pmc_atom.h (98%) -- 1.9.1

4 5

[alsa-devel] [alsa-utils][PATCH 0/5] Add man page for alsaucm + other fixes
by Antonio Ospite 09 Dec '16

09 Dec '16

Hi, while adding the alsaucm man page (patch 4/5) I noticed some other things worth fixing, so here is the whole patch set. In patch 4/5 the reStructuredText content is exactly the same reviewed by Liam, so I put his ACK in the commit message. Thanks, Antonio Antonio Ospite (5): alsaucm: mention the "list1" command in the usage output configure.ac: fix the check for xmlto availability configure.ac: add a check for rst2man, a reStructuredText man page generator alsaucm: add a man page, generated from reStructuredText INSTALL: document how to configure a build for installation in a local dir .gitignore | 1 + INSTALL | 7 ++ alsaucm/Makefile.am | 7 ++ alsaucm/alsaucm.rst | 235 ++++++++++++++++++++++++++++++++++++++++++++++++++++ alsaucm/usecase.c | 3 +- configure.ac | 15 +++- 6 files changed, 264 insertions(+), 4 deletions(-) create mode 100644 alsaucm/alsaucm.rst -- Antonio Ospite https://ao2.it https://twitter.com/ao2it A: Because it messes up the order in which people normally read text. See http://en.wikipedia.org/wiki/Posting_style Q: Why is top-posting such a bad thing?

2 7

[alsa-devel] [PATCH v6 0/3] Media Device Allocator API
by Shuah Khan 09 Dec '16

09 Dec '16

Media Device Allocator API to allows multiple drivers share a media device. Using this API, drivers can allocate a media device with the shared struct device as the key. Once the media device is allocated by a driver, other drivers can get a reference to it. The media device is released when all the references are released. Patches 0001 and 0002 are rebased to 4.9-rc7. Patch 0003 for snd-usb-audio is a rebase of the patch that was tested with the original Media Device Allocator patch series. snd-usb-audio patch includes the fixes found during 4.7-rc1 time in the original snd-usb-audio patch. Changes to patches in this series: Changes to patch 0001 since v5: (comments from Mauro and Sakari) - Removed struct device from media_device_instance. mdev.dev is used instead. - Added documentation. Changes to patch 0002: - No changes since patch v2, applies cleanly on top of the following: media: Protect enable_source and disable_source handler code paths https://lkml.org/lkml/2016/11/29/1001 Changes to patch 0003: - Changed to hold graph_mutex to check and call enable_source and disable_source handlers - to match au0828 doing the same in: media: Protect enable_source and disable_source handler code paths https://lkml.org/lkml/2016/11/29/1001 Changes to patch 0001 since v4: - Addressed Sakari's review comments with the exception of opting to not introduce media_device_usb_allocate() macro, and to not add a new routine to find media device instance to avoid a one line check. Changes to patch 0001 since v3: - Fixed undefined reference to `__media_device_usb_init compile error when CONFIG_USB is disabled. - Fixed kernel paging error when accessing /dev/mediaX after rmmod of the module that owns the media_device. The fix bumps the reference count for the owner when second driver comes along to share the media_device. If au0828 owns the media_device, then snd_usb_audio will bump the refcount for au0828, so it won't get deleted and vice versa. Changes to patch 0002 since v2: - Updated media_device_delete() to pass in module name. Changes to patch 0003 since the last version in 4.7-rc1: - Included fixes to bugs found during testing. - Updated to use the Media Allocator API. This patch series has been tested with au0828 and snd-usb-audio drivers. Ran bind and unbind loop tests on each driver with mc_nextgen_test and media_device_test app loop tests while checking lsmod and dmesg. Please refer to tools/testing/selftests/media_tests/regression_test.txt for testing done on this series. Shuah Khan (3): media: Media Device Allocator API media: change au0828 to use Media Device Allocator API sound/usb: Use Media Controller API to share media resources Documentation/media/kapi/mc-core.rst | 37 ++++ drivers/media/Makefile | 3 +- drivers/media/media-dev-allocator.c | 133 ++++++++++++++ drivers/media/usb/au0828/au0828-core.c | 12 +- drivers/media/usb/au0828/au0828.h | 1 + include/media/media-dev-allocator.h | 54 ++++++ sound/usb/Kconfig | 4 + sound/usb/Makefile | 2 + sound/usb/card.c | 14 ++ sound/usb/card.h | 3 + sound/usb/media.c | 326 +++++++++++++++++++++++++++++++++ sound/usb/media.h | 73 ++++++++ sound/usb/mixer.h | 3 + sound/usb/pcm.c | 28 ++- sound/usb/quirks-table.h | 1 + sound/usb/stream.c | 2 + sound/usb/usbaudio.h | 6 + 17 files changed, 688 insertions(+), 14 deletions(-) create mode 100644 drivers/media/media-dev-allocator.c create mode 100644 include/media/media-dev-allocator.h create mode 100644 sound/usb/media.c create mode 100644 sound/usb/media.h -- 2.7.4

4 18

[alsa-devel] [PATCH] alsactl: Fix potential NULL dereferences in daemon mode
by Takashi Iwai 09 Dec '16

09 Dec '16

The code releasing the each card object may access to NULL when a bogus count is given. Add a NULL check just to make sure. Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- Something I forgot to merge, casually found in the working directory... alsactl/daemon.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/alsactl/daemon.c b/alsactl/daemon.c index 127701efaf0f..4f0a935a3987 100644 --- a/alsactl/daemon.c +++ b/alsactl/daemon.c @@ -451,8 +451,10 @@ save: out: free(pfd); remove(pidfile); - for (i = 0; i < count; i++) - card_free(&cards[i]); - free(cards); + if (cards) { + for (i = 0; i < count; i++) + card_free(&cards[i]); + free(cards); + } return 0; } -- 2.11.0

1 0

[alsa-devel] [PATCH 4/4] hda: thinkpad_helper: Add support for hid-lenovo LED control
by Dennis Wassenberg 09 Dec '16

09 Dec '16

Make the thinkpad_helper able to support not only led control over acpi with thinkpad_acpi driver but also led control over hid-lenovo. The hid-lenovo driver adapted the led control api of thinkpad_acpi. Make the thinkpad_acpi and hid-lenovo able to work combined to support connected Lenovo USB keyboards at Lenovo Thinkpad devices. Signed-off-by: Dennis Wassenberg <dennis.wassenberg(a)secunet.com> --- sound/pci/hda/thinkpad_helper.c | 182 +++++++++++++++++++++++++++++++--------- 1 file changed, 144 insertions(+), 38 deletions(-) diff --git a/sound/pci/hda/thinkpad_helper.c b/sound/pci/hda/thinkpad_helper.c index f0955fd..0d98624 100644 --- a/sound/pci/hda/thinkpad_helper.c +++ b/sound/pci/hda/thinkpad_helper.c @@ -1,83 +1,188 @@ /* Helper functions for Thinkpad LED control; * to be included from codec driver + * + * These helper functions include both LED control over thinkpad_acpi and + * hid-lenovo */ -#if IS_ENABLED(CONFIG_THINKPAD_ACPI) +#if IS_ENABLED(CONFIG_THINKPAD_ACPI) || IS_ENABLED(CONFIG_HID_LENOVO) #include <linux/acpi.h> +#include <linux/hid-lenovo.h> #include <linux/thinkpad_acpi.h> -static int (*led_set_func)(int, bool); +static int (*led_set_func_tpacpi)(int, bool); +static int (*led_set_func_hid_lenovo)(int, bool); static void (*old_vmaster_hook)(void *, int); static bool is_thinkpad(struct hda_codec *codec) { + return (codec->core.subsystem_id >> 16 == 0x17aa); +} + +static bool is_thinkpad_acpi(struct hda_codec *codec) +{ return is_thinkpad(codec) && (acpi_dev_found("LEN0068") || acpi_dev_found("IBM0068")); } -static void update_tpacpi_mute_led(void *private_data, int enabled) +static void update_thinkpad_mute_led(void *private_data, int enabled) { if (old_vmaster_hook) old_vmaster_hook(private_data, enabled); - if (led_set_func) - led_set_func(TPACPI_LED_MUTE, !enabled); +#if IS_ENABLED(CONFIG_THINKPAD_ACPI) + if (led_set_func_tpacpi) + led_set_func_tpacpi(TPACPI_LED_MUTE, !enabled); +#endif +#if IS_ENABLED(CONFIG_HID_LENOVO) + if (led_set_func_hid_lenovo) + led_set_func_hid_lenovo(HID_LENOVO_LED_MUTE, !enabled); +#endif } -static void update_tpacpi_micmute_led(struct hda_codec *codec, + + +static void update_thinkpad_micmute_led(struct hda_codec *codec, struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { - if (!ucontrol || !led_set_func) + if (!ucontrol) return; if (strcmp("Capture Switch", ucontrol->id.name) == 0 && ucontrol->id.index == 0) { /* TODO: How do I verify if it's a mono or stereo here? */ bool val = ucontrol->value.integer.value[0] || ucontrol->value.integer.value[1]; - led_set_func(TPACPI_LED_MICMUTE, !val); +#if IS_ENABLED(CONFIG_THINKPAD_ACPI) + if (led_set_func_tpacpi) + led_set_func_tpacpi(TPACPI_LED_MICMUTE, !val); +#endif +#if IS_ENABLED(CONFIG_HID_LENOVO) + if (led_set_func_hid_lenovo) + led_set_func_hid_lenovo(HID_LENOVO_LED_MICMUTE, !val); +#endif } } -static void hda_fixup_thinkpad_acpi(struct hda_codec *codec, - const struct hda_fixup *fix, int action) +#if IS_ENABLED(CONFIG_THINKPAD_ACPI) +static int hda_fixup_thinkpad_acpi_prepare(struct hda_codec *codec) { struct hda_gen_spec *spec = codec->spec; - bool removefunc = false; + int ret = -ENXIO; - if (action == HDA_FIXUP_ACT_PROBE) { - if (!is_thinkpad(codec)) - return; - if (!led_set_func) - led_set_func = symbol_request(tpacpi_led_set); - if (!led_set_func) { - codec_warn(codec, - "Failed to find thinkpad-acpi symbol tpacpi_led_set\n"); - return; - } + if (!is_thinkpad(codec)) + return -ENODEV; + if (!is_thinkpad_acpi(codec)) + return -ENODEV; + if (!led_set_func_tpacpi) + led_set_func_tpacpi = symbol_request(tpacpi_led_set); + if (!led_set_func_tpacpi) { + codec_warn(codec, + "Failed to find thinkpad-acpi symbol tpacpi_led_set\n"); + return -ENOENT; + } - removefunc = true; - if (led_set_func(TPACPI_LED_MUTE, false) >= 0) { - old_vmaster_hook = spec->vmaster_mute.hook; - spec->vmaster_mute.hook = update_tpacpi_mute_led; - removefunc = false; - } - if (led_set_func(TPACPI_LED_MICMUTE, false) >= 0) { - if (spec->num_adc_nids > 1) - codec_dbg(codec, - "Skipping micmute LED control due to several ADCs"); - else { - spec->cap_sync_hook = update_tpacpi_micmute_led; - removefunc = false; - } + if (led_set_func_tpacpi(TPACPI_LED_MUTE, false) >= 0) { + old_vmaster_hook = spec->vmaster_mute.hook; + spec->vmaster_mute.hook = update_thinkpad_mute_led; + ret = 0; + } + + if (led_set_func_tpacpi(TPACPI_LED_MICMUTE, false) >= 0) { + if (spec->num_adc_nids > 1) + codec_dbg(codec, + "Skipping micmute LED control due to several ADCs"); + else { + spec->cap_sync_hook = update_thinkpad_micmute_led; + ret = 0; } } - if (led_set_func && (action == HDA_FIXUP_ACT_FREE || removefunc)) { + return ret; +} + +static void hda_fixup_thinkpad_acpi_setup(struct hda_codec *codec, int action) +{ + int ret = 0; + + if (action == HDA_FIXUP_ACT_PROBE) { + ret = hda_fixup_thinkpad_acpi_prepare(codec); + } + + if (led_set_func_tpacpi && + (action == HDA_FIXUP_ACT_FREE || ret)) { + symbol_put(tpacpi_led_set); - led_set_func = NULL; + led_set_func_tpacpi = NULL; + old_vmaster_hook = NULL; + } +} +#else +static void hda_fixup_thinkpad_acpi_setup(struct hda_codec *codec, int action) +{ + return 0; +} +#endif + +#if IS_ENABLED(CONFIG_HID_LENOVO) +static int hda_fixup_thinkpad_hid_prepare(struct hda_codec *codec) +{ + struct hda_gen_spec *spec = codec->spec; + int ret = 0; + + if (!is_thinkpad(codec)) + return -ENODEV; + if (!led_set_func_hid_lenovo) + led_set_func_hid_lenovo = symbol_request(hid_lenovo_led_set); + if (!led_set_func_hid_lenovo) { + codec_warn(codec, + "Failed to find hid-lenovo symbol hid_lenovo_led_set\n"); + return -ENOENT; + } + + if (update_thinkpad_mute_led != spec->vmaster_mute.hook) + old_vmaster_hook = spec->vmaster_mute.hook; + + /* do not remove hook if setting delay does not work currently because + * it is a usb hid devices which is not connected right now + * maybe is will be connected later + */ + led_set_func_hid_lenovo(HID_LENOVO_LED_MUTE, false); + spec->vmaster_mute.hook = update_thinkpad_mute_led; + + led_set_func_hid_lenovo(HID_LENOVO_LED_MICMUTE, false); + spec->cap_sync_hook = update_thinkpad_micmute_led; + + return ret; +} + +static void hda_fixup_thinkpad_hid_setup(struct hda_codec *codec, int action) +{ + int ret = 0; + + if (action == HDA_FIXUP_ACT_PROBE) { + ret = hda_fixup_thinkpad_hid_prepare(codec); + } + + if (led_set_func_hid_lenovo && + (action == HDA_FIXUP_ACT_FREE || ret)) { + + symbol_put(hid_lenovo_led_set); + led_set_func_hid_lenovo = NULL; old_vmaster_hook = NULL; } } +#else +static void hda_fixup_thinkpad_hid_setup(struct hda_codec *codec, int action) +{ +} +#endif + +/** this fixup is not for acpi case only, it will handle hid-lenovo as well */ +static void hda_fixup_thinkpad_acpi(struct hda_codec *codec, + const struct hda_fixup *fix, int action) +{ + hda_fixup_thinkpad_acpi_setup(codec, action); + hda_fixup_thinkpad_hid_setup(codec, action); +} #else /* CONFIG_THINKPAD_ACPI */ @@ -87,3 +192,4 @@ static void hda_fixup_thinkpad_acpi(struct hda_codec *codec, } #endif /* CONFIG_THINKPAD_ACPI */ + -- 1.9.1 --

1 0

[alsa-devel] [PATCH 3/4] hid-lenovo: Handle X1 Tablet cover FNLock function appropriately
by Dennis Wassenberg 09 Dec '16

09 Dec '16

The FNLock state is not handled by the X1 tablet cover itself. There is the need to set the FNLock LED which actually enables the FNLock state of the cover. This means activating the FNLock LED will enable FNLock state and FNLock LED. --- drivers/hid/hid-lenovo.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/drivers/hid/hid-lenovo.c b/drivers/hid/hid-lenovo.c index 2efd5b0..3ace8c3 100644 --- a/drivers/hid/hid-lenovo.c +++ b/drivers/hid/hid-lenovo.c @@ -526,6 +526,29 @@ static void lenovo_led_brightness_set_tpx1cover(struct led_classdev *led_cdev, } } +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_CP_CONSUMERCONTROL) { + if (usage->usage_index == 8 && 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); + } + } + + } + + return ret; +} + static int lenovo_event(struct hid_device *hdev, struct hid_field *field, struct hid_usage *usage, __s32 value) { @@ -533,6 +556,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; } -- 1.9.1

1 0

[alsa-devel] [PATCH 2/4] hid-lenovo: Add support for X1 Tablet cover LED control
by Dennis Wassenberg 09 Dec '16

09 Dec '16

Add support for controlling MUTE, MICMUTE and FNLOCK LEDs. In ordner to enable MUTE and MICMUTE LED control over thinkpad_helper the external interface hid_lenovo_led_set is introduced. This enables setting Lenovo LEDs from external. This is needed because the X1 Tablet Cover is the first thinkpad_helper controlable device which is connected via USB. Additionally the led state is stored inside the hid-lenovo driver to make the driver able to set the led appropriate after device attach. --- drivers/hid/hid-lenovo.c | 262 +++++++++++++++++++++++++++++++++++++++++++++ include/linux/hid-lenovo.h | 15 +++ 2 files changed, 277 insertions(+) create mode 100644 include/linux/hid-lenovo.h diff --git a/drivers/hid/hid-lenovo.c b/drivers/hid/hid-lenovo.c index 4fc332c..2efd5b0 100644 --- a/drivers/hid/hid-lenovo.c +++ b/drivers/hid/hid-lenovo.c @@ -21,11 +21,27 @@ #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 lenovo_led_list_entry { + struct led_classdev *dev; + enum hid_lenovo_led_type type; + struct list_head list; +}; + +struct lenovo_led_type_entry { + struct led_classdev *dev; + enum hid_lenovo_led_type type; + struct list_head list; +}; + +static struct list_head hid_lenovo_leds = LIST_HEAD_INIT(hid_lenovo_leds); +static enum led_brightness hid_lenovo_initial_leds[HID_LENOVO_LED_MAX]; + struct lenovo_drvdata_tpkbd { int led_state; struct led_classdev led_mute; @@ -44,6 +60,44 @@ 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(enum hid_lenovo_led_type led, bool on) +{ + struct led_classdev *dev = NULL; + struct lenovo_led_list_entry *entry; + + if (led >= HID_LENOVO_LED_MAX) + return -EINVAL; + + hid_lenovo_initial_leds[led] = on ? LED_FULL : LED_OFF; + + list_for_each_entry(entry, &hid_lenovo_leds, list) { + if (entry->type == led) { + dev = entry->dev; + break; + } + } + + 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[] = { @@ -416,6 +470,62 @@ 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); + enum hid_lenovo_led_type led; + + if (led_cdev == &drv_data->led_mute) + led = HID_LENOVO_LED_MUTE; + else if (led_cdev == &drv_data->led_micmute) + led = HID_LENOVO_LED_MICMUTE; + else if (led_cdev == &drv_data->led_fnlock) + led = HID_LENOVO_LED_FNLOCK; + else + return LED_OFF; + + return drv_data->led_state & (1 << led) + ? 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; + enum hid_lenovo_led_type led; + + if (led_cdev == &drv_data->led_mute) { + led = HID_LENOVO_LED_MUTE; + } else if (led_cdev == &drv_data->led_micmute) { + led = HID_LENOVO_LED_MICMUTE; + } else if (led_cdev == &drv_data->led_fnlock) { + led = HID_LENOVO_LED_FNLOCK; + } else { + hid_warn(hdev, "Invalid LED to set.\n"); + return; + } + + if (value == LED_OFF) + drv_data->led_state &= ~(1 << led); + else + drv_data->led_state |= 1 << led; + + report = hdev->report_enum[HID_OUTPUT_REPORT].report_id_hash[9]; + if (report) { + report->field[0]->value[0] = ((led + 1) << 4) | 0x44; + report->field[0]->value[1] = (drv_data->led_state & (1 << led)) + ? 0x02 : 0x01; + hid_hw_request(hdev, report, HID_REQ_SET_REPORT); + } +} + static int lenovo_event(struct hid_device *hdev, struct hid_field *field, struct hid_usage *usage, __s32 value) { @@ -788,6 +898,7 @@ static int lenovo_probe_tpkbd(struct hid_device *hdev) 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 (!report) return -ENOENT; @@ -807,14 +918,33 @@ static int lenovo_probe_tpx1cover_configure(struct hid_device *hdev) hid_hw_request(hdev, report, HID_REQ_SET_REPORT); hid_hw_wait(hdev); + lenovo_led_brightness_set_tpx1cover(&drv_data->led_mute, + hid_lenovo_initial_leds[HID_LENOVO_LED_MUTE]); + + hid_hw_wait(hdev); + + lenovo_led_brightness_set_tpx1cover(&drv_data->led_micmute, + hid_lenovo_initial_leds[HID_LENOVO_LED_MICMUTE]); + 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; + struct lenovo_led_list_entry *mute_entry = NULL; + struct lenovo_led_list_entry *micmute_entry = NULL; + struct lenovo_led_list_entry *fnlock_entry = NULL; + struct hid_report *report; bool report_match = 1; + int ret = 0; + /* Used for LED control */ report = hid_validate_values(hdev, HID_INPUT_REPORT, 3, 0, 16); report_match &= report ? 1 : 0; @@ -825,7 +955,97 @@ static int lenovo_probe_tpx1cover_special_functions(struct hid_device *hdev) if (!report_match) return -ENODEV; + 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"); + return -ENOMEM; + } + + mute_entry = kzalloc(sizeof(*mute_entry), GFP_KERNEL); + if (!mute_entry) { + hid_err(hdev, "Could not allocate memory for led mute entry\n"); + ret = -ENOMEM; + goto err_cleanup; + } + drv_data->led_mute.name = "MUTE_LED"; + drv_data->led_mute.brightness_get = lenovo_led_brightness_get_tpx1cover; + drv_data->led_mute.brightness_set = lenovo_led_brightness_set_tpx1cover; + devm_led_classdev_register(dev, &drv_data->led_mute); + + INIT_LIST_HEAD(&mute_entry->list); + mute_entry->dev = &drv_data->led_mute; + mute_entry->type = HID_LENOVO_LED_MUTE; + list_add_tail(&mute_entry->list, &hid_lenovo_leds); + + + micmute_entry = kzalloc(sizeof(*micmute_entry), GFP_KERNEL); + if (!micmute_entry) { + hid_err(hdev, "Could not allocate memory for led micmute entry\n"); + ret = -ENOMEM; + goto err_cleanup; + } + + drv_data->led_micmute.name = "MICMUTE_LED"; + drv_data->led_micmute.brightness_get = lenovo_led_brightness_get_tpx1cover; + drv_data->led_micmute.brightness_set = lenovo_led_brightness_set_tpx1cover; + devm_led_classdev_register(dev, &drv_data->led_micmute); + + INIT_LIST_HEAD(&micmute_entry->list); + micmute_entry->dev = &drv_data->led_micmute; + micmute_entry->type = HID_LENOVO_LED_MICMUTE; + list_add_tail(&micmute_entry->list, &hid_lenovo_leds); + + + fnlock_entry = kzalloc(sizeof(*fnlock_entry), GFP_KERNEL); + if (!fnlock_entry) { + hid_err(hdev, "Could not allocate memory for led fnlock entry\n"); + ret = -ENOMEM; + goto err_cleanup; + } + + 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.name = "FNLOCK_LED"; + devm_led_classdev_register(dev, &drv_data->led_fnlock); + + INIT_LIST_HEAD(&fnlock_entry->list); + fnlock_entry->dev = &drv_data->led_fnlock; + fnlock_entry->type = HID_LENOVO_LED_FNLOCK; + list_add_tail(&fnlock_entry->list, &hid_lenovo_leds); + + + 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 (mute_entry) { + list_del(&mute_entry->list); + kfree (mute_entry); + } + + if (micmute_entry) { + list_del(&micmute_entry->list); + kfree (micmute_entry); + } + + if (fnlock_entry) { + list_del(&fnlock_entry->list); + kfree (fnlock_entry); + } + + if (drv_data) + kfree(drv_data); + + return ret; } static int lenovo_probe_tpx1cover_touch(struct hid_device *hdev) @@ -846,6 +1066,7 @@ static int lenovo_probe_tpx1cover_touch(struct hid_device *hdev) static int lenovo_probe_tpx1cover_keyboard(struct hid_device *hdev) { + struct lenovo_drvdata_tpx1cover *drv_data; struct hid_report *report; bool report_match = 1; int ret = 0; @@ -860,6 +1081,21 @@ static int lenovo_probe_tpx1cover_keyboard(struct hid_device *hdev) if (!report_match) ret = -ENODEV; + 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"); + return -ENOMEM; + } + + drv_data->led_state = 0; + drv_data->led_present = 0; + drv_data->fnlock_state = 0; + hid_set_drvdata(hdev, drv_data); + return ret; } @@ -1001,6 +1237,29 @@ 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); + struct lenovo_led_list_entry *entry, *head; + + if (!drv_data) + return; + + if (drv_data->led_present) { + list_for_each_entry_safe(entry, head, &hid_lenovo_leds, list) { + if (entry->dev == &drv_data->led_fnlock + || entry->dev == &drv_data->led_micmute + || entry->dev == &drv_data->led_mute) { + + list_del(&entry->list); + kfree(entry); + } + } + } + + hid_set_drvdata(hdev, NULL); +} + static void lenovo_remove(struct hid_device *hdev) { switch (hdev->product) { @@ -1011,6 +1270,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); diff --git a/include/linux/hid-lenovo.h b/include/linux/hid-lenovo.h new file mode 100644 index 0000000..00eb140 --- /dev/null +++ b/include/linux/hid-lenovo.h @@ -0,0 +1,15 @@ + +#ifndef __HID_LENOVO_H__ +#define __HID_LENOVO_H__ + + +enum hid_lenovo_led_type { + HID_LENOVO_LED_FNLOCK = 0, + HID_LENOVO_LED_MUTE, + HID_LENOVO_LED_MICMUTE, + HID_LENOVO_LED_MAX +}; + +int hid_lenovo_led_set(enum hid_lenovo_led_type led, bool on); + +#endif /* __HID_LENOVO_H_ */ -- 1.9.1

1 0

[alsa-devel] [PATCH 1/4] hid-lenovo: Add support for X1 Tablet cover special keys
by Dennis Wassenberg 09 Dec '16

09 Dec '16

The Lenovo X1 Tablet Cover is connected via USB. It constists of 1 usb 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 patch will introduce the function / special keys handling of USB interface 1. --- drivers/hid/hid-core.c | 1 + drivers/hid/hid-ids.h | 1 + drivers/hid/hid-lenovo.c | 160 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 162 insertions(+) diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index cff060b..5b38afc 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c @@ -1932,6 +1932,7 @@ void hid_disconnect(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) }, #endif { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_MX3000_RECEIVER) }, { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_S510_RECEIVER) }, diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index ec277b9..961ee4f 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h @@ -623,6 +623,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..4fc332c 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> */ /* @@ -86,6 +88,55 @@ 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_CP_CONSUMERCONTROL) { + /* Unknown keys -> Idenditied by usage index! */ + switch (usage->usage_index) { + case 8: + // FNLock key + return -1; + + case 9: + input_set_capability(hi->input, EV_KEY, KEY_MICMUTE); + map_key_clear(KEY_MICMUTE); + return 1; + + case 10: + input_set_capability(hi->input, EV_KEY, KEY_CONFIG); + map_key_clear(KEY_CONFIG); + return 1; + + case 11: + input_set_capability(hi->input, EV_KEY, KEY_SEARCH); + map_key_clear(KEY_SEARCH); + return 1; + + case 12: + input_set_capability(hi->input, EV_KEY, KEY_SETUP); + map_key_clear(KEY_SETUP); + return 1; + + case 13: + input_set_capability(hi->input, EV_KEY, KEY_SWITCHVIDEOMODE); + map_key_clear(KEY_SWITCHVIDEOMODE); + return 1; + + case 14: + input_set_capability(hi->input, EV_KEY, KEY_RFKILL); + map_key_clear(KEY_RFKILL); + return 1; + + } + + 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 +223,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; } @@ -731,6 +785,107 @@ 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]; + + 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); + + return 0; +} + +static int lenovo_probe_tpx1cover_special_functions(struct hid_device *hdev) +{ + struct hid_report *report; + bool report_match = 1; + + /* Used for LED control */ + report = hid_validate_values(hdev, HID_INPUT_REPORT, 3, 0, 16); + report_match &= report ? 1 : 0; + /* Identify USB Intf 1 which is the only one with HID_FEATURE_REPORT 100 */ + report = hid_validate_values(hdev, HID_FEATURE_REPORT, 100, 0, 1); + report_match &= report ? 1 : 0; + + if (!report_match) + return -ENODEV; + + return lenovo_probe_tpx1cover_configure(hdev); +} + +static int lenovo_probe_tpx1cover_touch(struct hid_device *hdev) +{ + struct hid_report *report; + bool report_match = 1; + int ret = 0; + + /* Identify USB Intf 2 which is the only one with HID_FEATURE_REPORT 15 */ + 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_keyboard(struct hid_device *hdev) +{ + struct hid_report *report; + bool report_match = 1; + int ret = 0; + + /* Identify USB Intf0 which is the only one with HID_INPUT_REPORT 0 + * and HID_OUTPUT_REPORT 0 */ + report = hid_validate_values(hdev, HID_INPUT_REPORT, 0, 0, 1); + report_match &= report ? 1 : 0; + report = hid_validate_values(hdev, HID_OUTPUT_REPORT, 0, 0, 1); + 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 */ + ret = lenovo_probe_tpx1cover_keyboard(hdev); + } + + return ret; +} + static int lenovo_probe_cptkbd(struct hid_device *hdev) { int ret; @@ -803,6 +958,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; @@ -883,6 +1041,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) }, { } }; @@ -902,3 +1061,4 @@ static int lenovo_input_configured(struct hid_device *hdev, module_hid_driver(lenovo_driver); MODULE_LICENSE("GPL"); + -- 1.9.1

1 0

Re: [alsa-devel] Cherry trail and Nau 88l24 codec
by Joseph Wang 09 Dec '16

09 Dec '16

YES!!!! Thank you Intel and Nuvoton. I'm getting beautiful sound in the external speakers. The jack detection is a bit flaky, but I can work on that. The code is available at https://github.com/joequant/nau8824

1 0

[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] ALSA: usb-audio: add implicit fb quirk for Axe-Fx II
by Alberto Aguirre 09 Dec '16

09 Dec '16

The Axe-Fx II implicit feedback end point and the data sync endpoint are in different interface descriptors. Add quirk to ensure a sync endpoint is properly configured. Signed-off-by: Alberto Aguirre <albaguirre(a)gmail.com> --- sound/usb/pcm.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/sound/usb/pcm.c b/sound/usb/pcm.c index 44d178e..0fe2d56 100644 --- a/sound/usb/pcm.c +++ b/sound/usb/pcm.c @@ -348,6 +348,16 @@ static int set_sync_ep_implicit_fb_quirk(struct snd_usb_substream *subs, alts = &iface->altsetting[1]; goto add_sync_ep; + case USB_ID(0x2466, 0x8003): + ep = 0x86; + iface = usb_ifnum_to_if(dev, 2); + + if (!iface || iface->num_altsetting == 0) + return -EINVAL; + + alts = &iface->altsetting[1]; + goto add_sync_ep; + } if (attr == USB_ENDPOINT_SYNC_ASYNC && altsd->bInterfaceClass == USB_CLASS_VENDOR_SPEC && -- 2.9.3

2 1

[alsa-devel] [PATCH] ASoC: wm_adsp: wm_adsp_buf_alloc should use kfree in error path
by Richard Fitzgerald 09 Dec '16

09 Dec '16

buf was allocated by kzalloc() so it should be passed to kfree() Signed-off-by: Richard Fitzgerald <rf(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/wm_adsp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c index ff111a82..593b7d1 100644 --- a/sound/soc/codecs/wm_adsp.c +++ b/sound/soc/codecs/wm_adsp.c @@ -183,15 +183,15 @@ static struct wm_adsp_buf *wm_adsp_buf_alloc(const void *src, size_t len, struct wm_adsp_buf *buf = kzalloc(sizeof(*buf), GFP_KERNEL); if (buf == NULL) return NULL; buf->buf = vmalloc(len); if (!buf->buf) { - vfree(buf); + kfree(buf); return NULL; } memcpy(buf->buf, src, len); if (list) list_add_tail(&buf->list, list); -- 1.9.1

1 0

[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] ALSA: usb-audio: add implicit fb quirk for Axe-Fx II
by Alberto Aguirre 08 Dec '16

08 Dec '16

The Axe-Fx II implicit feedback end point and the data sink endpoint are in different interface descriptors. Add quirk to ensure a sync endpoint is properly configured. Signed-off-by: Alberto Aguirre <albaguirre(a)gmail.com> --- sound/usb/pcm.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/sound/usb/pcm.c b/sound/usb/pcm.c index 44d178e..584f2a6 100644 --- a/sound/usb/pcm.c +++ b/sound/usb/pcm.c @@ -348,6 +348,16 @@ static int set_sync_ep_implicit_fb_quirk(struct snd_usb_substream *subs, alts = &iface->altsetting[1]; goto add_sync_ep; + case USB_ID(0x2466, 0x8003): /* Fractal Audio Axe-Fx II */ + ep = 0x86; + iface = usb_ifnum_to_if(dev, 2); + + if (!iface || iface->num_altsetting == 0) + return -EINVAL; + + alts = &iface->altsetting[1]; + goto add_sync_ep; + } if (attr == USB_ENDPOINT_SYNC_ASYNC && altsd->bInterfaceClass == USB_CLASS_VENDOR_SPEC && -- 2.9.3

1 0

[alsa-devel] warnings with clk_disable_unprepare()
by Pierre-Louis Bossart 08 Dec '16

08 Dec '16

Hi, In the modified cht-bsw_rt5645 machine driver for Asus X205TA and T100HA, I disable the audio mclk with a call to clk_disable_unprepare() when I see a SND_SOC_DAPM_EVENT_OFF event in the platform_clock_control hook. For some reason I seem to get multiple SND_SOC_DAPM_EVENT_OFF events and the clock framework complains with dmesg warnings that the refcount is already zero (which has no functional side effect). WARNING: CPU: 0 PID: 2002 at drivers/clk/clk.c:476 clk_unprepare+0x1a/0x21 WARNING: CPU: 2 PID: 2095 at drivers/clk/clk.c:594 clk_core_disable_lock+0x12/0x1b I could fix this in three different ways: - remove multiple SND_SOC_DAPM_EVENT_OFF events (not sure what the root cause is, maybe issues with jack detection?) - call a clk_is_enabled() or clk_refcount() function before calling clk_disable_unprepare() (but they don't seem to exist in include/linux/clk.h) - count the references myself (which does exactly the same as what the clk framework already does so it's not terribly elegant) Any suggestions on what the least-bad solution might be? Thanks -Pierre

2 1

[alsa-devel] [PATCH V2 1/2] ASoC: samsung: include gpio consumer.h
by Fabian Frederick 08 Dec '16

08 Dec '16

Fix the following build errors on X86_32 !GPIOLIB sound/soc/samsung/tm2_wm5110.c:220:3: error: implicit declaration of function 'gpiod_set_value_cansleep' [-Werror=implicit-function-declaration] sound/soc/samsung/tm2_wm5110.c:438:24: error: implicit declaration of function 'devm_gpiod_get' [-Werror=implicit-function-declaration] Signed-off-by: Fabian Frederick <fabf(a)skynet.be> --- V2: -Add configuration settings (suggested by Krzysztof Kozlowski) sound/soc/samsung/tm2_wm5110.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/samsung/tm2_wm5110.c b/sound/soc/samsung/tm2_wm5110.c index 5cdf7d1..24cc9d6 100644 --- a/sound/soc/samsung/tm2_wm5110.c +++ b/sound/soc/samsung/tm2_wm5110.c @@ -12,6 +12,7 @@ #include <linux/clk.h> #include <linux/gpio.h> +#include <linux/gpio/consumer.h> #include <linux/module.h> #include <linux/of.h> #include <sound/pcm_params.h> -- 2.7.4

2 1

[alsa-devel] [bug report] ASoC: topology: Only free TLV for volume mixers of a widget
by Dan Carpenter 08 Dec '16

08 Dec '16

Hello Mengdong Lin, The patch eea3dd4f1247: "ASoC: topology: Only free TLV for volume mixers of a widget" from Nov 25, 2016, leads to the following static checker warning: sound/soc/soc-topology.c:1566 soc_tplg_dapm_widget_create() error: uninitialized symbol 'kcontrol_type'. sound/soc/soc-topology.c 1440 static int soc_tplg_dapm_widget_create(struct soc_tplg *tplg, 1441 struct snd_soc_tplg_dapm_widget *w) 1442 { 1443 struct snd_soc_dapm_context *dapm = &tplg->comp->dapm; 1444 struct snd_soc_dapm_widget template, *widget; 1445 struct snd_soc_tplg_ctl_hdr *control_hdr; 1446 struct snd_soc_card *card = tplg->comp->card; 1447 unsigned int kcontrol_type; ^^^^^^^^^^^^^ 1448 int ret = 0; 1449 1450 if (strnlen(w->name, SNDRV_CTL_ELEM_ID_NAME_MAXLEN) == 1451 SNDRV_CTL_ELEM_ID_NAME_MAXLEN) 1452 return -EINVAL; 1453 if (strnlen(w->sname, SNDRV_CTL_ELEM_ID_NAME_MAXLEN) == 1454 SNDRV_CTL_ELEM_ID_NAME_MAXLEN) 1455 return -EINVAL; 1456 1457 dev_dbg(tplg->dev, "ASoC: creating DAPM widget %s id %d\n", 1458 w->name, w->id); 1459 1460 memset(&template, 0, sizeof(template)); 1461 1462 /* map user to kernel widget ID */ 1463 template.id = get_widget_id(w->id); 1464 if (template.id < 0) 1465 return template.id; 1466 1467 template.name = kstrdup(w->name, GFP_KERNEL); 1468 if (!template.name) 1469 return -ENOMEM; 1470 template.sname = kstrdup(w->sname, GFP_KERNEL); 1471 if (!template.sname) { 1472 ret = -ENOMEM; 1473 goto err; 1474 } 1475 template.reg = w->reg; 1476 template.shift = w->shift; 1477 template.mask = w->mask; 1478 template.subseq = w->subseq; 1479 template.on_val = w->invert ? 0 : 1; 1480 template.off_val = w->invert ? 1 : 0; 1481 template.ignore_suspend = w->ignore_suspend; 1482 template.event_flags = w->event_flags; 1483 template.dobj.index = tplg->index; 1484 1485 tplg->pos += 1486 (sizeof(struct snd_soc_tplg_dapm_widget) + w->priv.size); 1487 if (w->num_kcontrols == 0) { 1488 template.num_kcontrols = 0; 1489 goto widget; Assume we hit this goto. 1490 } 1491 1492 control_hdr = (struct snd_soc_tplg_ctl_hdr *)tplg->pos; 1493 dev_dbg(tplg->dev, "ASoC: template %s has %d controls of type %x\n", 1494 w->name, w->num_kcontrols, control_hdr->type); [ snip ] 1546 1547 widget: 1548 ret = soc_tplg_widget_load(tplg, &template, w); 1549 if (ret < 0) 1550 goto hdr_err; 1551 1552 /* card dapm mutex is held by the core if we are loading topology 1553 * data during sound card init. */ 1554 if (card->instantiated) 1555 widget = snd_soc_dapm_new_control(dapm, &template); 1556 else 1557 widget = snd_soc_dapm_new_control_unlocked(dapm, &template); 1558 if (widget == NULL) { 1559 dev_err(tplg->dev, "ASoC: failed to create widget %s controls\n", 1560 w->name); 1561 ret = -ENOMEM; 1562 goto hdr_err; 1563 } 1564 1565 widget->dobj.type = SND_SOC_DOBJ_WIDGET; 1566 widget->dobj.widget.kcontrol_type = kcontrol_type; Then it's not initialized here. I don't know if this causes an issue beyond the static checker warning. 1567 widget->dobj.ops = tplg->ops; 1568 widget->dobj.index = tplg->index; 1569 kfree(template.sname); regards, dan carpenter

2 1

[alsa-devel] [PATCH 1/2] ASoC: zte: spdif and i2s drivers are not zx296702 specific
by Shawn Guo 08 Dec '16

08 Dec '16

From: Shawn Guo <shawn.guo(a)linaro.org> ZTE ZX SPDIF and I2S drivers can work on not only ZX296702 but also other ZTE ZX family SoCs like ZX296718, which is an arm64 platform. Let's make a few renaming and tweak the Kconfig a bit to get the drivers available for other ZTE ZX platforms. Signed-off-by: Shawn Guo <shawn.guo(a)linaro.org> --- sound/soc/zte/Kconfig | 16 ++++++++-------- sound/soc/zte/Makefile | 4 ++-- sound/soc/zte/{zx296702-i2s.c => zx-i2s.c} | 0 sound/soc/zte/{zx296702-spdif.c => zx-spdif.c} | 0 4 files changed, 10 insertions(+), 10 deletions(-) rename sound/soc/zte/{zx296702-i2s.c => zx-i2s.c} (100%) rename sound/soc/zte/{zx296702-spdif.c => zx-spdif.c} (100%) diff --git a/sound/soc/zte/Kconfig b/sound/soc/zte/Kconfig index c47eb25e441f..6d8a90d36315 100644 --- a/sound/soc/zte/Kconfig +++ b/sound/soc/zte/Kconfig @@ -1,17 +1,17 @@ -config ZX296702_SPDIF - tristate "ZX296702 spdif" - depends on SOC_ZX296702 || COMPILE_TEST +config ZX_SPDIF + tristate "ZTE ZX SPDIF Driver Support" + depends on ARCH_ZX || COMPILE_TEST depends on COMMON_CLK select SND_SOC_GENERIC_DMAENGINE_PCM help Say Y or M if you want to add support for codecs attached to the - zx296702 spdif interface + ZTE ZX SPDIF interface -config ZX296702_I2S - tristate "ZX296702 i2s" - depends on SOC_ZX296702 || COMPILE_TEST +config ZX_I2S + tristate "ZTE ZX I2S Driver Support" + depends on ARCH_ZX || COMPILE_TEST depends on COMMON_CLK select SND_SOC_GENERIC_DMAENGINE_PCM help Say Y or M if you want to add support for codecs attached to the - zx296702 i2s interface + ZTE ZX I2S interface diff --git a/sound/soc/zte/Makefile b/sound/soc/zte/Makefile index 254ed2c8c1a0..77768f5fd10c 100644 --- a/sound/soc/zte/Makefile +++ b/sound/soc/zte/Makefile @@ -1,2 +1,2 @@ -obj-$(CONFIG_ZX296702_SPDIF) += zx296702-spdif.o -obj-$(CONFIG_ZX296702_I2S) += zx296702-i2s.o +obj-$(CONFIG_ZX_SPDIF) += zx-spdif.o +obj-$(CONFIG_ZX_I2S) += zx-i2s.o diff --git a/sound/soc/zte/zx296702-i2s.c b/sound/soc/zte/zx-i2s.c similarity index 100% rename from sound/soc/zte/zx296702-i2s.c rename to sound/soc/zte/zx-i2s.c diff --git a/sound/soc/zte/zx296702-spdif.c b/sound/soc/zte/zx-spdif.c similarity index 100% rename from sound/soc/zte/zx296702-spdif.c rename to sound/soc/zte/zx-spdif.c -- 1.9.1

3 5

[alsa-devel] [PATCH] ASoC: Intel: Skylake: remove unused 'out_fmt' variable
by Kirtika Ruchandani 08 Dec '16

08 Dec '16

Commit 4cd9899f0d16 introduced struct skl_module_fmt* out_fmt without using it. Compiling with W=1 gives the below warning, fix it. sound/soc/intel/skylake/skl-topology.c: In function ‘skl_tplg_update_buffer_size’: sound/soc/intel/skylake/skl-topology.c:301:34: warning: variable ‘out_fmt’ set but not used [-Wunused-but-set-variable] This is a harmless warning and is only being fixed to reduce the noise with W=1 in the kernel. Fixes: 4cd9899f0d16 ("ASoC: Intel: Skylake: Add multiple pin formats") Cc: Hardik T Shah <hardik.t.shah(a)intel.com> Cc: Omair M Abdullah <omair.m.abdullah(a)intel.com> Cc: Jeeja KP <jeeja.kp(a)intel.com> Cc: Subhransu S. Prusty <subhransu.s.prusty(a)intel.com> Cc: Vinod Koul <vinod.koul(a)intel.com> Cc: Mark Brown <broonie(a)kernel.org> Signed-off-by: Kirtika Ruchandani <kirtika(a)chromium.org> --- sound/soc/intel/skylake/skl-topology.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sound/soc/intel/skylake/skl-topology.c b/sound/soc/intel/skylake/skl-topology.c index bd313c9..4352236a 100644 --- a/sound/soc/intel/skylake/skl-topology.c +++ b/sound/soc/intel/skylake/skl-topology.c @@ -298,7 +298,7 @@ static void skl_tplg_update_buffer_size(struct skl_sst *ctx, struct skl_module_cfg *mcfg) { int multiplier = 1; - struct skl_module_fmt *in_fmt, *out_fmt; + struct skl_module_fmt *in_fmt; int in_rate, out_rate; @@ -306,7 +306,6 @@ static void skl_tplg_update_buffer_size(struct skl_sst *ctx, * change for pin 0 only */ in_fmt = &mcfg->in_fmt[0]; - out_fmt = &mcfg->out_fmt[0]; if (mcfg->m_type == SKL_MODULE_TYPE_SRCINT) multiplier = 5; -- 2.8.0.rc3.226.g39d4020

3 3

[alsa-devel] [PATCH] ASoC: Intel: Skylake: remove unused 'runtime' variable
by Kirtika Ruchandani 08 Dec '16

08 Dec '16

skl_platform_open() defines and sets 'struct snd_pcm_runtime* runtime' but does not use it. Compiling with W=1 gives the following warning, fix it. sound/soc/intel/skylake/skl-pcm.c: In function ‘skl_platform_open’: sound/soc/intel/skylake/skl-pcm.c:941:26: warning: variable ‘runtime’ set but not used [-Wunused-but-set-variable] This was introduced with the initial driver commit a40e693c7f5e ("ASoC: Intel: Add Skylake HDA platform driver"). This is a harmless warning and is only being fixed to reduce the noise with W=1 in the kernel. Fixes: a40e693c7f5e ("ASoC: Intel: Add Skylake HDA platform driver") Cc: Jeeja KP <jeeja.kp(a)intel.com> Cc: Subhransu S. Prusty <subhransu.s.prusty(a)intel.com> Cc: Vinod Koul <vinod.koul(a)intel.com> Cc: Mark Brown <broonie(a)kernel.org> Signed-off-by: Kirtika Ruchandani <kirtika(a)chromium.org> --- sound/soc/intel/skylake/skl-pcm.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/sound/soc/intel/skylake/skl-pcm.c b/sound/soc/intel/skylake/skl-pcm.c index 84b5101..3254507 100644 --- a/sound/soc/intel/skylake/skl-pcm.c +++ b/sound/soc/intel/skylake/skl-pcm.c @@ -938,14 +938,12 @@ static struct snd_soc_dai_driver skl_platform_dai[] = { static int skl_platform_open(struct snd_pcm_substream *substream) { - struct snd_pcm_runtime *runtime; struct snd_soc_pcm_runtime *rtd = substream->private_data; struct snd_soc_dai_link *dai_link = rtd->dai_link; dev_dbg(rtd->cpu_dai->dev, "In %s:%s\n", __func__, dai_link->cpu_dai_name); - runtime = substream->runtime; snd_soc_set_runtime_hwparams(substream, &azx_pcm_hw); return 0; -- 2.8.0.rc3.226.g39d4020

2 1

[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] speaker-test: Fix chmap wav file selection.
by Arnaud Pouliquen 07 Dec '16

07 Dec '16

The channel selection currently does not work properly when a channel map control is provided but no manual channel map was explicitly requested with "-m". For example, the CEA/HDMI 6ch (surround 5.1) map is: FL, FR, LFE, FC, RL, RR. Tested command: speaker-test -D hdmi -c 6 -t wav Speaker-test tries to play channels in this following order: 0 - Front Left 3 - Front Center 1 - Front Right 5 - Rear Right 4 - Rear Left 2 - LFE But wav file played on associated speakers are not aligned. Here are the real files played: 0- /usr/share/sounds/alsa/Front_Left.wav => OK 3- /usr/share/sounds/alsa/Rear_Right.wav => OK 1- /usr/share/sounds/alsa/Front_Right.wav => OK 5- /usr/share/sounds/alsa/Rear_Center.wav => KO 4- found file /usr/share/sounds/alsa/Front_Center.wav => KO 2- /usr/share/sounds/alsa/Rear_Left.wav => KO Issue is that associated wav files ordering is reworked only if channel_map_set variable is set. Fix consists in allowing wavs re-ordering if a channel mapping as been get or set, i.e. channel_map is not null. Signed-off-by: Arnaud Pouliquen <arnaud.pouliquen(a)st.com> --- speaker-test/speaker-test.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/speaker-test/speaker-test.c b/speaker-test/speaker-test.c index 5b9cbec..46b0589 100644 --- a/speaker-test/speaker-test.c +++ b/speaker-test/speaker-test.c @@ -843,7 +843,7 @@ static int setup_wav_file(int chn) return check_wav_file(chn, given_test_wav_file); #ifdef CONFIG_SUPPORT_CHMAP - if (channel_map_set && chn < channel_map->channels) { + if (channel_map && chn < channel_map->channels) { int channel = channel_map->pos[chn] - SND_CHMAP_FL; if (channel >= 0 && channel < MAX_CHANNELS) return check_wav_file(chn, wavs[channel]); -- 1.9.1

2 1