From nobody Tue Feb 10 00:00:59 2026 Received: from mail-lj1-f171.google.com (mail-lj1-f171.google.com [209.85.208.171]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 09BB517B4FA for ; Tue, 28 May 2024 20:44:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716929104; cv=none; b=gg8FWCGuVaz4jNjhOP8NhbqWXlbm+9TK472MrfI6Xpck5Q3h77/4dXtD+icXdcE0MbO2mbzPxqnGNguIMOKCejev/ZIGRXJVMsGQT1LmhMOfpAofDuxkzZXw02ZFB3o0FcEzQa6coi1DUdNg1y7mvApF013V9P4itn+QgnV8qW4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716929104; c=relaxed/simple; bh=ow1eTZcV+R5LsXpA87aPOh1pjE54fwdYN5zMsddX7J0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=XFR5nbAbd+W3saF94H3iyibADG3OyCjV/UuqDZBMpuNFbkJBW+++Bgju8dioBRLveuoQCED+KZhkQQI0aBaoM2k5dJWaiDZ3w3zTOVZ91H9n502b3hnrX5kVTog4TsiwUKPtbLBygNj07HSaSuqOLUyxOdEY+oNlv/mlm6vjCKw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=ln1/+sDH; arc=none smtp.client-ip=209.85.208.171 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="ln1/+sDH" Received: by mail-lj1-f171.google.com with SMTP id 38308e7fff4ca-2e964acff1aso13436251fa.0 for ; Tue, 28 May 2024 13:44:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1716929098; x=1717533898; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=ifPw2+gkFyqfl8SUMYERBSnZAC0LWQSO6VH44/EleWI=; b=ln1/+sDHjEmK7u1owBv/cJJNfOTUM7x0kdPQsoQgTNHCFsy3EBkeuNkZsyYuzPxdL8 MaPN4vsFWsR00r7kMXIozHAHKs61lpj7OVwkKxF2q6CJNz8Qjb4wY8RFf5AcXcGNqVGV 8YN1dmmiXE+KMj5atXcqNwkbLY4LGnhyRj1wz146aF+8guH5/bU5d51RutOTJ+ZT00WD TKvGvWfqwKzrA/b0heQPyzYNujNYySqx8ypV1rzy2chK+QGXL6ZdWNX1JKfzsnjXD9u6 vhQu5cPCecbaMhAl66I/8KGiemyQZ2XBNxuJqocmEl1/bgO1E9f6j45AzjYnet8ii2u5 Q11A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716929098; x=1717533898; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ifPw2+gkFyqfl8SUMYERBSnZAC0LWQSO6VH44/EleWI=; b=NR3jmg1iFccJx5Q2kngOuv4qSb7+CHkV7o3+A3jEM7L0uv9QZwK59uN0bDgAbTaBQr RXmA9dp2Il8X5pVMwob9YUp6xT8+kiQl/ClnyzJ7FKKPHruQkjBparewfreB6Nhsu52O gnrE9slmvbWLuly/kvscBf6xWMgBmNL1fEhLS9pk0zndYOwrFxrReZ+/gvMCLcLMstyE kjXTfpGxQThGB5YdV4B5SorscLpL8SAVYrm7Vssf3H8ebXzXoQe05F7bgjPk/0yoQ8BI vsnA326BESPhCc7ccA9XFSTsQdPGBeBoZrrZCgPIyluMF8i9Tf4TiAO3tq+aoD/tPaLJ f1ug== X-Forwarded-Encrypted: i=1; AJvYcCWSUj9IcsqDX3DeD93E6J1Q0k8B/YMsPfbzGb6SAu3a/jPBIehKqsQd7kqJ7aTOk4OyKdmB3HPfNI9h/S+F8rnQBhoVo23j0Q7q4c9a X-Gm-Message-State: AOJu0YylEemplA5al02zpKTu2pikqbeOtczA1abr1g0FA421LkXmDnXy krqWmSUgBaSRcOaxnbuhLR8QIpbE1dK6ZDQCW7o1GylbyGJ0oaksUfoQ1wl02Yw= X-Google-Smtp-Source: AGHT+IGL0fGM0DRfvpgGJM9UAw54+tgLICLoXo7esTZ0Mu0MtC8dqJ1QrOz6A0eimvTUESLkgjmAuA== X-Received: by 2002:a2e:8807:0:b0:2e9:5ad4:e22f with SMTP id 38308e7fff4ca-2e95b3089e4mr85537261fa.53.1716929097801; Tue, 28 May 2024 13:44:57 -0700 (PDT) Received: from umbar.lan ([192.130.178.91]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-2e95bdcd21esm22759431fa.100.2024.05.28.13.44.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 May 2024 13:44:57 -0700 (PDT) From: Dmitry Baryshkov Date: Tue, 28 May 2024 23:44:49 +0300 Subject: [PATCH v4 4/6] power: supply: lenovo_yoga_c630_battery: add Lenovo C630 driver Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240528-yoga-ec-driver-v4-4-4fa8dfaae7b6@linaro.org> References: <20240528-yoga-ec-driver-v4-0-4fa8dfaae7b6@linaro.org> In-Reply-To: <20240528-yoga-ec-driver-v4-0-4fa8dfaae7b6@linaro.org> To: Sebastian Reichel , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Bjorn Andersson , Hans de Goede , =?utf-8?q?Ilpo_J=C3=A4rvinen?= , Bryan O'Donoghue , Heikki Krogerus , Greg Kroah-Hartman , Konrad Dybcio Cc: linux-pm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, platform-driver-x86@vger.kernel.org, linux-usb@vger.kernel.org, linux-arm-msm@vger.kernel.org, Nikita Travkin X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=15084; i=dmitry.baryshkov@linaro.org; h=from:subject:message-id; bh=ow1eTZcV+R5LsXpA87aPOh1pjE54fwdYN5zMsddX7J0=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBmVkJFH5uBSGa460IlsrMNF1b9Wp6t6OWZVrQVq Wjvhzm4Td2JATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCZlZCRQAKCRCLPIo+Aiko 1ct5B/9izpiOJVV8JCpZAL4ljFIncDVdRfr0pGadyRv+s8T346Wuf2ekY+agM1yCFzprgtugsFW VmJ4YjSN06w9X6Ho2OJyagTTMyOWV9lENsVI8yvV7JUGG9/dSFFPbtkQzD+uX1R70BgOUdSRqyq ml43FWGCm9Qgd1tzP7ii95yAdqj0IYri1TUHt9SMKM6tlYeMer8IcGP2NeRmyDoGVCQSdFM1Mf3 URcTG4hjqztIrYWptdDjpxMmavorH1U3yJ2MzfDyztqiqMpvZmf3DxIfr4Fa4KwqaDdKw05nRzp 9bwX4ouVOXXD/NeL+QHQn6mqcHyTfCiMJ1mQMxfsglf8Mrh9 X-Developer-Key: i=dmitry.baryshkov@linaro.org; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A On the Lenovo Yoga C630 WOS laptop the EC provides access to the adapter and battery status. Add the driver to read power supply status on the laptop. Signed-off-by: Dmitry Baryshkov --- drivers/power/supply/Kconfig | 9 + drivers/power/supply/Makefile | 1 + drivers/power/supply/lenovo_yoga_c630_battery.c | 479 ++++++++++++++++++++= ++++ 3 files changed, 489 insertions(+) diff --git a/drivers/power/supply/Kconfig b/drivers/power/supply/Kconfig index 3e31375491d5..55ab8e90747d 100644 --- a/drivers/power/supply/Kconfig +++ b/drivers/power/supply/Kconfig @@ -167,6 +167,15 @@ config BATTERY_LEGO_EV3 help Say Y here to enable support for the LEGO MINDSTORMS EV3 battery. =20 +config BATTERY_LENOVO_YOGA_C630 + tristate "Lenovo Yoga C630 battery" + depends on OF && EC_LENOVO_YOGA_C630 + help + This driver enables battery support on the Lenovo Yoga C630 laptop. + + To compile the driver as a module, choose M here: the module will be + called lenovo_yoga_c630_battery. + config BATTERY_PMU tristate "Apple PMU battery" depends on PPC32 && ADB_PMU diff --git a/drivers/power/supply/Makefile b/drivers/power/supply/Makefile index 58b567278034..8ebbdcf92dac 100644 --- a/drivers/power/supply/Makefile +++ b/drivers/power/supply/Makefile @@ -32,6 +32,7 @@ obj-$(CONFIG_BATTERY_DS2782) +=3D ds2782_battery.o obj-$(CONFIG_BATTERY_GAUGE_LTC2941) +=3D ltc2941-battery-gauge.o obj-$(CONFIG_BATTERY_GOLDFISH) +=3D goldfish_battery.o obj-$(CONFIG_BATTERY_LEGO_EV3) +=3D lego_ev3_battery.o +obj-$(CONFIG_BATTERY_LENOVO_YOGA_C630) +=3D lenovo_yoga_c630_battery.o obj-$(CONFIG_BATTERY_PMU) +=3D pmu_battery.o obj-$(CONFIG_BATTERY_QCOM_BATTMGR) +=3D qcom_battmgr.o obj-$(CONFIG_BATTERY_OLPC) +=3D olpc_battery.o diff --git a/drivers/power/supply/lenovo_yoga_c630_battery.c b/drivers/powe= r/supply/lenovo_yoga_c630_battery.c new file mode 100644 index 000000000000..76152ad38d46 --- /dev/null +++ b/drivers/power/supply/lenovo_yoga_c630_battery.c @@ -0,0 +1,479 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * Copyright (c) 2022-2024, Linaro Ltd + * Authors: + * Bjorn Andersson + * Dmitry Baryshkov + */ +#include +#include +#include +#include +#include + +struct yoga_c630_psy { + struct yoga_c630_ec *ec; + struct device *dev; + struct device_node *of_node; + struct notifier_block nb; + struct mutex lock; + + struct power_supply *adp_psy; + struct power_supply *bat_psy; + + unsigned long last_status_update; + + bool adapter_online; + + bool unit_mA; + + bool bat_present; + unsigned int bat_status; + unsigned int design_capacity; + unsigned int design_voltage; + unsigned int full_charge_capacity; + + unsigned int capacity_now; + unsigned int voltage_now; + + int current_now; + int rate_now; +}; + +#define LENOVO_EC_CACHE_TIME (10 * HZ) + +#define LENOVO_EC_ADPT_STATUS 0xa3 +#define LENOVO_EC_ADPT_PRESENT BIT(7) +#define LENOVO_EC_BAT_ATTRIBUTES 0xc0 +#define LENOVO_EC_BAT_ATTR_UNIT_IS_MA BIT(1) +#define LENOVO_EC_BAT_STATUS 0xc1 +#define LENOVO_EC_BAT_REMAIN_CAPACITY 0xc2 +#define LENOVO_EC_BAT_VOLTAGE 0xc6 +#define LENOVO_EC_BAT_DESIGN_VOLTAGE 0xc8 +#define LENOVO_EC_BAT_DESIGN_CAPACITY 0xca +#define LENOVO_EC_BAT_FULL_CAPACITY 0xcc +#define LENOVO_EC_BAT_CURRENT 0xd2 +#define LENOVO_EC_BAT_FULL_FACTORY 0xd6 +#define LENOVO_EC_BAT_PRESENT 0xda +#define LENOVO_EC_BAT_FULL_REGISTER 0xdb +#define LENOVO_EC_BAT_FULL_IS_FACTORY BIT(0) + +/* the mutex should already be locked */ +static int yoga_c630_psy_update_bat_info(struct yoga_c630_psy *ecbat) +{ + struct yoga_c630_ec *ec =3D ecbat->ec; + int val; + + val =3D yoga_c630_ec_read8(ec, LENOVO_EC_BAT_PRESENT); + if (val < 0) + return val; + ecbat->bat_present =3D !!(val & BIT(0)); + if (!ecbat->bat_present) + return val; + + val =3D yoga_c630_ec_read8(ec, LENOVO_EC_BAT_ATTRIBUTES); + if (val < 0) + return val; + ecbat->unit_mA =3D val & LENOVO_EC_BAT_ATTR_UNIT_IS_MA; + + val =3D yoga_c630_ec_read16(ec, LENOVO_EC_BAT_DESIGN_CAPACITY); + if (val < 0) + return val; + ecbat->design_capacity =3D val * 1000; + + msleep(50); + + val =3D yoga_c630_ec_read16(ec, LENOVO_EC_BAT_DESIGN_VOLTAGE); + if (val < 0) + return val; + ecbat->design_voltage =3D val; + + msleep(50); + + val =3D yoga_c630_ec_read8(ec, LENOVO_EC_BAT_FULL_REGISTER); + if (val < 0) + return val; + if (val & LENOVO_EC_BAT_FULL_IS_FACTORY) + val =3D yoga_c630_ec_read16(ec, LENOVO_EC_BAT_FULL_FACTORY); + else + val =3D yoga_c630_ec_read16(ec, LENOVO_EC_BAT_FULL_CAPACITY); + if (val < 0) + return val; + + ecbat->full_charge_capacity =3D val * 1000; + + if (!ecbat->unit_mA) { + ecbat->design_capacity *=3D 10; + ecbat->full_charge_capacity *=3D 10; + } + + return 0; +} + +/* the mutex should already be locked */ +static int yoga_c630_psy_maybe_update_bat_status(struct yoga_c630_psy *ecb= at) +{ + struct yoga_c630_ec *ec =3D ecbat->ec; + int current_mA; + int val; + + if (time_before(jiffies, ecbat->last_status_update + LENOVO_EC_CACHE_TIME= )) + return 0; + + val =3D yoga_c630_ec_read8(ec, LENOVO_EC_BAT_STATUS); + if (val < 0) + return val; + ecbat->bat_status =3D val; + + msleep(50); + + val =3D yoga_c630_ec_read16(ec, LENOVO_EC_BAT_REMAIN_CAPACITY); + if (val < 0) + return val; + ecbat->capacity_now =3D val * 1000; + + msleep(50); + + val =3D yoga_c630_ec_read16(ec, LENOVO_EC_BAT_VOLTAGE); + if (val < 0) + return val; + ecbat->voltage_now =3D val * 1000; + + msleep(50); + + val =3D yoga_c630_ec_read16(ec, LENOVO_EC_BAT_CURRENT); + if (val < 0) + return val; + current_mA =3D sign_extend32(val, 15); + ecbat->current_now =3D current_mA * 1000; + ecbat->rate_now =3D current_mA * (ecbat->voltage_now / 1000); + + msleep(50); + + if (!ecbat->unit_mA) + ecbat->capacity_now *=3D 10; + + ecbat->last_status_update =3D jiffies; + + return 0; +} + +static int yoga_c630_psy_update_adapter_status(struct yoga_c630_psy *ecbat) +{ + struct yoga_c630_ec *ec =3D ecbat->ec; + int val; + + mutex_lock(&ecbat->lock); + + val =3D yoga_c630_ec_read8(ec, LENOVO_EC_ADPT_STATUS); + if (val > 0) + ecbat->adapter_online =3D FIELD_GET(LENOVO_EC_ADPT_PRESENT, val); + + mutex_unlock(&ecbat->lock); + + return val; +} + +static bool yoga_c630_psy_is_charged(struct yoga_c630_psy *ecbat) +{ + if (ecbat->bat_status !=3D 0) + return false; + + if (ecbat->full_charge_capacity <=3D ecbat->capacity_now) + return true; + + if (ecbat->design_capacity <=3D ecbat->capacity_now) + return true; + + return false; +} + +static int yoga_c630_psy_bat_get_property(struct power_supply *psy, + enum power_supply_property psp, + union power_supply_propval *val) +{ + struct yoga_c630_psy *ecbat =3D power_supply_get_drvdata(psy); + int rc =3D 0; + + if (!ecbat->bat_present && + psp !=3D POWER_SUPPLY_PROP_PRESENT) + return -ENODEV; + + mutex_lock(&ecbat->lock); + rc =3D yoga_c630_psy_maybe_update_bat_status(ecbat); + mutex_unlock(&ecbat->lock); + + if (rc) + return rc; + + switch (psp) { + case POWER_SUPPLY_PROP_STATUS: + if (ecbat->bat_status & BIT(0)) + val->intval =3D POWER_SUPPLY_STATUS_DISCHARGING; + else if (ecbat->bat_status & BIT(1)) + val->intval =3D POWER_SUPPLY_STATUS_CHARGING; + else if (yoga_c630_psy_is_charged(ecbat)) + val->intval =3D POWER_SUPPLY_STATUS_FULL; + else + val->intval =3D POWER_SUPPLY_STATUS_NOT_CHARGING; + break; + case POWER_SUPPLY_PROP_PRESENT: + val->intval =3D ecbat->bat_present; + break; + case POWER_SUPPLY_PROP_VOLTAGE_MIN_DESIGN: + val->intval =3D ecbat->design_voltage; + break; + case POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN: + case POWER_SUPPLY_PROP_ENERGY_FULL_DESIGN: + val->intval =3D ecbat->design_capacity; + break; + case POWER_SUPPLY_PROP_CHARGE_FULL: + case POWER_SUPPLY_PROP_ENERGY_FULL: + val->intval =3D ecbat->full_charge_capacity; + break; + case POWER_SUPPLY_PROP_CHARGE_NOW: + case POWER_SUPPLY_PROP_ENERGY_NOW: + val->intval =3D ecbat->capacity_now; + break; + case POWER_SUPPLY_PROP_CURRENT_NOW: + val->intval =3D ecbat->current_now; + break; + case POWER_SUPPLY_PROP_POWER_NOW: + val->intval =3D ecbat->rate_now; + break; + case POWER_SUPPLY_PROP_VOLTAGE_NOW: + val->intval =3D ecbat->voltage_now; + break; + case POWER_SUPPLY_PROP_TECHNOLOGY: + val->intval =3D POWER_SUPPLY_TECHNOLOGY_LION; + break; + case POWER_SUPPLY_PROP_MODEL_NAME: + val->strval =3D "PABAS0241231"; + break; + case POWER_SUPPLY_PROP_MANUFACTURER: + val->strval =3D "Compal"; + break; + default: + rc =3D -EINVAL; + break; + } + + return rc; +} + +static enum power_supply_property yoga_c630_psy_bat_mA_properties[] =3D { + POWER_SUPPLY_PROP_STATUS, + POWER_SUPPLY_PROP_PRESENT, + POWER_SUPPLY_PROP_VOLTAGE_MIN_DESIGN, + POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN, + POWER_SUPPLY_PROP_CHARGE_FULL, + POWER_SUPPLY_PROP_CHARGE_NOW, + POWER_SUPPLY_PROP_CURRENT_NOW, + POWER_SUPPLY_PROP_POWER_NOW, + POWER_SUPPLY_PROP_VOLTAGE_NOW, + POWER_SUPPLY_PROP_TECHNOLOGY, + POWER_SUPPLY_PROP_MODEL_NAME, + POWER_SUPPLY_PROP_MANUFACTURER, +}; + +static enum power_supply_property yoga_c630_psy_bat_mWh_properties[] =3D { + POWER_SUPPLY_PROP_STATUS, + POWER_SUPPLY_PROP_PRESENT, + POWER_SUPPLY_PROP_VOLTAGE_MIN_DESIGN, + POWER_SUPPLY_PROP_ENERGY_FULL_DESIGN, + POWER_SUPPLY_PROP_ENERGY_FULL, + POWER_SUPPLY_PROP_ENERGY_NOW, + POWER_SUPPLY_PROP_CURRENT_NOW, + POWER_SUPPLY_PROP_POWER_NOW, + POWER_SUPPLY_PROP_VOLTAGE_NOW, + POWER_SUPPLY_PROP_TECHNOLOGY, + POWER_SUPPLY_PROP_MODEL_NAME, + POWER_SUPPLY_PROP_MANUFACTURER, +}; + +static const struct power_supply_desc yoga_c630_psy_bat_psy_desc_mA =3D { + .name =3D "yoga-c630-battery", + .type =3D POWER_SUPPLY_TYPE_BATTERY, + .properties =3D yoga_c630_psy_bat_mA_properties, + .num_properties =3D ARRAY_SIZE(yoga_c630_psy_bat_mA_properties), + .get_property =3D yoga_c630_psy_bat_get_property, +}; + +static const struct power_supply_desc yoga_c630_psy_bat_psy_desc_mWh =3D { + .name =3D "yoga-c630-battery", + .type =3D POWER_SUPPLY_TYPE_BATTERY, + .properties =3D yoga_c630_psy_bat_mWh_properties, + .num_properties =3D ARRAY_SIZE(yoga_c630_psy_bat_mWh_properties), + .get_property =3D yoga_c630_psy_bat_get_property, +}; + +static int yoga_c630_psy_adpt_get_property(struct power_supply *psy, + enum power_supply_property psp, + union power_supply_propval *val) +{ + struct yoga_c630_psy *ecbat =3D power_supply_get_drvdata(psy); + int rc =3D 0; + + yoga_c630_psy_update_adapter_status(ecbat); + + switch (psp) { + case POWER_SUPPLY_PROP_ONLINE: + val->intval =3D ecbat->adapter_online; + break; + default: + rc =3D -EINVAL; + break; + } + + return rc; +} + +static enum power_supply_property yoga_c630_psy_adpt_properties[] =3D { + POWER_SUPPLY_PROP_ONLINE, +}; + +static const struct power_supply_desc yoga_c630_psy_adpt_psy_desc =3D { + .name =3D "yoga-c630-adapter", + .type =3D POWER_SUPPLY_TYPE_USB_TYPE_C, + .properties =3D yoga_c630_psy_adpt_properties, + .num_properties =3D ARRAY_SIZE(yoga_c630_psy_adpt_properties), + .get_property =3D yoga_c630_psy_adpt_get_property, +}; + +static int yoga_c630_psy_register_bat_psy(struct yoga_c630_psy *ecbat) +{ + struct power_supply_config bat_cfg =3D {}; + + bat_cfg.drv_data =3D ecbat; + bat_cfg.of_node =3D ecbat->of_node; + if (ecbat->unit_mA) + ecbat->bat_psy =3D power_supply_register_no_ws(ecbat->dev, &yoga_c630_ps= y_bat_psy_desc_mA, &bat_cfg); + else + ecbat->bat_psy =3D power_supply_register_no_ws(ecbat->dev, &yoga_c630_ps= y_bat_psy_desc_mWh, &bat_cfg); + if (IS_ERR(ecbat->bat_psy)) { + dev_err(ecbat->dev, "failed to register battery supply\n"); + return PTR_ERR(ecbat->bat_psy); + } + + return 0; +} + +static void yoga_c630_ec_refresh_bat_info(struct yoga_c630_psy *ecbat) +{ + bool current_unit; + + mutex_lock(&ecbat->lock); + current_unit =3D ecbat->unit_mA; + + yoga_c630_psy_update_bat_info(ecbat); + + if (current_unit !=3D ecbat->unit_mA) { + power_supply_unregister(ecbat->bat_psy); + yoga_c630_psy_register_bat_psy(ecbat); + } + + mutex_unlock(&ecbat->lock); +} + +static int yoga_c630_psy_notify(struct notifier_block *nb, + unsigned long action, void *data) +{ + struct yoga_c630_psy *ecbat =3D container_of(nb, struct yoga_c630_psy, nb= ); + + switch (action) { + case LENOVO_EC_EVENT_BAT_INFO: + yoga_c630_ec_refresh_bat_info(ecbat); + break; + case LENOVO_EC_EVENT_BAT_ADPT_STATUS: + power_supply_changed(ecbat->adp_psy); + fallthrough; + case LENOVO_EC_EVENT_BAT_STATUS: + power_supply_changed(ecbat->bat_psy); + break; + } + + return NOTIFY_OK; +} + +static int yoga_c630_psy_probe(struct auxiliary_device *adev, + const struct auxiliary_device_id *id) +{ + struct yoga_c630_ec *ec =3D adev->dev.platform_data; + struct power_supply_config adp_cfg =3D {}; + struct device *dev =3D &adev->dev; + struct yoga_c630_psy *ecbat; + int ret; + + ecbat =3D devm_kzalloc(&adev->dev, sizeof(*ecbat), GFP_KERNEL); + if (!ecbat) + return -ENOMEM; + + ecbat->ec =3D ec; + ecbat->dev =3D dev; + mutex_init(&ecbat->lock); + ecbat->of_node =3D adev->dev.parent->of_node; + ecbat->nb.notifier_call =3D yoga_c630_psy_notify; + + auxiliary_set_drvdata(adev, ecbat); + + adp_cfg.drv_data =3D ecbat; + adp_cfg.of_node =3D ecbat->of_node; + adp_cfg.supplied_to =3D (char **)&yoga_c630_psy_bat_psy_desc_mA.name; + adp_cfg.num_supplicants =3D 1; + ecbat->adp_psy =3D devm_power_supply_register_no_ws(dev, &yoga_c630_psy_a= dpt_psy_desc, &adp_cfg); + if (IS_ERR(ecbat->adp_psy)) { + dev_err(dev, "failed to register AC adapter supply\n"); + return PTR_ERR(ecbat->adp_psy); + } + + mutex_lock(&ecbat->lock); + + ret =3D yoga_c630_psy_update_bat_info(ecbat); + if (ret) + goto err_unlock; + + ret =3D yoga_c630_psy_register_bat_psy(ecbat); + if (ret) + goto err_unlock; + + mutex_unlock(&ecbat->lock); + + ret =3D yoga_c630_ec_register_notify(ecbat->ec, &ecbat->nb); + if (ret) + goto err_unreg_bat; + + return 0; + +err_unlock: + mutex_unlock(&ecbat->lock); + +err_unreg_bat: + power_supply_unregister(ecbat->bat_psy); + return ret; +} + +static void yoga_c630_psy_remove(struct auxiliary_device *adev) +{ + struct yoga_c630_psy *ecbat =3D auxiliary_get_drvdata(adev); + + yoga_c630_ec_unregister_notify(ecbat->ec, &ecbat->nb); + power_supply_unregister(ecbat->bat_psy); +} + +static const struct auxiliary_device_id yoga_c630_psy_id_table[] =3D { + { .name =3D YOGA_C630_MOD_NAME "." YOGA_C630_DEV_PSY, }, + {} +}; +MODULE_DEVICE_TABLE(auxiliary, yoga_c630_psy_id_table); + +static struct auxiliary_driver yoga_c630_psy_driver =3D { + .name =3D YOGA_C630_DEV_PSY, + .id_table =3D yoga_c630_psy_id_table, + .probe =3D yoga_c630_psy_probe, + .remove =3D yoga_c630_psy_remove, +}; + +module_auxiliary_driver(yoga_c630_psy_driver); + +MODULE_DESCRIPTION("Lenovo Yoga C630 psy"); +MODULE_LICENSE("GPL"); --=20 2.39.2