Patched in Tegra support.

1 files changed, 6 insertions, 109 deletions

diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index 7efaeaa53b8..7711d94a040 100644
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@ -34,7 +34,6 @@
 #include <linux/dmi.h>
 #include <linux/slab.h>
 #include <linux/suspend.h>
-#include <asm/unaligned.h>
 
 #ifdef CONFIG_ACPI_PROCFS_POWER
 #include <linux/proc_fs.h>
@@ -96,18 +95,6 @@ enum {
         ACPI_BATTERY_ALARM_PRESENT,
         ACPI_BATTERY_XINFO_PRESENT,
         ACPI_BATTERY_QUIRK_PERCENTAGE_CAPACITY,
-        /* On Lenovo Thinkpad models from 2010 and 2011, the power unit
-           switches between mWh and mAh depending on whether the system
-           is running on battery or not.  When mAh is the unit, most
-           reported values are incorrect and need to be adjusted by
-           10000/design_voltage.  Verified on x201, t410, t410s, and x220.
-           Pre-2010 and 2012 models appear to always report in mWh and
-           are thus unaffected (tested with t42, t61, t500, x200, x300,
-           and x230).  Also, in mid-2012 Lenovo issued a BIOS update for
-           the 2011 models that fixes the issue (tested on x220 with a
-           post-1.29 BIOS), but as of Nov. 2012, no such update is
-           available for the 2010 models.  */
-        ACPI_BATTERY_QUIRK_THINKPAD_MAH,
 };
 
 struct acpi_battery {
@@ -263,13 +250,6 @@ static int acpi_battery_get_property(struct power_supply *psy,
                 else
                         val->intval = battery->capacity_now * 1000;
                 break;
-        case POWER_SUPPLY_PROP_CAPACITY:
-                if (battery->capacity_now && battery->full_charge_capacity)
-                        val->intval = battery->capacity_now * 100/
-                                        battery->full_charge_capacity;
-                else
-                        val->intval = 0;
-                break;
         case POWER_SUPPLY_PROP_MODEL_NAME:
                 val->strval = battery->model_number;
                 break;
@@ -296,7 +276,6 @@ static enum power_supply_property charge_battery_props[] = {
         POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN,
         POWER_SUPPLY_PROP_CHARGE_FULL,
         POWER_SUPPLY_PROP_CHARGE_NOW,
-        POWER_SUPPLY_PROP_CAPACITY,
         POWER_SUPPLY_PROP_MODEL_NAME,
         POWER_SUPPLY_PROP_MANUFACTURER,
         POWER_SUPPLY_PROP_SERIAL_NUMBER,
@@ -313,7 +292,6 @@ static enum power_supply_property energy_battery_props[] = {
         POWER_SUPPLY_PROP_ENERGY_FULL_DESIGN,
         POWER_SUPPLY_PROP_ENERGY_FULL,
         POWER_SUPPLY_PROP_ENERGY_NOW,
-        POWER_SUPPLY_PROP_CAPACITY,
         POWER_SUPPLY_PROP_MODEL_NAME,
         POWER_SUPPLY_PROP_MANUFACTURER,
         POWER_SUPPLY_PROP_SERIAL_NUMBER,
@@ -451,21 +429,6 @@ static int acpi_battery_get_info(struct acpi_battery *battery)
         kfree(buffer.pointer);
         if (test_bit(ACPI_BATTERY_QUIRK_PERCENTAGE_CAPACITY, &battery->flags))
                 battery->full_charge_capacity = battery->design_capacity;
-        if (test_bit(ACPI_BATTERY_QUIRK_THINKPAD_MAH, &battery->flags) &&
-            battery->power_unit && battery->design_voltage) {
-                battery->design_capacity = battery->design_capacity *
-                    10000 / battery->design_voltage;
-                battery->full_charge_capacity = battery->full_charge_capacity *
-                    10000 / battery->design_voltage;
-                battery->design_capacity_warning =
-                    battery->design_capacity_warning *
-                    10000 / battery->design_voltage;
-                /* Curiously, design_capacity_low, unlike the rest of them,
-                   is correct.  */
-                /* capacity_granularity_* equal 1 on the systems tested, so
-                   it's impossible to tell if they would need an adjustment
-                   or not if their values were higher.  */
-        }
         return result;
 }
 
@@ -514,11 +477,6 @@ static int acpi_battery_get_state(struct acpi_battery *battery)
             && battery->capacity_now >= 0 && battery->capacity_now <= 100)
                 battery->capacity_now = (battery->capacity_now *
                                 battery->full_charge_capacity) / 100;
-        if (test_bit(ACPI_BATTERY_QUIRK_THINKPAD_MAH, &battery->flags) &&
-            battery->power_unit && battery->design_voltage) {
-                battery->capacity_now = battery->capacity_now *
-                    10000 / battery->design_voltage;
-        }
         return result;
 }
 
@@ -628,24 +586,6 @@ static void sysfs_remove_battery(struct acpi_battery *battery)
         mutex_unlock(&battery->sysfs_lock);
 }
 
