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

[alsa-devel] [asoc:topic/cq93vc 1/1] include/linux/mfd/davinci_voicecodec.h:31:27: fatal error: mach/hardware.h: No such file or directory
by kbuild test robot 11 Dec '16

11 Dec '16

tree: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git topic/cq93vc head: 4de429888c5b534f43a3d693e3627021b17e900c commit: 4de429888c5b534f43a3d693e3627021b17e900c [1/1] ASoC: cq93vc: remove MFD_DAVINCI_VOICECODEC dependency for CQ0093VC config: xtensa-allmodconfig (attached as .config) compiler: xtensa-linux-gcc (GCC) 4.9.0 reproduce: wget https://git.kernel.org/cgit/linux/kernel/git/wfg/lkp-tests.git/plain/sbin/m… -O ~/bin/make.cross chmod +x ~/bin/make.cross git checkout 4de429888c5b534f43a3d693e3627021b17e900c # save the attached .config to linux build tree make.cross ARCH=xtensa All errors (new ones prefixed by >>): In file included from sound/soc/codecs/cq93vc.c:32:0: >> include/linux/mfd/davinci_voicecodec.h:31:27: fatal error: mach/hardware.h: No such file or directory #include <mach/hardware.h> ^ compilation terminated. vim +31 include/linux/mfd/davinci_voicecodec.h ca26308c Miguel Aguilar 2010-03-11 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ca26308c Miguel Aguilar 2010-03-11 16 * GNU General Public License for more details. ca26308c Miguel Aguilar 2010-03-11 17 * ca26308c Miguel Aguilar 2010-03-11 18 * You should have received a copy of the GNU General Public License ca26308c Miguel Aguilar 2010-03-11 19 * along with this program; if not, write to the Free Software ca26308c Miguel Aguilar 2010-03-11 20 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ca26308c Miguel Aguilar 2010-03-11 21 */ ca26308c Miguel Aguilar 2010-03-11 22 ca26308c Miguel Aguilar 2010-03-11 23 #ifndef __LINUX_MFD_DAVINCI_VOICECODEC_H_ c593aca4 Rasmus Villemoes 2014-08-22 24 #define __LINUX_MFD_DAVINCI_VOICECODEC_H_ ca26308c Miguel Aguilar 2010-03-11 25 ca26308c Miguel Aguilar 2010-03-11 26 #include <linux/kernel.h> ca26308c Miguel Aguilar 2010-03-11 27 #include <linux/platform_device.h> ca26308c Miguel Aguilar 2010-03-11 28 #include <linux/mfd/core.h> 3ad7a42d Matt Porter 2013-03-06 29 #include <linux/platform_data/edma.h> ca26308c Miguel Aguilar 2010-03-11 30 99717470 Sachin Kamat 2013-06-18 @31 #include <mach/hardware.h> ca26308c Miguel Aguilar 2010-03-11 32 921a2c87 Mark Brown 2013-08-31 33 struct regmap; 921a2c87 Mark Brown 2013-08-31 34 ca26308c Miguel Aguilar 2010-03-11 35 /* ca26308c Miguel Aguilar 2010-03-11 36 * Register values. ca26308c Miguel Aguilar 2010-03-11 37 */ ca26308c Miguel Aguilar 2010-03-11 38 #define DAVINCI_VC_PID 0x00 ca26308c Miguel Aguilar 2010-03-11 39 #define DAVINCI_VC_CTRL 0x04 :::::: The code at line 31 was first introduced by commit :::::: 997174705458d2abdbc31ba1594bf2a4503cb41a mfd: davinci_voicecodec: Fix build breakage :::::: TO: Sachin Kamat <sachin.kamat(a)linaro.org> :::::: CC: Samuel Ortiz <sameo(a)linux.intel.com> --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation

1 0

[alsa-devel] [PATCH SND/USB]: Add QuickCam Communicate Deluxe/S7500 to volume_control_quirks.
by Con Kolivas 09 Dec '16

09 Dec '16

The Logitech QuickCam Communicate Deluxe/S7500 microphone fails with the following warning. [ 6.778995] usb 2-1.2.2.2: Warning! Unlikely big volume range (=3072), cval->res is probably wrong. [ 6.778996] usb 2-1.2.2.2: [5] FU [Mic Capture Volume] ch = 1, val = 4608/7680/1 Adding it to the list of devices in volume_control_quirks makes it work properly, fixing related typo. Signed-off-by: Con Kolivas <kernel(a)kolivas.org> --- sound/usb/mixer.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c index 2f8c388..4703cae 100644 --- a/sound/usb/mixer.c +++ b/sound/usb/mixer.c @@ -932,9 +932,10 @@ static void volume_control_quirks(struct usb_mixer_elem_info *cval, case USB_ID(0x046d, 0x0826): /* HD Webcam c525 */ case USB_ID(0x046d, 0x08ca): /* Logitech Quickcam Fusion */ case USB_ID(0x046d, 0x0991): + case USB_ID(0x046d, 0x09a2): /* QuickCam Communicate Deluxe/S7500 */ /* Most audio usb devices lie about volume resolution. * Most Logitech webcams have res = 384. - * Proboly there is some logitech magic behind this number --fishor + * Probably there is some logitech magic behind this number --fishor */ if (!strcmp(kctl->id.name, "Mic Capture Volume")) { usb_audio_info(chip, -- 2.7.4

3 4

[alsa-devel] [PATCH V3 2/2] ASoC: samsung: add GPIOLIB dependency
by Fabian Frederick 09 Dec '16

09 Dec '16

Both SND_SOC_SMARTQ and SND_SOC_SAMSUNG_TM2_WM5110 use gpio/consumer.h This patch adds GPIOLIB || COMPILE_TEST to Kconfig entries to fix runtime dependency. See commit 638f958baeaf ("extcon: Allow compile test of GPIO consumers if !GPIOLIB") for similar problem and explanations. Reviewed-by: Krzysztof Kozlowski <krzk(a)kernel.org> Reported-by: Krzysztof Kozlowski <krzk(a)kernel.org> Signed-off-by: Fabian Frederick <fabf(a)skynet.be> --- V3: -Fix commit message (suggested by Krzysztof Kozlowski) -Add reviewed-by sound/soc/samsung/Kconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sound/soc/samsung/Kconfig b/sound/soc/samsung/Kconfig index 7c42315..f1f1d79 100644 --- a/sound/soc/samsung/Kconfig +++ b/sound/soc/samsung/Kconfig @@ -111,6 +111,7 @@ config SND_SOC_SAMSUNG_RX1950_UDA1380 config SND_SOC_SMARTQ tristate "SoC I2S Audio support for SmartQ board" depends on MACH_SMARTQ || COMPILE_TEST + depends on GPIOLIB || COMPILE_TEST depends on I2C select SND_SAMSUNG_I2S select SND_SOC_WM8750 @@ -193,6 +194,7 @@ config SND_SOC_ARNDALE_RT5631_ALC5631 config SND_SOC_SAMSUNG_TM2_WM5110 tristate "SoC I2S Audio support for WM5110 on TM2 board" depends on SND_SOC_SAMSUNG && MFD_ARIZONA && I2C && SPI_MASTER + depends on GPIOLIB || COMPILE_TEST select SND_SOC_MAX98504 select SND_SOC_WM5110 select SND_SAMSUNG_I2S -- 2.7.4

1 0

[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