Merge git://git.infradead.org/battery-2.6

* git://git.infradead.org/battery-2.6: (68 commits)
  power_supply: Mark da9052 driver as broken
  power_supply: Drop usage of nowarn variant of sysfs_create_link()
  s3c_adc_battery: Average over more than one adc sample
  power_supply: Add DA9052 battery driver
  isp1704_charger: Fix missing check
  jz4740-battery: Fix signedness bug
  power_supply: Assume mains power by default
  sbs-battery: Fix devicetree match table
  ARM: rx51: Add bq27200 i2c board info
  sbs-battery: Change power supply name
  devicetree-bindings: Propagate bq20z75->sbs rename to dt bindings
  devicetree-bindings: Add vendor entry for Smart Battery Systems
  sbs-battery: Rename internals to new name
  bq20z75: Rename to sbs-battery
  wm97xx_battery: Use DEFINE_MUTEX() for work_lock
  max8997_charger: Remove duplicate module.h
  lp8727_charger: Some minor fixes for the header
  lp8727_charger: Add header file
  power_supply: Convert drivers/power/* to use module_platform_driver()
  power_supply: Add "unknown" in power supply type
  ...

1 files changed, 14 insertions, 2 deletions

diff --git a/drivers/hid/hid-wacom.c b/drivers/hid/hid-wacom.c
index f2183486a9b..b47e58b52d9 100644
--- a/drivers/hid/hid-wacom.c
+++ b/drivers/hid/hid-wacom.c
@@ -49,12 +49,14 @@ static unsigned short batcap[8] = { 1, 15, 25, 35, 50, 70, 100, 0 };
 
 static enum power_supply_property wacom_battery_props[] = {
         POWER_SUPPLY_PROP_PRESENT,
-        POWER_SUPPLY_PROP_CAPACITY
+        POWER_SUPPLY_PROP_CAPACITY,
+        POWER_SUPPLY_PROP_SCOPE,
 };
 
 static enum power_supply_property wacom_ac_props[] = {
         POWER_SUPPLY_PROP_PRESENT,
-        POWER_SUPPLY_PROP_ONLINE
+        POWER_SUPPLY_PROP_ONLINE,
+        POWER_SUPPLY_PROP_SCOPE,
 };
 
 static int wacom_battery_get_property(struct power_supply *psy,
@@ -70,6 +72,9 @@ static int wacom_battery_get_property(struct power_supply *psy,
         case POWER_SUPPLY_PROP_PRESENT:
                 val->intval = 1;
                 break;
+        case POWER_SUPPLY_PROP_SCOPE:
+                val->intval = POWER_SUPPLY_SCOPE_DEVICE;
+                break;
         case POWER_SUPPLY_PROP_CAPACITY:
                 /* show 100% battery capacity when charging */
                 if (power_state == 0)
@@ -101,6 +106,9 @@ static int wacom_ac_get_property(struct power_supply *psy,
                 else
                         val->intval = 0;
                 break;
+        case POWER_SUPPLY_PROP_SCOPE:
+                val->intval = POWER_SUPPLY_SCOPE_DEVICE;
+                break;
         default:
                 ret = -EINVAL;
                 break;
@@ -523,6 +531,8 @@ static int wacom_probe(struct hid_device *hdev,
         wdata->battery.type = POWER_SUPPLY_TYPE_BATTERY;
         wdata->battery.use_for_apm = 0;
 
+        power_supply_powers(&wdata->battery, &hdev->dev);
+
         ret = power_supply_register(&hdev->dev, &wdata->battery);
         if (ret) {
                 hid_warn(hdev, "can't create sysfs battery attribute, err: %d\n",
@@ -537,6 +547,8 @@ static int wacom_probe(struct hid_device *hdev,
         wdata->ac.type = POWER_SUPPLY_TYPE_MAINS;
         wdata->ac.use_for_apm = 0;
 
+        power_supply_powers(&wdata->battery, &hdev->dev);
+
         ret = power_supply_register(&hdev->dev, &wdata->ac);
         if (ret) {
                 hid_warn(hdev,