-static void find_battery(const struct dmi_header *dm, void *private)
-{
-        struct acpi_battery *battery = (struct acpi_battery *)private;
-        /* Note: the hardcoded offsets below have been extracted from
-           the source code of dmidecode.  */
-        if (dm->type == DMI_ENTRY_PORTABLE_BATTERY && dm->length >= 8) {
-                const u8 *dmi_data = (const u8 *)(dm + 1);
-                int dmi_capacity = get_unaligned((const u16 *)(dmi_data + 6));
-                if (dm->length >= 18)
-                        dmi_capacity *= dmi_data[17];
-                if (battery->design_capacity * battery->design_voltage / 1000
-                    != dmi_capacity &&
-                    battery->design_capacity * 10 == dmi_capacity)
-                        set_bit(ACPI_BATTERY_QUIRK_THINKPAD_MAH,
-                                &battery->flags);
-        }
-}
-
 /*
  * According to the ACPI spec, some kinds of primary batteries can
  * report percentage battery remaining capacity directly to OS.
@@ -671,32 +611,6 @@ static void acpi_battery_quirks(struct acpi_battery *battery)
                 battery->capacity_now = (battery->capacity_now *
                                 battery->full_charge_capacity) / 100;
         }
-
-        if (test_bit(ACPI_BATTERY_QUIRK_THINKPAD_MAH, &battery->flags))
-                return ;
-
-        if (battery->power_unit && dmi_name_in_vendors("LENOVO")) {
-                const char *s;
-                s = dmi_get_system_info(DMI_PRODUCT_VERSION);
-                if (s && !strnicmp(s, "ThinkPad", 8)) {
-                        dmi_walk(find_battery, battery);
-                        if (test_bit(ACPI_BATTERY_QUIRK_THINKPAD_MAH,
-                                     &battery->flags) &&
-                            battery->design_voltage) {
-                                battery->design_capacity =
-                                    battery->design_capacity *
-                                    10000 / battery->design_voltage;
-                                battery->full_charge_capacity =
-                                    battery->full_charge_capacity *
-                                    10000 / battery->design_voltage;
-                                battery->design_capacity_warning =
-                                    battery->design_capacity_warning *
-                                    10000 / battery->design_voltage;
-                                battery->capacity_now = battery->capacity_now *
-                                    10000 / battery->design_voltage;
-                        }
-                }
-        }
 }
 
 static int acpi_battery_update(struct acpi_battery *battery)
@@ -729,19 +643,11 @@ static int acpi_battery_update(struct acpi_battery *battery)
 
 static void acpi_battery_refresh(struct acpi_battery *battery)
 {
-        int power_unit;
-
         if (!battery->bat.dev)
                 return;
 
-        power_unit = battery->power_unit;
-
         acpi_battery_get_info(battery);
-
-        if (power_unit == battery->power_unit)
-                return;
-
-        /* The battery has changed its reporting units. */
+        /* The battery may have changed its reporting units. */
         sysfs_remove_battery(battery);
         sysfs_add_battery(battery);
 }
@@ -967,7 +873,7 @@ DECLARE_FILE_FUNCTIONS(alarm);
 
 static const struct battery_file {
         struct file_operations ops;
-        umode_t mode;
+        mode_t mode;
         const char *name;
 } acpi_battery_file[] = {
         FILE_DESCRIPTION_RO(info),
@@ -1129,26 +1035,17 @@ static int acpi_battery_remove(struct acpi_device *device, int type)
         return 0;
 }
 
-#ifdef CONFIG_PM_SLEEP
 /* this is needed to learn about changes made in suspended state */
-static int acpi_battery_resume(struct device *dev)
+static int acpi_battery_resume(struct acpi_device *device)
 {
         struct acpi_battery *battery;
-
-        if (!dev)
-                return -EINVAL;
-
-        battery = acpi_driver_data(to_acpi_device(dev));
-        if (!battery)
+        if (!device)
                 return -EINVAL;
-
+        battery = acpi_driver_data(device);
         battery->update_time = 0;
         acpi_battery_update(battery);
         return 0;
 }
-#endif
-
-static SIMPLE_DEV_PM_OPS(acpi_battery_pm, NULL, acpi_battery_resume);
 
 static struct acpi_driver acpi_battery_driver = {
         .name = "battery",
@@ -1157,10 +1054,10 @@ static struct acpi_driver acpi_battery_driver = {
         .flags = ACPI_DRIVER_ALL_NOTIFY_EVENTS,
         .ops = {
                 .add = acpi_battery_add,
+                .resume = acpi_battery_resume,
                 .remove = acpi_battery_remove,
                 .notify = acpi_battery_notify,
                 },
-        .drv.pm = &acpi_battery_pm,
 };
 
 static void __init acpi_battery_init_async(void *unused, async_cookie_t cookie)