lg-laptop: Move setting of battery charge limit to common location

For now leave also the driver specific location,
with deprecated warning in documentation.

Signed-off-by: Matan Ziv-Av <matan@svgalib.org>
Link: https://lore.kernel.org/r/eca2fa354f60b8a6e5a5c9c8e244fea56616970a.1645278914.git.matan@svgalib.org
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>

diff --git a/Documentation/ABI/testing/sysfs-platform-lg-laptop b/Documentation/ABI/testing/sysfs-platform-lg-laptop
index cf47749b19dfdcc650bfc37288927ec625eba84a..0570cd524d0effa8ed4c478f2f82e3c14fec1183 100644 (file)
--- a/Documentation/ABI/testing/sysfs-platform-lg-laptop
+++ b/Documentation/ABI/testing/sysfs-platform-lg-laptop
@@ -17,6 +17,7 @@ Date:         October 2018
 KernelVersion: 4.20
 Contact:       "Matan Ziv-Av <matan@svgalib.org>
 Description:
+        Deprecated use /sys/class/power_supply/CMB0/charge_control_end_threshold
         Maximal battery charge level. Accepted values are 80 or 100.
 
 What:          /sys/devices/platform/lg-laptop/fan_mode

diff --git a/Documentation/admin-guide/laptops/lg-laptop.rst b/Documentation/admin-guide/laptops/lg-laptop.rst
index 6fbe165dcd27f83be64ac62718f4bf2eb9915382..67fd6932cef4ffcc18edc0f8e1eeca70fb04f5be 100644 (file)
--- a/Documentation/admin-guide/laptops/lg-laptop.rst
+++ b/Documentation/admin-guide/laptops/lg-laptop.rst
@@ -38,7 +38,7 @@ FN lock.
 Battery care limit
 ------------------
 
-Writing 80/100 to /sys/devices/platform/lg-laptop/battery_care_limit
+Writing 80/100 to /sys/class/power_supply/CMB0/charge_control_end_threshold
 sets the maximum capacity to charge the battery. Limiting the charge
 reduces battery capacity loss over time.
 

diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 8d1eec20885425be70746f4447ea201c5bdf7819..09f4ab013dfa22b2de5d056212a23a44fe5ec674 100644 (file)
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -915,6 +915,7 @@ config COMPAL_LAPTOP
 config LG_LAPTOP
        tristate "LG Laptop Extras"
        depends on ACPI
+       depends on ACPI_BATTERY
        depends on ACPI_WMI
        depends on INPUT
        select INPUT_SPARSEKMAP

diff --git a/drivers/platform/x86/lg-laptop.c b/drivers/platform/x86/lg-laptop.c
index a91847a551a725336a063235697046d660c698dc..332868b140ed5844d4e4e7aaf066188bacfaab2e 100644 (file)
--- a/drivers/platform/x86/lg-laptop.c
+++ b/drivers/platform/x86/lg-laptop.c
@@ -17,6 +17,8 @@
 #include <linux/platform_device.h>
 #include <linux/types.h>
 
+#include <acpi/battery.h>
+
 #define LED_DEVICE(_name, max, flag) struct led_classdev _name = { \
        .name           = __stringify(_name),   \
        .max_brightness = max,                  \
@@ -458,14 +460,14 @@ static ssize_t fn_lock_show(struct device *dev,
        return sysfs_emit(buffer, "%d\n", status);
 }
 
-static ssize_t battery_care_limit_store(struct device *dev,
-                                       struct device_attribute *attr,
-                                       const char *buffer, size_t count)
+static ssize_t charge_control_end_threshold_store(struct device *dev,
+                                                 struct device_attribute *attr,
+                                                 const char *buf, size_t count)
 {
        unsigned long value;
        int ret;
 
-       ret = kstrtoul(buffer, 10, &value);
+       ret = kstrtoul(buf, 10, &value);
        if (ret)
                return ret;
 
@@ -486,9 +488,9 @@ static ssize_t battery_care_limit_store(struct device *dev,
        return -EINVAL;
 }
 
-static ssize_t battery_care_limit_show(struct device *dev,
-                                      struct device_attribute *attr,
-                                      char *buffer)
+static ssize_t charge_control_end_threshold_show(struct device *device,
+                                                struct device_attribute *attr,
+                                                char *buf)
 {
        unsigned int status;
        union acpi_object *r;
@@ -520,15 +522,52 @@ static ssize_t battery_care_limit_show(struct device *dev,
        if (status != 80 && status != 100)
                status = 0;
 
-       return sysfs_emit(buffer, "%d\n", status);
+       return sysfs_emit(buf, "%d\n", status);
+}
+
+static ssize_t battery_care_limit_show(struct device *dev,
+                                      struct device_attribute *attr,
+                                      char *buffer)
+{
+       return charge_control_end_threshold_show(dev, attr, buffer);
+}
+
+static ssize_t battery_care_limit_store(struct device *dev,
+                                       struct device_attribute *attr,
+                                       const char *buffer, size_t count)
+{
+       return charge_control_end_threshold_store(dev, attr, buffer, count);
 }
 
 static DEVICE_ATTR_RW(fan_mode);
 static DEVICE_ATTR_RW(usb_charge);
 static DEVICE_ATTR_RW(reader_mode);
 static DEVICE_ATTR_RW(fn_lock);
+static DEVICE_ATTR_RW(charge_control_end_threshold);
 static DEVICE_ATTR_RW(battery_care_limit);
 
+static int lg_battery_add(struct power_supply *battery)
+{
+       if (device_create_file(&battery->dev,
+                              &dev_attr_charge_control_end_threshold))
+               return -ENODEV;
+
+       return 0;
+}
+
+static int lg_battery_remove(struct power_supply *battery)
+{
+       device_remove_file(&battery->dev,
+                          &dev_attr_charge_control_end_threshold);
+       return 0;
+}
+
+static struct acpi_battery_hook battery_hook = {
+       .add_battery = lg_battery_add,
+       .remove_battery = lg_battery_remove,
+       .name = "LG Battery Extension",
+};
+
 static struct attribute *dev_attributes[] = {
        &dev_attr_fan_mode.attr,
        &dev_attr_usb_charge.attr,
@@ -711,6 +750,7 @@ static int acpi_add(struct acpi_device *device)
        led_classdev_register(&pf_device->dev, &tpad_led);
 
        wmi_input_setup();
+       battery_hook_register(&battery_hook);
 
        return 0;
 
@@ -728,6 +768,7 @@ static int acpi_remove(struct acpi_device *device)
        led_classdev_unregister(&tpad_led);
        led_classdev_unregister(&kbd_backlight);
 
+       battery_hook_unregister(&battery_hook);
        wmi_input_destroy();
        platform_device_unregister(pf_device);
        pf_device = NULL;