From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.13]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 112D978F5D; Mon, 1 Sep 2025 09:51:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.13 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756720322; cv=none; b=lZEBlapdCeswxSHwbom0LK+i0KecJXM/PUlg9JZ6inFAN3ZdySY1o01s6cN0ZlDtiNdTnEvTsDRJt4Y/ZzpDImw7joFbzXCbHiplR8mo5+VI4XD8YpZD3I/9yrjIQNSpdxF/RBv8s0V0rR39ovBsvSF1PE12QHn8P9EC4+4+5H4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756720322; c=relaxed/simple; bh=3Hk353XPtWzoXqWng1xA6KlDUVTJSs6tMddhlQyDxWc=; h=From:Date:To:cc:Subject:In-Reply-To:Message-ID:References: MIME-Version:Content-Type; b=qwc9g1nXrse2/ktrAL9D8RD0JYeksJk1oAB1hIJwWQhExakJvAG2kqbrSOHDeZpBNYPw9nyUE3lMzxYgSXZDVycqtCaKwe+ygXbXvHG4RHkHy7gzvFYQ9RzwfxYkfoBSHs9eK7w/nWLTMYNVgN4q2ksaD4OHvgpceMOt1sYRUMs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=RcFBZwcs; arc=none smtp.client-ip=192.198.163.13 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="RcFBZwcs" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1756720320; x=1788256320; h=from:date:to:cc:subject:in-reply-to:message-id: references:mime-version; bh=3Hk353XPtWzoXqWng1xA6KlDUVTJSs6tMddhlQyDxWc=; b=RcFBZwcsCg+blBmIamG2y1YGXByLLwg29QYdXKsbzLSlReCYJlMPQ78h +/4Cq8I2Of3BjTQwDsNHuJnsLn9W6qDb3jS/aWWnmZdV2GZ8q4e7m3yc5 PbDYJFgMkIpe/AznrunBnnMyuRN8u7oFtjl/36WnXohw2hwh5Nvk8BpPa rB2uJ06+p3RN27S0p7kJy4fCTnt4jGSzRr3LNe13cfRVtBFfyaJLqPpcl 2+ZMGqgMpevgutcXnff9p1w7WJGZjyrMGR1THmmPKaeBEIJJo0IquuaIH QDnAxnwDL66q3kzgijOUdhMFF09Z10mhPGUKtJE4TtlCCz0d41TL3ogTQ w==; X-CSE-ConnectionGUID: o1IlogKYRciRLJsg9dz/nQ== X-CSE-MsgGUID: IGbap6WFTGKllb935eG5JA== X-IronPort-AV: E=McAfee;i="6800,10657,11539"; a="61609773" X-IronPort-AV: E=Sophos;i="6.18,225,1751266800"; d="scan'208";a="61609773" Received: from fmviesa009.fm.intel.com ([10.60.135.149]) by fmvoesa107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Sep 2025 02:51:58 -0700 X-CSE-ConnectionGUID: IOvuHHInT4e1PwvBoJ1wgg== X-CSE-MsgGUID: AQqoBV/1QrqJBg+v82ZOXg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.18,225,1751266800"; d="scan'208";a="171423710" Received: from ijarvine-mobl1.ger.corp.intel.com (HELO localhost) ([10.245.244.193]) by fmviesa009-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Sep 2025 02:51:53 -0700 From: =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= Date: Mon, 1 Sep 2025 12:51:49 +0300 (EEST) To: Sebastian Reichel cc: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Hans de Goede , Bryan O'Donoghue , Bjorn Andersson , Konrad Dybcio , Mark Pearson , "Derek J. Clark" , Henrique de Moraes Holschuh , devicetree@vger.kernel.org, LKML , platform-driver-x86@vger.kernel.org, linux-arm-msm@vger.kernel.org Subject: Re: [PATCH 2/3] platform: arm64: thinkpad-t14s-ec: new driver In-Reply-To: <20250831-thinkpad-t14s-ec-v1-2-6e06a07afe0f@collabora.com> Message-ID: References: <20250831-thinkpad-t14s-ec-v1-0-6e06a07afe0f@collabora.com> <20250831-thinkpad-t14s-ec-v1-2-6e06a07afe0f@collabora.com> Precedence: bulk X-Mailing-List: platform-driver-x86@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII On Sun, 31 Aug 2025, Sebastian Reichel wrote: > Introduce EC driver for the ThinkPad T14s Gen6 Snapdragon, which > is in theory compatible with ThinkPad ACPI. On Linux the system > is booted with device tree, which is not supported by the ThinkPad > ACPI driver. Also most of the hardware compatibility is handled > via ACPI tables, which are obviously not used when booting via > device tree. Thus adding DT compatibility to the existing driver > is not worth it (almost no code sharing). > > The driver currently exposes features, which are not available > via other means: > > * Extra Keys > * System LEDs > * Keyboard Backlight Control > > The driver has been developed by reading the ACPI DSDT. There > are some more features around thermal control, which are not > yet supported by the driver. > > The speaker mute and mic mute LEDs need some additional changes > in the ALSA UCM to be set automatically. > > Signed-off-by: Sebastian Reichel > --- > MAINTAINERS | 6 + > drivers/platform/arm64/Kconfig | 20 + > drivers/platform/arm64/Makefile | 1 + > drivers/platform/arm64/lenovo-thinkpad-t14s.c | 597 ++++++++++++++++++++++++++ > 4 files changed, 624 insertions(+) > > diff --git a/MAINTAINERS b/MAINTAINERS > index e94d68c980c5f8bef2e1caf26b1a775df6aa1d84..589466169c222b2e088c6112a1e724c95e948f72 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -25092,6 +25092,12 @@ W: http://thinkwiki.org/wiki/Ibm-acpi > T: git git://repo.or.cz/linux-2.6/linux-acpi-2.6/ibm-acpi-2.6.git > F: drivers/platform/x86/lenovo/thinkpad_acpi.c > > +THINKPAD T14S EMBEDDED CONTROLLER DRIVER > +M: Sebastian Reichel > +S: Maintained > +F: Documentation/devicetree/bindings/platform/lenovo,thinkpad-t14s-ec.yaml > +F: drivers/platform/arm64/lenovo-thinkpad-t14s.c > + > THINKPAD LMI DRIVER > M: Mark Pearson > L: platform-driver-x86@vger.kernel.org > diff --git a/drivers/platform/arm64/Kconfig b/drivers/platform/arm64/Kconfig > index 06288aebc5599435065a37f8dacd046b5def80bd..10f905d7d6bfa5fad30a0689d3a20481268c781e 100644 > --- a/drivers/platform/arm64/Kconfig > +++ b/drivers/platform/arm64/Kconfig > @@ -70,4 +70,24 @@ config EC_LENOVO_YOGA_C630 > > Say M or Y here to include this support. > > +config EC_LENOVO_THINKPAD_T14S > + tristate "Lenovo Thinkpad T14s Embedded Controller driver" > + depends on ARCH_QCOM || COMPILE_TEST > + depends on I2C > + depends on INPUT > + select INPUT_SPARSEKMAP > + select LEDS_CLASS > + select NEW_LEDS > + select SND_CTL_LED if SND > + help > + Driver for the Embedded Controller in the Qualcomm Snapdragon-based > + Lenovo Thinkpad T14s, which provides access to keyboard backlight > + and status LEDs. > + > + This driver provides support for the mentioned laptop where this > + information is not properly exposed via the standard Qualcomm > + devices. > + > + Say M or Y here to include this support. > + > endif # ARM64_PLATFORM_DEVICES > diff --git a/drivers/platform/arm64/Makefile b/drivers/platform/arm64/Makefile > index 46a99eba3264cc40e812567d1533bb86031a6af3..60c131cff6a15bb51a49c9edab95badf513ee0f6 100644 > --- a/drivers/platform/arm64/Makefile > +++ b/drivers/platform/arm64/Makefile > @@ -8,3 +8,4 @@ > obj-$(CONFIG_EC_ACER_ASPIRE1) += acer-aspire1-ec.o > obj-$(CONFIG_EC_HUAWEI_GAOKUN) += huawei-gaokun-ec.o > obj-$(CONFIG_EC_LENOVO_YOGA_C630) += lenovo-yoga-c630.o > +obj-$(CONFIG_EC_LENOVO_THINKPAD_T14S) += lenovo-thinkpad-t14s.o > diff --git a/drivers/platform/arm64/lenovo-thinkpad-t14s.c b/drivers/platform/arm64/lenovo-thinkpad-t14s.c > new file mode 100644 > index 0000000000000000000000000000000000000000..ab783870e8eadfe13d83500c7f39440291e42cc9 > --- /dev/null > +++ b/drivers/platform/arm64/lenovo-thinkpad-t14s.c > @@ -0,0 +1,597 @@ > +// SPDX-License-Identifier: GPL-2.0-only > +/* > + * Copyright (c) 2025, Sebastian Reichel > + */ > + > +#define DEBUG ? > + > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > + > +#define THINKPAD_T14S_EC_CMD_ECRD 0x02 > +#define THINKPAD_T14S_EC_CMD_ECWR 0x03 > +#define THINKPAD_T14S_EC_CMD_EVT 0xf0 > + > +#define THINKPAD_T14S_EC_REG_LED 0x0c > +#define THINKPAD_T14S_EC_REG_KBD_BL1 0x0d > +#define THINKPAD_T14S_EC_REG_KBD_BL2 0xe1 > +#define THINKPAD_T14S_EC_KBD_BL1_MASK GENMASK_U8(7, 6) + linux/bits.h > +#define THINKPAD_T14S_EC_KBD_BL1_SHIFT 6 > +#define THINKPAD_T14S_EC_KBD_BL2_MASK GENMASK_U8(3, 2) > +#define THINKPAD_T14S_EC_KBD_BL2_SHIFT 2 Use FIELD_GET/PREP() and drop any _SHIFT defines. Don't forget to add linux/bitfield.h when using FIELD_*(). > +#define THINKPAD_T14S_EC_REG_AUD 0x30 > +#define THINKPAD_T14S_EC_MIC_MUTE_LED BIT(5) > +#define THINKPAD_T14S_EC_SPK_MUTE_LED BIT(6) > + > +#define THINKPAD_T14S_EC_EVT_NONE 0x00 > +#define THINKPAD_T14S_EC_EVT_KEY_FN_4 0x13 > +#define THINKPAD_T14S_EC_EVT_KEY_FN_F7 0x16 > +#define THINKPAD_T14S_EC_EVT_KEY_FN_SPACE 0x1F > +#define THINKPAD_T14S_EC_EVT_KEY_TP_DOUBLE_TAP 0x20 > +#define THINKPAD_T14S_EC_EVT_AC_CONNECTED 0x26 > +#define THINKPAD_T14S_EC_EVT_AC_DISCONNECTED 0x27 > +#define THINKPAD_T14S_EC_EVT_KEY_POWER 0x28 > +#define THINKPAD_T14S_EC_EVT_LID_OPEN 0x2A > +#define THINKPAD_T14S_EC_EVT_LID_CLOSED 0x2B > +#define THINKPAD_T14S_EC_EVT_KEY_FN_F12 0x62 > +#define THINKPAD_T14S_EC_EVT_KEY_FN_TAB 0x63 > +#define THINKPAD_T14S_EC_EVT_KEY_FN_F8 0x64 > +#define THINKPAD_T14S_EC_EVT_KEY_FN_F10 0x65 > +#define THINKPAD_T14S_EC_EVT_KEY_FN_F4 0x6A > +#define THINKPAD_T14S_EC_EVT_KEY_FN_D 0x6B > +#define THINKPAD_T14S_EC_EVT_KEY_FN_T 0x6C > +#define THINKPAD_T14S_EC_EVT_KEY_FN_H 0x6D > +#define THINKPAD_T14S_EC_EVT_KEY_FN_M 0x6E > +#define THINKPAD_T14S_EC_EVT_KEY_FN_L 0x6F > +#define THINKPAD_T14S_EC_EVT_KEY_FN_RIGHT_SHIFT 0x71 > +#define THINKPAD_T14S_EC_EVT_KEY_FN_ESC 0x74 > +#define THINKPAD_T14S_EC_EVT_KEY_FN_N 0x79 > +#define THINKPAD_T14S_EC_EVT_KEY_FN_F11 0x7A > +#define THINKPAD_T14S_EC_EVT_KEY_FN_G 0x7E > + > +enum thinkpad_t14s_ec_led_status_t { > + THINKPAD_EC_LED_OFF = 0x00, > + THINKPAD_EC_LED_ON = 0x80, > + THINKPAD_EC_LED_BLINK = 0xc0, Align values. > +}; > + > +struct thinkpad_t14s_ec_led_classdev { > + struct led_classdev led_classdev; > + int led; > + enum thinkpad_t14s_ec_led_status_t cache; > + struct thinkpad_t14s_ec *ec; > +}; > + > +struct thinkpad_t14s_ec { > + struct regmap *regmap; > + struct device *dev; > + struct thinkpad_t14s_ec_led_classdev led_pwr_btn; > + struct thinkpad_t14s_ec_led_classdev led_chrg_orange; > + struct thinkpad_t14s_ec_led_classdev led_chrg_white; > + struct thinkpad_t14s_ec_led_classdev led_lid_logo_dot; > + struct led_classdev kbd_backlight; > + struct led_classdev led_mic_mute; > + struct led_classdev led_spk_mute; > + struct input_dev *inputdev; > +}; > + > +static const struct regmap_config thinkpad_t14s_ec_regmap_config = { > + .reg_bits = 8, > + .val_bits = 8, > + .max_register = 0xff, > +}; > + > +static int thinkpad_t14s_ec_write(void *context, unsigned int reg, > + unsigned int val) > +{ > + char buf[5] = {THINKPAD_T14S_EC_CMD_ECWR, reg, 0x00, 0x01, val}; Please use u8 instead of char for anything that is binary data. > + struct thinkpad_t14s_ec *ec = context; > + struct i2c_client *client = to_i2c_client(ec->dev); > + int ret; > + > + ret = i2c_master_send(client, buf, sizeof(buf)); > + if (ret < 0) > + return ret; > + > + return 0; > +} > + > +static int thinkpad_t14s_ec_read(void *context, unsigned int reg, > + unsigned int *val) > +{ > + char buf[4] = {THINKPAD_T14S_EC_CMD_ECRD, reg, 0x00, 0x01}; Ditto. > + struct thinkpad_t14s_ec *ec = context; > + struct i2c_client *client = to_i2c_client(ec->dev); > + struct i2c_msg request, response; > + u8 result; > + int ret; > + > + request.addr = client->addr; > + request.flags = I2C_M_STOP; > + request.len = sizeof(buf); > + request.buf = buf; > + response.addr = client->addr; > + response.flags = I2C_M_RD; > + response.len = 1; > + response.buf = &result; > + > + i2c_lock_bus(client->adapter, I2C_LOCK_SEGMENT); > + > + ret = __i2c_transfer(client->adapter, &request, 1); > + if (ret < 0) > + goto out; > + ret = __i2c_transfer(client->adapter, &response, 1); > + if (ret < 0) > + goto out; > + > + *val = result; > + ret = 0; > + > +out: > + i2c_unlock_bus(client->adapter, I2C_LOCK_SEGMENT); > + return ret; > +} > + > +static const struct regmap_bus thinkpad_t14s_ec_regmap_bus = { > + .reg_write = thinkpad_t14s_ec_write, > + .reg_read = thinkpad_t14s_ec_read, > +}; > + > +static int thinkpad_t14s_ec_read_evt(struct thinkpad_t14s_ec *ec, u8 *val) > +{ > + char buf[4] = {THINKPAD_T14S_EC_CMD_EVT, 0x00, 0x00, 0x01}; > + struct i2c_client *client = to_i2c_client(ec->dev); > + struct i2c_msg request, response; > + int ret; > + > + request.addr = client->addr; > + request.flags = I2C_M_STOP; > + request.len = sizeof(buf); > + request.buf = buf; > + response.addr = client->addr; > + response.flags = I2C_M_RD; > + response.len = 1; > + response.buf = val; > + > + i2c_lock_bus(client->adapter, I2C_LOCK_SEGMENT); > + > + ret = __i2c_transfer(client->adapter, &request, 1); > + if (ret < 0) > + goto out; > + ret = __i2c_transfer(client->adapter, &response, 1); > + if (ret < 0) > + goto out; > + > + ret = 0; > + > +out: > + i2c_unlock_bus(client->adapter, I2C_LOCK_SEGMENT); > + return ret; > +} > + > +static int thinkpad_t14s_led_set_status(struct thinkpad_t14s_ec *ec, > + struct thinkpad_t14s_ec_led_classdev *led, > + const enum thinkpad_t14s_ec_led_status_t ledstatus) > +{ > + int ret; > + > + ret = regmap_write(ec->regmap, THINKPAD_T14S_EC_REG_LED, > + led->led | ledstatus); > + if (ret < 0) > + return ret; > + > + led->cache = ledstatus; > + return 0; > +} > + > +static int thinkpad_t14s_led_set(struct led_classdev *led_cdev, > + enum led_brightness brightness) > +{ > + struct thinkpad_t14s_ec_led_classdev *led = container_of(led_cdev, > + struct thinkpad_t14s_ec_led_classdev, led_classdev); > + enum thinkpad_t14s_ec_led_status_t new_state; > + > + if (brightness == LED_OFF) > + new_state = THINKPAD_EC_LED_OFF; > + else if (led->cache != THINKPAD_EC_LED_BLINK) > + new_state = THINKPAD_EC_LED_ON; > + else > + new_state = THINKPAD_EC_LED_BLINK; > + > + return thinkpad_t14s_led_set_status(led->ec, led, new_state); > +} > + > +static int thinkpad_t14s_led_blink_set(struct led_classdev *led_cdev, > + unsigned long *delay_on, > + unsigned long *delay_off) > +{ > + struct thinkpad_t14s_ec_led_classdev *led = container_of(led_cdev, > + struct thinkpad_t14s_ec_led_classdev, led_classdev); > + > + /* Can we choose the flash rate? */ > + if (*delay_on == 0 && *delay_off == 0) { > + /* yes. set them to the hardware blink rate (1 Hz) */ > + *delay_on = 500; /* ms */ > + *delay_off = 500; /* ms */ > + } else if ((*delay_on != 500) || (*delay_off != 500)) > + return -EINVAL; Please add a define for this delay with unit in the define's name so you can use that instead of literals and unit comments. Since the times are the same, I don't think off/on needs own defines. > + > + return thinkpad_t14s_led_set_status(led->ec, led, THINKPAD_EC_LED_BLINK); > +} > + > +static int thinkpad_t14s_init_led(struct thinkpad_t14s_ec *ec, > + struct thinkpad_t14s_ec_led_classdev *led, > + u8 id, const char *name) > +{ > + led->led_classdev.name = name; > + led->led_classdev.flags = LED_RETAIN_AT_SHUTDOWN; > + led->led_classdev.max_brightness = 1; > + led->led_classdev.brightness_set_blocking = thinkpad_t14s_led_set; > + led->led_classdev.blink_set = thinkpad_t14s_led_blink_set; > + led->ec = ec; > + led->led = id; > + > + return devm_led_classdev_register(ec->dev, &led->led_classdev); > +} > + > +static int thinkpad_t14s_leds_probe(struct thinkpad_t14s_ec *ec) > +{ > + int ret; > + > + ret = thinkpad_t14s_init_led(ec, &ec->led_pwr_btn, 0, > + "platform::power"); > + if (ret) > + return ret; > + ret = thinkpad_t14s_init_led(ec, &ec->led_chrg_orange, 1, > + "platform:amber:battery-charging"); > + if (ret) > + return ret; > + ret = thinkpad_t14s_init_led(ec, &ec->led_chrg_white, 2, > + "platform:white:battery-full"); > + if (ret) > + return ret; > + ret = thinkpad_t14s_init_led(ec, &ec->led_lid_logo_dot, 10, > + "platform::lid_logo_dot"); > + if (ret) > + return ret; > + > + return 0; > +} > + > +static int thinkpad_t14s_kbd_bl_set(struct led_classdev *led_cdev, > + enum led_brightness brightness) > +{ > + struct thinkpad_t14s_ec *ec = container_of(led_cdev, > + struct thinkpad_t14s_ec, kbd_backlight); > + int ret; > + > + ret = regmap_update_bits(ec->regmap, THINKPAD_T14S_EC_REG_KBD_BL1, > + THINKPAD_T14S_EC_KBD_BL1_MASK, > + brightness << THINKPAD_T14S_EC_KBD_BL1_SHIFT); > + if (ret < 0) > + return ret; > + > + ret = regmap_update_bits(ec->regmap, THINKPAD_T14S_EC_REG_KBD_BL2, > + THINKPAD_T14S_EC_KBD_BL2_MASK, > + brightness << THINKPAD_T14S_EC_KBD_BL2_SHIFT); > + if (ret < 0) > + return ret; > + > + return 0; > +} > + > +static enum led_brightness thinkpad_t14s_kbd_bl_get(struct led_classdev *led_cdev) > +{ > + struct thinkpad_t14s_ec *ec = container_of(led_cdev, > + struct thinkpad_t14s_ec, kbd_backlight); > + int ret, val; Why is val signed? > + > + ret = regmap_read(ec->regmap, THINKPAD_T14S_EC_REG_KBD_BL1, &val); > + if (ret < 0) > + return ret; > + > + val &= THINKPAD_T14S_EC_KBD_BL1_MASK; > + > + return val >> THINKPAD_T14S_EC_KBD_BL1_SHIFT; > +} > + > +static void thinkpad_t14s_kbd_bl_update(struct thinkpad_t14s_ec *ec) > +{ > + enum led_brightness brightness = thinkpad_t14s_kbd_bl_get(&ec->kbd_backlight); > + > + led_classdev_notify_brightness_hw_changed(&ec->kbd_backlight, brightness); > +} > + > +static int thinkpad_t14s_kbd_backlight_probe(struct thinkpad_t14s_ec *ec) > +{ > + ec->kbd_backlight.name = "platform::kbd_backlight"; > + ec->kbd_backlight.flags = LED_BRIGHT_HW_CHANGED; > + ec->kbd_backlight.max_brightness = 2; > + ec->kbd_backlight.brightness_set_blocking = thinkpad_t14s_kbd_bl_set; > + ec->kbd_backlight.brightness_get = thinkpad_t14s_kbd_bl_get; > + > + return devm_led_classdev_register(ec->dev, &ec->kbd_backlight); > +} > + > +static enum led_brightness thinkpad_t14s_audio_led_get(struct thinkpad_t14s_ec *ec, > + u8 led_bit) > +{ > + int ret, val; > + > + ret = regmap_read(ec->regmap, THINKPAD_T14S_EC_REG_AUD, &val); > + if (ret < 0) > + return ret; > + > + return !!(val && led_bit); Please don't rely on implicit conversion for bool -> enum led_brightness! > +} > + > +static enum led_brightness thinkpad_t14s_audio_led_set(struct thinkpad_t14s_ec *ec, > + u8 led_bit, > + enum led_brightness brightness) > +{ > + u8 val = brightness ? led_bit : 0; > + > + return regmap_update_bits(ec->regmap, THINKPAD_T14S_EC_REG_AUD, led_bit, val); > +} > + > +static enum led_brightness thinkpad_t14s_mic_mute_led_get(struct led_classdev *led_cdev) > +{ > + struct thinkpad_t14s_ec *ec = container_of(led_cdev, > + struct thinkpad_t14s_ec, led_mic_mute); > + > + return thinkpad_t14s_audio_led_get(ec, THINKPAD_T14S_EC_MIC_MUTE_LED); > +} > + > +static int thinkpad_t14s_mic_mute_led_set(struct led_classdev *led_cdev, > + enum led_brightness brightness) > +{ > + struct thinkpad_t14s_ec *ec = container_of(led_cdev, > + struct thinkpad_t14s_ec, led_mic_mute); > + > + return thinkpad_t14s_audio_led_set(ec, THINKPAD_T14S_EC_MIC_MUTE_LED, brightness); > +} > + > +static enum led_brightness thinkpad_t14s_spk_mute_led_get(struct led_classdev *led_cdev) > +{ > + struct thinkpad_t14s_ec *ec = container_of(led_cdev, > + struct thinkpad_t14s_ec, led_spk_mute); > + > + return thinkpad_t14s_audio_led_get(ec, THINKPAD_T14S_EC_SPK_MUTE_LED); > +} > + > +static int thinkpad_t14s_spk_mute_led_set(struct led_classdev *led_cdev, > + enum led_brightness brightness) > +{ > + struct thinkpad_t14s_ec *ec = container_of(led_cdev, > + struct thinkpad_t14s_ec, led_spk_mute); > + > + return thinkpad_t14s_audio_led_set(ec, THINKPAD_T14S_EC_SPK_MUTE_LED, brightness); > +} > + > +static int thinkpad_t14s_kbd_audio_led_probe(struct thinkpad_t14s_ec *ec) > +{ > + int ret; > + > + ec->led_mic_mute.name = "platform::micmute"; > + ec->led_mic_mute.max_brightness = 1, > + ec->led_mic_mute.default_trigger = "audio-micmute", > + ec->led_mic_mute.brightness_set_blocking = thinkpad_t14s_mic_mute_led_set; > + ec->led_mic_mute.brightness_get = thinkpad_t14s_mic_mute_led_get; > + > + ec->led_spk_mute.name = "platform::mute"; > + ec->led_spk_mute.max_brightness = 1, > + ec->led_spk_mute.default_trigger = "audio-mute", > + ec->led_spk_mute.brightness_set_blocking = thinkpad_t14s_spk_mute_led_set; > + ec->led_spk_mute.brightness_get = thinkpad_t14s_spk_mute_led_get; > + > + ret = devm_led_classdev_register(ec->dev, &ec->led_mic_mute); > + if (ret) > + return ret; > + > + return devm_led_classdev_register(ec->dev, &ec->led_spk_mute); > +} > + > +/* > + * using code 0x16 ignores the provided KEY code and use KEY_MUTE, > + * so all codes have a 0x1000 offset > + */ > +static const struct key_entry thinkpad_t14s_keymap[] = { > + { KE_KEY, 0x1000 + THINKPAD_T14S_EC_EVT_KEY_FN_4, { KEY_SLEEP } }, > + { KE_KEY, 0x1000 + THINKPAD_T14S_EC_EVT_KEY_FN_N, { KEY_VENDOR } }, > + { KE_KEY, 0x1000 + THINKPAD_T14S_EC_EVT_KEY_FN_F4, { KEY_MICMUTE } }, > + { KE_KEY, 0x1000 + THINKPAD_T14S_EC_EVT_KEY_FN_F7, { KEY_SWITCHVIDEOMODE } }, > + { KE_KEY, 0x1000 + THINKPAD_T14S_EC_EVT_KEY_FN_F8, { KEY_MODE } }, > + { KE_KEY, 0x1000 + THINKPAD_T14S_EC_EVT_KEY_FN_F10, { KEY_SELECTIVE_SCREENSHOT } }, > + { KE_KEY, 0x1000 + THINKPAD_T14S_EC_EVT_KEY_FN_F11, { KEY_LINK_PHONE } }, > + { KE_KEY, 0x1000 + THINKPAD_T14S_EC_EVT_KEY_FN_F12, { KEY_BOOKMARKS } }, > + { KE_KEY, 0x1000 + THINKPAD_T14S_EC_EVT_KEY_FN_SPACE, { KEY_KBDILLUMTOGGLE } }, > + { KE_KEY, 0x1000 + THINKPAD_T14S_EC_EVT_KEY_FN_ESC, { KEY_FN_ESC } }, > + { KE_KEY, 0x1000 + THINKPAD_T14S_EC_EVT_KEY_FN_TAB, { KEY_ZOOM } }, > + { KE_KEY, 0x1000 + THINKPAD_T14S_EC_EVT_KEY_FN_RIGHT_SHIFT, { KEY_FN_RIGHT_SHIFT } }, > + { KE_KEY, 0x1000 + THINKPAD_T14S_EC_EVT_KEY_TP_DOUBLE_TAP, { KEY_PROG4 } }, > + { KE_END } > +}; > + > +static int thinkpad_t14s_input_probe(struct thinkpad_t14s_ec *ec) > +{ > + int ret; > + > + ec->inputdev = devm_input_allocate_device(ec->dev); > + if (!ec->inputdev) > + return -ENOMEM; > + > + ec->inputdev->name = "ThinkPad Extra Buttons"; > + ec->inputdev->phys = "thinkpad/input0"; > + ec->inputdev->id.bustype = BUS_HOST; > + ec->inputdev->dev.parent = ec->dev; > + > + ret = sparse_keymap_setup(ec->inputdev, thinkpad_t14s_keymap, NULL); > + if (ret) > + return ret; > + > + ret = input_register_device(ec->inputdev); > + if (ret < 0) > + return ret; > + > + return 0; > +} > + > +static irqreturn_t thinkpad_t14s_ec_irq_handler(int irq, void *data) > +{ > + struct thinkpad_t14s_ec *ec = data; > + int ret; > + u8 val; > + > + ret = thinkpad_t14s_ec_read_evt(ec, &val); > + if (ret < 0) { > + dev_err(ec->dev, "Failed to read event\n"); > + return IRQ_HANDLED; > + } > + > + switch (val) { > + case THINKPAD_T14S_EC_EVT_NONE: > + break; > + case THINKPAD_T14S_EC_EVT_KEY_FN_SPACE: > + thinkpad_t14s_kbd_bl_update(ec); > + fallthrough; > + case THINKPAD_T14S_EC_EVT_KEY_FN_F4: > + case THINKPAD_T14S_EC_EVT_KEY_FN_F7: > + case THINKPAD_T14S_EC_EVT_KEY_FN_4: > + case THINKPAD_T14S_EC_EVT_KEY_FN_F8: > + case THINKPAD_T14S_EC_EVT_KEY_FN_F12: > + case THINKPAD_T14S_EC_EVT_KEY_FN_TAB: > + case THINKPAD_T14S_EC_EVT_KEY_FN_F10: > + case THINKPAD_T14S_EC_EVT_KEY_FN_N: > + case THINKPAD_T14S_EC_EVT_KEY_FN_F11: > + case THINKPAD_T14S_EC_EVT_KEY_FN_ESC: > + case THINKPAD_T14S_EC_EVT_KEY_FN_RIGHT_SHIFT: > + case THINKPAD_T14S_EC_EVT_KEY_TP_DOUBLE_TAP: > + sparse_keymap_report_event(ec->inputdev, 0x1000 + val, 1, true); This 0x1000 should be defined. > + break; > + case THINKPAD_T14S_EC_EVT_AC_CONNECTED: > + dev_dbg(ec->dev, "AC connected\n"); > + break; > + case THINKPAD_T14S_EC_EVT_AC_DISCONNECTED: > + dev_dbg(ec->dev, "AC disconnected\n"); > + break; > + case THINKPAD_T14S_EC_EVT_KEY_POWER: > + dev_dbg(ec->dev, "power button\n"); > + break; > + case THINKPAD_T14S_EC_EVT_LID_OPEN: > + dev_dbg(ec->dev, "LID open\n"); > + break; > + case THINKPAD_T14S_EC_EVT_LID_CLOSED: > + dev_dbg(ec->dev, "LID closed\n"); > + break; > + case THINKPAD_T14S_EC_EVT_KEY_FN_G: > + dev_dbg(ec->dev, "FN + G - toggle double-tapping\n"); > + break; > + case THINKPAD_T14S_EC_EVT_KEY_FN_L: > + dev_dbg(ec->dev, "FN + L - low performance mode\n"); > + break; > + case THINKPAD_T14S_EC_EVT_KEY_FN_M: > + dev_dbg(ec->dev, "FN + M - medium performance mode\n"); > + break; > + case THINKPAD_T14S_EC_EVT_KEY_FN_H: > + dev_dbg(ec->dev, "FN + H - high performance mode\n"); > + break; > + case THINKPAD_T14S_EC_EVT_KEY_FN_T: > + dev_dbg(ec->dev, "FN + T - toggle intelligent cooling mode\n"); > + break; > + case THINKPAD_T14S_EC_EVT_KEY_FN_D: > + dev_dbg(ec->dev, "FN + D - toggle privacy guard mode\n"); > + break; > + default: > + dev_info(ec->dev, "Unknown EC event: 0x%02x\n", val); > + break; > + } > + > + return IRQ_HANDLED; > +} > + > +static int thinkpad_t14s_ec_probe(struct i2c_client *client) > +{ > + struct device *dev = &client->dev; > + struct thinkpad_t14s_ec *ec; > + int ret; > + > + ec = devm_kzalloc(dev, sizeof(*ec), GFP_KERNEL); > + if (!ec) > + return -ENOMEM; > + > + ec->dev = dev; > + > + ec->regmap = devm_regmap_init(dev, &thinkpad_t14s_ec_regmap_bus, > + ec, &thinkpad_t14s_ec_regmap_config); > + if (IS_ERR(ec->regmap)) > + return dev_err_probe(dev, PTR_ERR(ec->regmap), > + "Failed to init regmap\n"); > + > + ret = devm_request_threaded_irq(dev, client->irq, NULL, > + thinkpad_t14s_ec_irq_handler, > + IRQF_ONESHOT, dev_name(dev), ec); > + if (ret < 0) > + return dev_err_probe(dev, ret, "Failed to get IRQ\n"); > + > + ret = thinkpad_t14s_leds_probe(ec); > + if (ret < 0) > + return ret; > + > + ret = thinkpad_t14s_kbd_backlight_probe(ec); > + if (ret < 0) > + return ret; > + > + ret = thinkpad_t14s_kbd_audio_led_probe(ec); > + if (ret < 0) > + return ret; > + > + ret = thinkpad_t14s_input_probe(ec); > + if (ret < 0) > + return ret; > + > + /* > + * Disable wakeup support by default, because the driver currently does > + * not support masking any events and the laptop should not wake up when > + * the LID is closed. > + */ > + device_wakeup_disable(dev); > + > + return 0; > +} > + > +static const struct of_device_id thinkpad_t14s_ec_of_match[] = { > + { .compatible = "lenovo,thinkpad-t14s-ec" }, > + {} > +}; > +MODULE_DEVICE_TABLE(of, thinkpad_t14s_ec_of_match); > + > +static const struct i2c_device_id thinkpad_t14s_ec_i2c_id_table[] = { > + { "thinkpad-t14s-ec", }, > + {} > +}; > +MODULE_DEVICE_TABLE(i2c, thinkpad_t14s_ec_i2c_id_table); > + > +static struct i2c_driver thinkpad_t14s_ec_i2c_driver = { > + .driver = { > + .name = "thinkpad-t14s-ec", > + .of_match_table = thinkpad_t14s_ec_of_match Please add a comma to any non-terminator entry. > + }, > + .probe = thinkpad_t14s_ec_probe, > + .id_table = thinkpad_t14s_ec_i2c_id_table, > +}; > +module_i2c_driver(thinkpad_t14s_ec_i2c_driver); > + > +MODULE_AUTHOR("Sebastian Reichel "); > +MODULE_DESCRIPTION("Lenovo Thinkpad T14s Embedded Controller"); > +MODULE_LICENSE("GPL"); > > -- i.