]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge tag 'for-v4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 7 Oct 2016 01:21:15 +0000 (18:21 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 7 Oct 2016 01:21:15 +0000 (18:21 -0700)
Pull power supply and reset updates from Sebastian Reichel:
 - move power supply drivers to drivers/power/supply
 - unify location of power supply DT documentation
 - tps65217-charger: IRQ support
 - act8945a-charger: misc. cleanups & improvements
 - sbs-battery cleanup
 - fix users of deprecated create_singlethread_workqueue()
 - misc fixes.

* tag 'for-v4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply: (46 commits)
  power: supply: bq27xxx_battery: allow kernel poll_interval parameter runtime update
  power: supply: sbs-battery: Cleanup removal of chip->pdata
  power: reset: st: Remove obsolete platforms from dt doc
  power: reset: st-poweroff: Remove obsolete platforms.
  power: reset: zx-reboot: Unmap region obtained by of_iomap
  power: reset: xgene-reboot: Unmap region obtained by of_iomap
  power: supply: ab8500: cleanup with list_first_entry_or_null()
  power: reset: add in missing white space in error message text
  sbs-battery: make writes to ManufacturerAccess optional
  power: bq24257: Fix use of uninitialized pointer bq->charger
  power: supply: sbs-battery: simplify DT parsing
  power: supply: bq24735-charger: Request status GPIO with initial input setup
  power: supply: sbs-battery: Use gpio_desc and sleeping calls for battery detect
  power: supply: act8945a_charger: Add max current property
  power: supply: act8945a_charger: Add capacity level property
  doc: bindings: power: act8945a-charger: Update properties.
  power: supply: act8945a_charger: Fix the power supply type
  power: supply: act8945a_charger: Add status change update support
  power: supply: act8945a_charger: Improve state handling
  power: supply: act8945a_charger: Remove "battery_temperature"
  ...

131 files changed:
CREDITS
Documentation/ABI/testing/sysfs-class-power
Documentation/devicetree/bindings/power/act8945a-charger.txt [deleted file]
Documentation/devicetree/bindings/power/reset/axxia-reset.txt [moved from Documentation/devicetree/bindings/power_supply/axxia-reset.txt with 100% similarity]
Documentation/devicetree/bindings/power/reset/imx-snvs-poweroff.txt [moved from Documentation/devicetree/bindings/power_supply/imx-snvs-poweroff.txt with 100% similarity]
Documentation/devicetree/bindings/power/reset/msm-poweroff.txt [moved from Documentation/devicetree/bindings/power_supply/msm-poweroff.txt with 100% similarity]
Documentation/devicetree/bindings/power/reset/qnap-poweroff.txt [moved from Documentation/devicetree/bindings/power_supply/qnap-poweroff.txt with 100% similarity]
Documentation/devicetree/bindings/power/reset/restart-poweroff.txt [moved from Documentation/devicetree/bindings/power_supply/restart-poweroff.txt with 100% similarity]
Documentation/devicetree/bindings/power/reset/st-reset.txt
Documentation/devicetree/bindings/power/supply/ab8500/btemp.txt [moved from Documentation/devicetree/bindings/power_supply/ab8500/btemp.txt with 100% similarity]
Documentation/devicetree/bindings/power/supply/ab8500/chargalg.txt [moved from Documentation/devicetree/bindings/power_supply/ab8500/chargalg.txt with 100% similarity]
Documentation/devicetree/bindings/power/supply/ab8500/charger.txt [moved from Documentation/devicetree/bindings/power_supply/ab8500/charger.txt with 100% similarity]
Documentation/devicetree/bindings/power/supply/ab8500/fg.txt [moved from Documentation/devicetree/bindings/power_supply/ab8500/fg.txt with 100% similarity]
Documentation/devicetree/bindings/power/supply/act8945a-charger.txt [new file with mode: 0644]
Documentation/devicetree/bindings/power/supply/axp20x_usb_power.txt [moved from Documentation/devicetree/bindings/power_supply/axp20x_usb_power.txt with 100% similarity]
Documentation/devicetree/bindings/power/supply/bq2415x.txt [moved from Documentation/devicetree/bindings/power/bq2415x.txt with 100% similarity]
Documentation/devicetree/bindings/power/supply/bq24257.txt [moved from Documentation/devicetree/bindings/power/bq24257.txt with 100% similarity]
Documentation/devicetree/bindings/power/supply/bq25890.txt [moved from Documentation/devicetree/bindings/power/bq25890.txt with 100% similarity]
Documentation/devicetree/bindings/power/supply/charger-manager.txt [moved from Documentation/devicetree/bindings/power_supply/charger-manager.txt with 100% similarity]
Documentation/devicetree/bindings/power/supply/da9150-charger.txt [moved from Documentation/devicetree/bindings/power/da9150-charger.txt with 100% similarity]
Documentation/devicetree/bindings/power/supply/da9150-fg.txt [moved from Documentation/devicetree/bindings/power/da9150-fg.txt with 100% similarity]
Documentation/devicetree/bindings/power/supply/gpio-charger.txt [moved from Documentation/devicetree/bindings/power_supply/gpio-charger.txt with 100% similarity]
Documentation/devicetree/bindings/power/supply/isp1704.txt [moved from Documentation/devicetree/bindings/power/isp1704.txt with 100% similarity]
Documentation/devicetree/bindings/power/supply/lp8727_charger.txt [moved from Documentation/devicetree/bindings/power_supply/lp8727_charger.txt with 100% similarity]
Documentation/devicetree/bindings/power/supply/ltc2941.txt [moved from Documentation/devicetree/bindings/power/ltc2941.txt with 100% similarity]
Documentation/devicetree/bindings/power/supply/max17042_battery.txt [moved from Documentation/devicetree/bindings/power_supply/max17042_battery.txt with 100% similarity]
Documentation/devicetree/bindings/power/supply/max8925_batter.txt [moved from Documentation/devicetree/bindings/power_supply/max8925_batter.txt with 100% similarity]
Documentation/devicetree/bindings/power/supply/olpc_battery.txt [moved from Documentation/devicetree/bindings/power_supply/olpc_battery.txt with 100% similarity]
Documentation/devicetree/bindings/power/supply/power_supply.txt [moved from Documentation/devicetree/bindings/power_supply/power_supply.txt with 100% similarity]
Documentation/devicetree/bindings/power/supply/qcom,coincell-charger.txt [moved from Documentation/devicetree/bindings/power/qcom,coincell-charger.txt with 100% similarity]
Documentation/devicetree/bindings/power/supply/qcom_smbb.txt [moved from Documentation/devicetree/bindings/power_supply/qcom_smbb.txt with 100% similarity]
Documentation/devicetree/bindings/power/supply/rt9455_charger.txt [moved from Documentation/devicetree/bindings/power/rt9455_charger.txt with 100% similarity]
Documentation/devicetree/bindings/power/supply/rx51-battery.txt [moved from Documentation/devicetree/bindings/power/rx51-battery.txt with 100% similarity]
Documentation/devicetree/bindings/power/supply/sbs_sbs-battery.txt [moved from Documentation/devicetree/bindings/power_supply/sbs_sbs-battery.txt with 100% similarity]
Documentation/devicetree/bindings/power/supply/ti,bq24735.txt [moved from Documentation/devicetree/bindings/power_supply/ti,bq24735.txt with 100% similarity]
Documentation/devicetree/bindings/power/supply/tps65090.txt [moved from Documentation/devicetree/bindings/power_supply/tps65090.txt with 100% similarity]
Documentation/devicetree/bindings/power/supply/tps65217_charger.txt [moved from Documentation/devicetree/bindings/power_supply/tps65217_charger.txt with 100% similarity]
Documentation/devicetree/bindings/power/supply/twl-charger.txt [moved from Documentation/devicetree/bindings/power/twl-charger.txt with 100% similarity]
Documentation/driver-model/devres.txt
Documentation/power/power_supply_class.txt
MAINTAINERS
drivers/power/Kconfig
drivers/power/Makefile
drivers/power/act8945a_charger.c [deleted file]
drivers/power/reset/keystone-reset.c
drivers/power/reset/reboot-mode.c
drivers/power/reset/reboot-mode.h
drivers/power/reset/st-poweroff.c
drivers/power/reset/syscon-reboot-mode.c
drivers/power/reset/xgene-reboot.c
drivers/power/reset/zx-reboot.c
drivers/power/supply/88pm860x_battery.c [moved from drivers/power/88pm860x_battery.c with 100% similarity]
drivers/power/supply/88pm860x_charger.c [moved from drivers/power/88pm860x_charger.c with 100% similarity]
drivers/power/supply/Kconfig [new file with mode: 0644]
drivers/power/supply/Makefile [new file with mode: 0644]
drivers/power/supply/ab8500_bmdata.c [moved from drivers/power/ab8500_bmdata.c with 100% similarity]
drivers/power/supply/ab8500_btemp.c [moved from drivers/power/ab8500_btemp.c with 99% similarity]
drivers/power/supply/ab8500_charger.c [moved from drivers/power/ab8500_charger.c with 99% similarity]
drivers/power/supply/ab8500_fg.c [moved from drivers/power/ab8500_fg.c with 99% similarity]
drivers/power/supply/abx500_chargalg.c [moved from drivers/power/abx500_chargalg.c with 99% similarity]
drivers/power/supply/act8945a_charger.c [new file with mode: 0644]
drivers/power/supply/apm_power.c [moved from drivers/power/apm_power.c with 100% similarity]
drivers/power/supply/axp20x_usb_power.c [moved from drivers/power/axp20x_usb_power.c with 100% similarity]
drivers/power/supply/axp288_charger.c [moved from drivers/power/axp288_charger.c with 99% similarity]
drivers/power/supply/axp288_fuel_gauge.c [moved from drivers/power/axp288_fuel_gauge.c with 99% similarity]
drivers/power/supply/bq2415x_charger.c [moved from drivers/power/bq2415x_charger.c with 100% similarity]
drivers/power/supply/bq24190_charger.c [moved from drivers/power/bq24190_charger.c with 100% similarity]
drivers/power/supply/bq24257_charger.c [moved from drivers/power/bq24257_charger.c with 100% similarity]
drivers/power/supply/bq24735-charger.c [moved from drivers/power/bq24735-charger.c with 92% similarity]
drivers/power/supply/bq25890_charger.c [moved from drivers/power/bq25890_charger.c with 100% similarity]
drivers/power/supply/bq27xxx_battery.c [moved from drivers/power/bq27xxx_battery.c with 96% similarity]
drivers/power/supply/bq27xxx_battery_i2c.c [moved from drivers/power/bq27xxx_battery_i2c.c with 100% similarity]
drivers/power/supply/charger-manager.c [moved from drivers/power/charger-manager.c with 100% similarity]
drivers/power/supply/collie_battery.c [moved from drivers/power/collie_battery.c with 100% similarity]
drivers/power/supply/da9030_battery.c [moved from drivers/power/da9030_battery.c with 100% similarity]
drivers/power/supply/da9052-battery.c [moved from drivers/power/da9052-battery.c with 100% similarity]
drivers/power/supply/da9150-charger.c [moved from drivers/power/da9150-charger.c with 100% similarity]
drivers/power/supply/da9150-fg.c [moved from drivers/power/da9150-fg.c with 100% similarity]
drivers/power/supply/ds2760_battery.c [moved from drivers/power/ds2760_battery.c with 99% similarity]
drivers/power/supply/ds2780_battery.c [moved from drivers/power/ds2780_battery.c with 99% similarity]
drivers/power/supply/ds2781_battery.c [moved from drivers/power/ds2781_battery.c with 99% similarity]
drivers/power/supply/ds2782_battery.c [moved from drivers/power/ds2782_battery.c with 100% similarity]
drivers/power/supply/generic-adc-battery.c [moved from drivers/power/generic-adc-battery.c with 100% similarity]
drivers/power/supply/goldfish_battery.c [moved from drivers/power/goldfish_battery.c with 100% similarity]
drivers/power/supply/gpio-charger.c [moved from drivers/power/gpio-charger.c with 100% similarity]
drivers/power/supply/intel_mid_battery.c [moved from drivers/power/intel_mid_battery.c with 99% similarity]
drivers/power/supply/ipaq_micro_battery.c [moved from drivers/power/ipaq_micro_battery.c with 99% similarity]
drivers/power/supply/isp1704_charger.c [moved from drivers/power/isp1704_charger.c with 100% similarity]
drivers/power/supply/jz4740-battery.c [moved from drivers/power/jz4740-battery.c with 100% similarity]
drivers/power/supply/lp8727_charger.c [moved from drivers/power/lp8727_charger.c with 100% similarity]
drivers/power/supply/lp8788-charger.c [moved from drivers/power/lp8788-charger.c with 100% similarity]
drivers/power/supply/ltc2941-battery-gauge.c [moved from drivers/power/ltc2941-battery-gauge.c with 100% similarity]
drivers/power/supply/max14577_charger.c [moved from drivers/power/max14577_charger.c with 99% similarity]
drivers/power/supply/max17040_battery.c [moved from drivers/power/max17040_battery.c with 100% similarity]
drivers/power/supply/max17042_battery.c [moved from drivers/power/max17042_battery.c with 100% similarity]
drivers/power/supply/max77693_charger.c [moved from drivers/power/max77693_charger.c with 99% similarity]
drivers/power/supply/max8903_charger.c [moved from drivers/power/max8903_charger.c with 100% similarity]
drivers/power/supply/max8925_power.c [moved from drivers/power/max8925_power.c with 100% similarity]
drivers/power/supply/max8997_charger.c [moved from drivers/power/max8997_charger.c with 100% similarity]
drivers/power/supply/max8998_charger.c [moved from drivers/power/max8998_charger.c with 100% similarity]
drivers/power/supply/olpc_battery.c [moved from drivers/power/olpc_battery.c with 100% similarity]
drivers/power/supply/pcf50633-charger.c [moved from drivers/power/pcf50633-charger.c with 100% similarity]
drivers/power/supply/pda_power.c [moved from drivers/power/pda_power.c with 100% similarity]
drivers/power/supply/pm2301_charger.c [moved from drivers/power/pm2301_charger.c with 99% similarity]
drivers/power/supply/pm2301_charger.h [moved from drivers/power/pm2301_charger.h with 100% similarity]
drivers/power/supply/pmu_battery.c [moved from drivers/power/pmu_battery.c with 100% similarity]
drivers/power/supply/power_supply.h [moved from drivers/power/power_supply.h with 100% similarity]
drivers/power/supply/power_supply_core.c [moved from drivers/power/power_supply_core.c with 100% similarity]
drivers/power/supply/power_supply_leds.c [moved from drivers/power/power_supply_leds.c with 100% similarity]
drivers/power/supply/power_supply_sysfs.c [moved from drivers/power/power_supply_sysfs.c with 100% similarity]
drivers/power/supply/qcom_smbb.c [moved from drivers/power/qcom_smbb.c with 100% similarity]
drivers/power/supply/rt5033_battery.c [moved from drivers/power/rt5033_battery.c with 100% similarity]
drivers/power/supply/rt9455_charger.c [moved from drivers/power/rt9455_charger.c with 100% similarity]
drivers/power/supply/rx51_battery.c [moved from drivers/power/rx51_battery.c with 100% similarity]
drivers/power/supply/s3c_adc_battery.c [moved from drivers/power/s3c_adc_battery.c with 100% similarity]
drivers/power/supply/sbs-battery.c [moved from drivers/power/sbs-battery.c with 83% similarity]
drivers/power/supply/smb347-charger.c [moved from drivers/power/smb347-charger.c with 100% similarity]
drivers/power/supply/test_power.c [moved from drivers/power/test_power.c with 100% similarity]
drivers/power/supply/tosa_battery.c [moved from drivers/power/tosa_battery.c with 100% similarity]
drivers/power/supply/tps65090-charger.c [moved from drivers/power/tps65090-charger.c with 100% similarity]
drivers/power/supply/tps65217_charger.c [moved from drivers/power/tps65217_charger.c with 89% similarity]
drivers/power/supply/twl4030_charger.c [moved from drivers/power/twl4030_charger.c with 100% similarity]
drivers/power/supply/twl4030_madc_battery.c [moved from drivers/power/twl4030_madc_battery.c with 100% similarity]
drivers/power/supply/wm831x_backup.c [moved from drivers/power/wm831x_backup.c with 100% similarity]
drivers/power/supply/wm831x_power.c [moved from drivers/power/wm831x_power.c with 100% similarity]
drivers/power/supply/wm8350_power.c [moved from drivers/power/wm8350_power.c with 100% similarity]
drivers/power/supply/wm97xx_battery.c [moved from drivers/power/wm97xx_battery.c with 99% similarity]
drivers/power/supply/z2_battery.c [moved from drivers/power/z2_battery.c with 99% similarity]
include/linux/power/bq24735-charger.h
include/linux/power/bq27xxx_battery.h
include/linux/power/sbs-battery.h

diff --git a/CREDITS b/CREDITS
index 936f05a7500c9f6be06844b8f8c0e5dce098f901..df0a50eb3f64f23f6afd2a40962ec8982957c315 100644 (file)
--- a/CREDITS
+++ b/CREDITS
@@ -1090,6 +1090,10 @@ S: 6350 Stoneridge Mall Road
 S: Pleasanton, CA 94588
 S: USA
 
+N: Dmitry Eremin-Solenikov
+E: dbaryshkov@gmail.com
+D: Power Supply Maintainer from v3.14 - v3.15
+
 N: Doug Evans
 E: dje@cygnus.com
 D: Wrote Xenix FS (part of standard kernel since 0.99.15)
index fa05719f9981309d6a6f566572ffc5f208679589..f85ce9e327b98b94ab1f119f9ec15edf6a13ccfa 100644 (file)
@@ -22,7 +22,7 @@ Description:
 What:          /sys/class/power_supply/max14577-charger/device/fast_charge_timer
 Date:          October 2014
 KernelVersion: 3.18.0
-Contact:       Krzysztof Kozlowski <k.kozlowski@samsung.com>
+Contact:       Krzysztof Kozlowski <krzk@kernel.org>
 Description:
                This entry shows and sets the maximum time the max14577
                charger operates in fast-charge mode. When the timer expires
@@ -36,7 +36,7 @@ Description:
 What:          /sys/class/power_supply/max77693-charger/device/fast_charge_timer
 Date:          January 2015
 KernelVersion: 3.19.0
-Contact:       Krzysztof Kozlowski <k.kozlowski@samsung.com>
+Contact:       Krzysztof Kozlowski <krzk@kernel.org>
 Description:
                This entry shows and sets the maximum time the max77693
                charger operates in fast-charge mode. When the timer expires
@@ -50,7 +50,7 @@ Description:
 What:          /sys/class/power_supply/max77693-charger/device/top_off_threshold_current
 Date:          January 2015
 KernelVersion: 3.19.0
-Contact:       Krzysztof Kozlowski <k.kozlowski@samsung.com>
+Contact:       Krzysztof Kozlowski <krzk@kernel.org>
 Description:
                This entry shows and sets the charging current threshold for
                entering top-off charging mode. When charging current in fast
@@ -65,7 +65,7 @@ Description:
 What:          /sys/class/power_supply/max77693-charger/device/top_off_timer
 Date:          January 2015
 KernelVersion: 3.19.0
-Contact:       Krzysztof Kozlowski <k.kozlowski@samsung.com>
+Contact:       Krzysztof Kozlowski <krzk@kernel.org>
 Description:
                This entry shows and sets the maximum time the max77693
                charger operates in top-off charge mode. When the timer expires
diff --git a/Documentation/devicetree/bindings/power/act8945a-charger.txt b/Documentation/devicetree/bindings/power/act8945a-charger.txt
deleted file mode 100644 (file)
index bea254c..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-Device-Tree bindings for charger of Active-semi ACT8945A Multi-Function Device
-
-Required properties:
- - compatible: "active-semi,act8945a", please refer to ../mfd/act8945a.txt.
- - active-semi,chglev-gpios: charge current level phandle with args
-   as described in ../gpio/gpio.txt.
-
-Optional properties:
- - active-semi,check-battery-temperature: boolean to check the battery
-   temperature or not.
- - active-semi,input-voltage-threshold-microvolt: unit: mV;
-   Specifies the charger's input over-voltage threshold value;
-   The value can be: 6600, 7000, 7500, 8000; default: 6600
- - active-semi,precondition-timeout: unit: minutes;
-   Specifies the charger's PRECONDITION safety timer setting value;
-   The value can be: 40, 60, 80, 0; If 0, it means to disable this timer;
-   default: 40.
- - active-semi,total-timeout: unit: hours;
-   Specifies the charger's total safety timer setting value;
-   The value can be: 3, 4, 5, 0; If 0, it means to disable this timer;
-   default: 3.
-
-Example:
-       pmic@5b {
-               compatible = "active-semi,act8945a";
-               reg = <0x5b>;
-               status = "okay";
-
-               pinctrl-names = "default";
-               pinctrl-0 = <&pinctrl_charger_chglev>;
-               active-semi,chglev-gpios = <&pioA 12 GPIO_ACTIVE_HIGH>;
-               active-semi,input-voltage-threshold-microvolt = <6600>;
-               active-semi,precondition-timeout = <40>;
-               active-semi,total-timeout = <3>;
-       };
index 809af54f02f35c79bb98fe0a9f0b9c66247a8ddc..83734dc3a389771ea061d9c71f4a00c7589e5fcf 100644 (file)
@@ -1,11 +1,12 @@
 *Device-Tree bindings for ST SW reset functionality
 
 Required properties:
-- compatible: should be "st,<chip>-restart".
+- compatible: should be "stih407-restart".
 - st,syscfg: should be a phandle of the syscfg node.
 
 Example node:
        restart {
-               compatible = "st,stih416-restart";
-               st,syscfg = <&syscfg_sbc>;
+               compatible = "st,stih407-restart";
+               st,syscfg = <&syscfg_sbc_reg>;
+               status = "okay";
        };
diff --git a/Documentation/devicetree/bindings/power/supply/act8945a-charger.txt b/Documentation/devicetree/bindings/power/supply/act8945a-charger.txt
new file mode 100644 (file)
index 0000000..de78d76
--- /dev/null
@@ -0,0 +1,48 @@
+Device-Tree bindings for charger of Active-semi ACT8945A Multi-Function Device
+
+Required properties:
+ - compatible: "active-semi,act8945a-charger".
+ - active-semi,chglev-gpios: charge current level phandle with args
+   as described in ../gpio/gpio.txt.
+ - active-semi,lbo-gpios: specify the low battery voltage detect phandle
+   with args as as described in ../gpio/gpio.txt.
+ - interrupts: <a b> where a is the interrupt number and b is a
+   field that represents an encoding of the sense and level
+   information for the interrupt.
+ - interrupt-parent: the phandle for the interrupt controller that
+   services interrupts for this device.
+
+Optional properties:
+ - active-semi,input-voltage-threshold-microvolt: unit: mV;
+   Specifies the charger's input over-voltage threshold value;
+   The value can be: 6600, 7000, 7500, 8000; default: 6600
+ - active-semi,precondition-timeout: unit: minutes;
+   Specifies the charger's PRECONDITION safety timer setting value;
+   The value can be: 40, 60, 80, 0; If 0, it means to disable this timer;
+   default: 40.
+ - active-semi,total-timeout: unit: hours;
+   Specifies the charger's total safety timer setting value;
+   The value can be: 3, 4, 5, 0; If 0, it means to disable this timer;
+   default: 3.
+
+Example:
+       pmic@5b {
+               compatible = "active-semi,act8945a";
+               reg = <0x5b>;
+               status = "okay";
+
+               charger {
+                       compatible = "active-semi,act8945a-charger";
+                       pinctrl-names = "default";
+                       pinctrl-0 = <&pinctrl_charger_chglev &pinctrl_charger_lbo &pinctrl_charger_irq>;
+                       interrupt-parent = <&pioA>;
+                       interrupts = <45 GPIO_ACTIVE_LOW>;
+
+                       active-semi,chglev-gpios = <&pioA 12 GPIO_ACTIVE_HIGH>;
+                       active-semi,lbo-gpios = <&pioA 72 GPIO_ACTIVE_LOW>;
+                       active-semi,input-voltage-threshold-microvolt = <6600>;
+                       active-semi,precondition-timeout = <40>;
+                       active-semi,total-timeout = <3>;
+                       status = "okay";
+               };
+       };
index 75bc5b8add2fe71128c285d11062c0361e525378..167070895498893a5585098cfb73d65a666a11e0 100644 (file)
@@ -346,6 +346,10 @@ PINCTRL
   devm_pinctrl_register()
   devm_pinctrl_unregister()
 
+POWER
+  devm_reboot_mode_register()
+  devm_reboot_mode_unregister()
+
 PWM
   devm_pwm_get()
   devm_pwm_put()
index 82dacc06e355c1624ca66e5668448f1a767dbfa9..0c72588bd967f22f4e342f07bd3cd1d836ed9282 100644 (file)
@@ -39,8 +39,8 @@ kind of power supply, and can process/present them to a user in consistent
 manner. Results for different power supplies and machines are also directly
 comparable.
 
-See drivers/power/ds2760_battery.c and drivers/power/pda_power.c for the
-example how to declare and handle attributes.
+See drivers/power/supply/ds2760_battery.c and drivers/power/supply/pda_power.c
+for the example how to declare and handle attributes.
 
 
 Units
index 464437dbfa26d8f7bcfb3f5b1b7337835906f689..40f462966564d19e29ec83f87bbf954fc4084e77 100644 (file)
@@ -3784,8 +3784,8 @@ F:        drivers/leds/leds-da90??.c
 F:     drivers/mfd/da903x.c
 F:     drivers/mfd/da90??-*.c
 F:     drivers/mfd/da91??-*.c
-F:     drivers/power/da9052-battery.c
-F:     drivers/power/da91??-*.c
+F:     drivers/power/supply/da9052-battery.c
+F:     drivers/power/supply/da91??-*.c
 F:     drivers/regulator/da903x.c
 F:     drivers/regulator/da9???-regulator.[ch]
 F:     drivers/rtc/rtc-da90??.c
@@ -7579,8 +7579,8 @@ M:        Krzysztof Kozlowski <krzk@kernel.org>
 M:     Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
 L:     linux-pm@vger.kernel.org
 S:     Supported
-F:     drivers/power/max14577_charger.c
-F:     drivers/power/max77693_charger.c
+F:     drivers/power/supply/max14577_charger.c
+F:     drivers/power/supply/max77693_charger.c
 
 MAXIM MAX77802 MULTIFUNCTION PMIC DEVICE DRIVERS
 M:     Javier Martinez Canillas <javier@osg.samsung.com>
@@ -8486,11 +8486,11 @@ R:      Pali Rohár <pali.rohar@gmail.com>
 F:     include/linux/power/bq2415x_charger.h
 F:     include/linux/power/bq27xxx_battery.h
 F:     include/linux/power/isp1704_charger.h
-F:     drivers/power/bq2415x_charger.c
-F:     drivers/power/bq27xxx_battery.c
-F:     drivers/power/bq27xxx_battery_i2c.c
-F:     drivers/power/isp1704_charger.c
-F:     drivers/power/rx51_battery.c
+F:     drivers/power/supply/bq2415x_charger.c
+F:     drivers/power/supply/bq27xxx_battery.c
+F:     drivers/power/supply/bq27xxx_battery_i2c.c
+F:     drivers/power/supply/isp1704_charger.c
+F:     drivers/power/supply/rx51_battery.c
 
 NTB DRIVER CORE
 M:     Jon Mason <jdmason@kudzu.us>
@@ -9490,16 +9490,12 @@ F:      drivers/powercap/
 
 POWER SUPPLY CLASS/SUBSYSTEM and DRIVERS
 M:     Sebastian Reichel <sre@kernel.org>
-M:     Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
-M:     David Woodhouse <dwmw2@infradead.org>
 L:     linux-pm@vger.kernel.org
-T:     git git://git.infradead.org/battery-2.6.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git
 S:     Maintained
-F:     Documentation/devicetree/bindings/power/
-F:     Documentation/devicetree/bindings/power_supply/
+F:     Documentation/devicetree/bindings/power/supply/
 F:     include/linux/power_supply.h
-F:     drivers/power/
-X:     drivers/power/avs/
+F:     drivers/power/supply/
 
 POWER STATE COORDINATION INTERFACE (PSCI)
 M:     Mark Rutland <mark.rutland@arm.com>
@@ -10514,8 +10510,8 @@ F:      drivers/thunderbolt/
 TI BQ27XXX POWER SUPPLY DRIVER
 R:     Andrew F. Davis <afd@ti.com>
 F:     include/linux/power/bq27xxx_battery.h
-F:     drivers/power/bq27xxx_battery.c
-F:     drivers/power/bq27xxx_battery_i2c.c
+F:     drivers/power/supply/bq27xxx_battery.c
+F:     drivers/power/supply/bq27xxx_battery_i2c.c
 
 TIMEKEEPING, CLOCKSOURCE CORE, NTP, ALARMTIMER
 M:     John Stultz <john.stultz@linaro.org>
@@ -11512,6 +11508,14 @@ T:     git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git
 S:     Supported
 F:     drivers/mfd/syscon.c
 
+SYSTEM RESET/SHUTDOWN DRIVERS
+M:     Sebastian Reichel <sre@kernel.org>
+L:     linux-pm@vger.kernel.org
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git
+S:     Maintained
+F:     Documentation/devicetree/bindings/power/reset/
+F:     drivers/power/reset/
+
 SYSV FILESYSTEM
 M:     Christoph Hellwig <hch@infradead.org>
 S:     Maintained
@@ -11860,7 +11864,7 @@ F:      include/linux/platform_data/lp855x.h
 TI LP8727 CHARGER DRIVER
 M:     Milo Kim <milo.kim@ti.com>
 S:     Maintained
-F:     drivers/power/lp8727_charger.c
+F:     drivers/power/supply/lp8727_charger.c
 F:     include/linux/platform_data/lp8727.h
 
 TI LP8788 MFD DRIVER
@@ -11869,7 +11873,7 @@ S:      Maintained
 F:     drivers/iio/adc/lp8788_adc.c
 F:     drivers/leds/leds-lp8788.c
 F:     drivers/mfd/lp8788*.c
-F:     drivers/power/lp8788-charger.c
+F:     drivers/power/supply/lp8788-charger.c
 F:     drivers/regulator/lp8788-*.c
 F:     include/linux/mfd/lp8788*.h
 
@@ -12946,7 +12950,7 @@ F:      drivers/input/touchscreen/wm97*.c
 F:     drivers/mfd/arizona*
 F:     drivers/mfd/wm*.c
 F:     drivers/mfd/cs47l24*
-F:     drivers/power/wm83*.c
+F:     drivers/power/supply/wm83*.c
 F:     drivers/rtc/rtc-wm83*.c
 F:     drivers/regulator/wm8*.c
 F:     drivers/video/backlight/wm83*_bl.c
index acd4a1524a1ec4948198ff6a9229d624979caedb..63454b5cac274d1dede2d55d4ae33b2643ba79fb 100644 (file)
@@ -1,517 +1,3 @@
-menuconfig POWER_SUPPLY
-       bool "Power supply class support"
-       help
-         Say Y here to enable power supply class support. This allows
-         power supply (batteries, AC, USB) monitoring by userspace
-         via sysfs and uevent (if available) and/or APM kernel interface
-         (if selected below).
-
-if POWER_SUPPLY
-
-config POWER_SUPPLY_DEBUG
-       bool "Power supply debug"
-       help
-         Say Y here to enable debugging messages for power supply class
-         and drivers.
-
-config PDA_POWER
-       tristate "Generic PDA/phone power driver"
-       depends on !S390
-       help
-         Say Y here to enable generic power driver for PDAs and phones with
-         one or two external power supplies (AC/USB) connected to main and
-         backup batteries, and optional builtin charger.
-
-config APM_POWER
-       tristate "APM emulation for class batteries"
-       depends on APM_EMULATION
-       help
-         Say Y here to enable support APM status emulation using
-         battery class devices.
-
-config GENERIC_ADC_BATTERY
-       tristate "Generic battery support using IIO"
-       depends on IIO
-       help
-         Say Y here to enable support for the generic battery driver
-         which uses IIO framework to read adc.
-
-config MAX8925_POWER
-       tristate "MAX8925 battery charger support"
-       depends on MFD_MAX8925
-       help
-         Say Y here to enable support for the battery charger in the Maxim
-         MAX8925 PMIC.
-
-config WM831X_BACKUP
-       tristate "WM831X backup battery charger support"
-       depends on MFD_WM831X
-       help
-         Say Y here to enable support for the backup battery charger
-         in the Wolfson Microelectronics WM831x PMICs.
-
-config WM831X_POWER
-       tristate "WM831X PMU support"
-       depends on MFD_WM831X
-       help
-         Say Y here to enable support for the power management unit
-         provided by Wolfson Microelectronics WM831x PMICs.
-
-config WM8350_POWER
-        tristate "WM8350 PMU support"
-        depends on MFD_WM8350
-        help
-          Say Y here to enable support for the power management unit
-         provided by the Wolfson Microelectronics WM8350 PMIC.
-
-config TEST_POWER
-       tristate "Test power driver"
-       help
-         This driver is used for testing. It's safe to say M here.
-
-config BATTERY_88PM860X
-       tristate "Marvell 88PM860x battery driver"
-       depends on MFD_88PM860X
-       help
-         Say Y here to enable battery monitor for Marvell 88PM860x chip.
-
-config BATTERY_ACT8945A
-       tristate "Active-semi ACT8945A charger driver"
-       depends on MFD_ACT8945A || COMPILE_TEST
-       help
-         Say Y here to enable support for power supply provided by
-         Active-semi ActivePath ACT8945A charger.
-
-config BATTERY_DS2760
-       tristate "DS2760 battery driver (HP iPAQ & others)"
-       depends on W1 && W1_SLAVE_DS2760
-       help
-         Say Y here to enable support for batteries with ds2760 chip.
-
-config BATTERY_DS2780
-       tristate "DS2780 battery driver"
-       depends on HAS_IOMEM
-       select W1
-       select W1_SLAVE_DS2780
-       help
-         Say Y here to enable support for batteries with ds2780 chip.
-
-config BATTERY_DS2781
-       tristate "DS2781 battery driver"
-       depends on HAS_IOMEM
-       select W1
-       select W1_SLAVE_DS2781
-       help
-         If you enable this you will have the DS2781 battery driver support.
-
-         The battery monitor chip is used in many batteries/devices
-         as the one who is responsible for charging/discharging/monitoring
-         Li+ batteries.
-
-         If you are unsure, say N.
-
-config BATTERY_DS2782
-       tristate "DS2782/DS2786 standalone gas-gauge"
-       depends on I2C
-       help
-         Say Y here to enable support for the DS2782/DS2786 standalone battery
-         gas-gauge.
-
-config BATTERY_PMU
-       tristate "Apple PMU battery"
-       depends on PPC32 && ADB_PMU
-       help
-         Say Y here to expose battery information on Apple machines
-         through the generic battery class.
-
-config BATTERY_OLPC
-       tristate "One Laptop Per Child battery"
-       depends on X86_32 && OLPC
-       help
-         Say Y to enable support for the battery on the OLPC laptop.
-
-config BATTERY_TOSA
-       tristate "Sharp SL-6000 (tosa) battery"
-       depends on MACH_TOSA && MFD_TC6393XB && TOUCHSCREEN_WM97XX
-       help
-         Say Y to enable support for the battery on the Sharp Zaurus
-         SL-6000 (tosa) models.
-
-config BATTERY_COLLIE
-       tristate "Sharp SL-5500 (collie) battery"
-       depends on SA1100_COLLIE && MCP_UCB1200
-       help
-         Say Y to enable support for the battery on the Sharp Zaurus
-         SL-5500 (collie) models.
-
-config BATTERY_IPAQ_MICRO
-       tristate "iPAQ Atmel Micro ASIC battery driver"
-       depends on MFD_IPAQ_MICRO
-       help
-         Choose this option if you want to monitor battery status on
-         Compaq/HP iPAQ h3100 and h3600.
-
-config BATTERY_WM97XX
-       bool "WM97xx generic battery driver"
-       depends on TOUCHSCREEN_WM97XX=y
-       help
-         Say Y to enable support for battery measured by WM97xx aux port.
-
-config BATTERY_SBS
-        tristate "SBS Compliant gas gauge"
-        depends on I2C
-        help
-         Say Y to include support for SBS battery driver for SBS-compliant
-         gas gauges.
-
-config BATTERY_BQ27XXX
-       tristate "BQ27xxx battery driver"
-       help
-         Say Y here to enable support for batteries with BQ27xxx chips.
-
-config BATTERY_BQ27XXX_I2C
-       tristate "BQ27xxx I2C support"
-       depends on BATTERY_BQ27XXX
-       depends on I2C
-       default y
-       help
-         Say Y here to enable support for batteries with BQ27xxx chips
-         connected over an I2C bus.
-
-config BATTERY_DA9030
-       tristate "DA9030 battery driver"
-       depends on PMIC_DA903X
-       help
-         Say Y here to enable support for batteries charger integrated into
-         DA9030 PMIC.
-
-config BATTERY_DA9052
-       tristate "Dialog DA9052 Battery"
-       depends on PMIC_DA9052
-       help
-         Say Y here to enable support for batteries charger integrated into
-         DA9052 PMIC.
-
-config CHARGER_DA9150
-       tristate "Dialog Semiconductor DA9150 Charger support"
-       depends on MFD_DA9150
-       depends on DA9150_GPADC
-       depends on IIO
-       help
-         Say Y here to enable support for charger unit of the DA9150
-         Integrated Charger & Fuel-Gauge IC.
-
-         This driver can also be built as a module. If so, the module will be
-         called da9150-charger.
-
-config BATTERY_DA9150
-       tristate "Dialog Semiconductor DA9150 Fuel Gauge support"
-       depends on MFD_DA9150
-       help
-         Say Y here to enable support for the Fuel-Gauge unit of the DA9150
-         Integrated Charger & Fuel-Gauge IC
-
-         This driver can also be built as a module. If so, the module will be
-         called da9150-fg.
-
-config AXP288_CHARGER
-       tristate "X-Powers AXP288 Charger"
-       depends on MFD_AXP20X && EXTCON_AXP288
-       help
-         Say yes here to have support X-Power AXP288 power management IC (PMIC)
-         integrated charger.
-
-config AXP288_FUEL_GAUGE
-       tristate "X-Powers AXP288 Fuel Gauge"
-       depends on MFD_AXP20X && IIO
-       help
-         Say yes here to have support for X-Power power management IC (PMIC)
-         Fuel Gauge. The device provides battery statistics and status
-         monitoring as well as alerts for battery over/under voltage and
-         over/under temperature.
-
-config BATTERY_MAX17040
-       tristate "Maxim MAX17040 Fuel Gauge"
-       depends on I2C
-       help
-         MAX17040 is fuel-gauge systems for lithium-ion (Li+) batteries
-         in handheld and portable equipment. The MAX17040 is configured
-         to operate with a single lithium cell
-
-config BATTERY_MAX17042
-       tristate "Maxim MAX17042/17047/17050/8997/8966 Fuel Gauge"
-       depends on I2C
-       select REGMAP_I2C
-       help
-         MAX17042 is fuel-gauge systems for lithium-ion (Li+) batteries
-         in handheld and portable equipment. The MAX17042 is configured
-         to operate with a single lithium cell. MAX8997 and MAX8966 are
-         multi-function devices that include fuel gauages that are compatible
-         with MAX17042. This driver also supports max17047/50 chips which are
-         improved version of max17042.
-
-config BATTERY_Z2
-       tristate "Z2 battery driver"
-       depends on I2C && MACH_ZIPIT2
-       help
-         Say Y to include support for the battery on the Zipit Z2.
-
-config BATTERY_S3C_ADC
-       tristate "Battery driver for Samsung ADC based monitoring"
-       depends on S3C_ADC
-       help
-         Say Y here to enable support for iPAQ h1930/h1940/rx1950 battery
-
-config BATTERY_TWL4030_MADC
-       tristate "TWL4030 MADC battery driver"
-       depends on TWL4030_MADC
-       help
-         Say Y here to enable this dumb driver for batteries managed
-         through the TWL4030 MADC.
-
-config CHARGER_88PM860X
-       tristate "Marvell 88PM860x Charger driver"
-       depends on MFD_88PM860X && BATTERY_88PM860X
-       help
-         Say Y here to enable charger for Marvell 88PM860x chip.
-
-config CHARGER_PCF50633
-       tristate "NXP PCF50633 MBC"
-       depends on MFD_PCF50633
-       help
-        Say Y to include support for NXP PCF50633 Main Battery Charger.
-
-config BATTERY_JZ4740
-       tristate "Ingenic JZ4740 battery"
-       depends on MACH_JZ4740
-       depends on MFD_JZ4740_ADC
-       help
-         Say Y to enable support for the battery on Ingenic JZ4740 based
-         boards.
-
-         This driver can be build as a module. If so, the module will be
-         called jz4740-battery.
-
-config BATTERY_INTEL_MID
-       tristate "Battery driver for Intel MID platforms"
-       depends on INTEL_SCU_IPC && SPI
-       help
-         Say Y here to enable the battery driver on Intel MID
-         platforms.
-
-config BATTERY_RX51
-       tristate "Nokia RX-51 (N900) battery driver"
-       depends on TWL4030_MADC
-       help
-         Say Y here to enable support for battery information on Nokia
-         RX-51, also known as N900 tablet.
-
-config CHARGER_ISP1704
-       tristate "ISP1704 USB Charger Detection"
-       depends on USB_PHY
-       depends on USB_GADGET || !USB_GADGET # if USB_GADGET=m, this can't be 'y'
-       help
-         Say Y to enable support for USB Charger Detection with
-         ISP1707/ISP1704 USB transceivers.
-
-config CHARGER_MAX8903
-       tristate "MAX8903 Battery DC-DC Charger for USB and Adapter Power"
-       help
-         Say Y to enable support for the MAX8903 DC-DC charger and sysfs.
-         The driver supports controlling charger-enable and current-limit
-         pins based on the status of charger connections with interrupt
-         handlers.
-
-config CHARGER_TWL4030
-       tristate "OMAP TWL4030 BCI charger driver"
-       depends on IIO && TWL4030_CORE
-       help
-         Say Y here to enable support for TWL4030 Battery Charge Interface.
-
-config CHARGER_LP8727
-       tristate "TI/National Semiconductor LP8727 charger driver"
-       depends on I2C
-       help
-         Say Y here to enable support for LP8727 Charger Driver.
-
-config CHARGER_LP8788
-       tristate "TI LP8788 charger driver"
-       depends on MFD_LP8788
-       depends on LP8788_ADC
-       depends on IIO
-       help
-         Say Y to enable support for the LP8788 linear charger.
-
-config CHARGER_GPIO
-       tristate "GPIO charger"
-       depends on GPIOLIB || COMPILE_TEST
-       help
-         Say Y to include support for chargers which report their online status
-         through a GPIO pin.
-
-         This driver can be build as a module. If so, the module will be
-         called gpio-charger.
-
-config CHARGER_MANAGER
-       bool "Battery charger manager for multiple chargers"
-       depends on REGULATOR
-       select EXTCON
-       help
-          Say Y to enable charger-manager support, which allows multiple
-          chargers attached to a battery and multiple batteries attached to a
-          system. The charger-manager also can monitor charging status in
-          runtime and in suspend-to-RAM by waking up the system periodically
-          with help of suspend_again support.
-
-config CHARGER_MAX14577
-       tristate "Maxim MAX14577/77836 battery charger driver"
-       depends on MFD_MAX14577
-       help
-         Say Y to enable support for the battery charger control sysfs and
-         platform data of MAX14577/77836 MUICs.
-
-config CHARGER_MAX77693
-       tristate "Maxim MAX77693 battery charger driver"
-       depends on MFD_MAX77693
-       help
-         Say Y to enable support for the Maxim MAX77693 battery charger.
-
-config CHARGER_MAX8997
-       tristate "Maxim MAX8997/MAX8966 PMIC battery charger driver"
-       depends on MFD_MAX8997 && REGULATOR_MAX8997
-       help
-         Say Y to enable support for the battery charger control sysfs and
-         platform data of MAX8997/LP3974 PMICs.
-
-config CHARGER_MAX8998
-       tristate "Maxim MAX8998/LP3974 PMIC battery charger driver"
-       depends on MFD_MAX8998 && REGULATOR_MAX8998
-       help
-         Say Y to enable support for the battery charger control sysfs and
-         platform data of MAX8998/LP3974 PMICs.
-
-config CHARGER_QCOM_SMBB
-       tristate "Qualcomm Switch-Mode Battery Charger and Boost"
-       depends on MFD_SPMI_PMIC || COMPILE_TEST
-       depends on OF
-       depends on EXTCON
-       help
-         Say Y to include support for the Switch-Mode Battery Charger and
-         Boost (SMBB) hardware found in Qualcomm PM8941 PMICs.  The charger
-         is an integrated, single-cell lithium-ion battery charger.  DT
-         configuration is required for loading, see the devicetree
-         documentation for more detail.  The base name for this driver is
-         'pm8941_charger'.
-
-config CHARGER_BQ2415X
-       tristate "TI BQ2415x battery charger driver"
-       depends on I2C
-       help
-         Say Y to enable support for the TI BQ2415x battery charger
-         PMICs.
-
-         You'll need this driver to charge batteries on e.g. Nokia
-         RX-51/N900.
-
-config CHARGER_BQ24190
-       tristate "TI BQ24190 battery charger driver"
-       depends on I2C
-       depends on GPIOLIB || COMPILE_TEST
-       help
-         Say Y to enable support for the TI BQ24190 battery charger.
-
-config CHARGER_BQ24257
-       tristate "TI BQ24250/24251/24257 battery charger driver"
-       depends on I2C
-       depends on GPIOLIB || COMPILE_TEST
-       depends on REGMAP_I2C
-       help
-         Say Y to enable support for the TI BQ24250, BQ24251, and BQ24257 battery
-         chargers.
-
-config CHARGER_BQ24735
-       tristate "TI BQ24735 battery charger support"
-       depends on I2C
-       depends on GPIOLIB || COMPILE_TEST
-       help
-         Say Y to enable support for the TI BQ24735 battery charger.
-
-config CHARGER_BQ25890
-       tristate "TI BQ25890 battery charger driver"
-       depends on I2C
-       depends on GPIOLIB || COMPILE_TEST
-       select REGMAP_I2C
-       help
-         Say Y to enable support for the TI BQ25890 battery charger.
-
-config CHARGER_SMB347
-       tristate "Summit Microelectronics SMB347 Battery Charger"
-       depends on I2C
-       select REGMAP_I2C
-       help
-         Say Y to include support for Summit Microelectronics SMB347
-         Battery Charger.
-
-config CHARGER_TPS65090
-       tristate "TPS65090 battery charger driver"
-       depends on MFD_TPS65090
-       help
-        Say Y here to enable support for battery charging with TPS65090
-        PMIC chips.
-
-config CHARGER_TPS65217
-       tristate "TPS65217 battery charger driver"
-       depends on MFD_TPS65217
-       help
-        Say Y here to enable support for battery charging with TPS65217
-        PMIC chips.
-
-config BATTERY_GAUGE_LTC2941
-       tristate "LTC2941/LTC2943 Battery Gauge Driver"
-       depends on I2C
-       help
-         Say Y here to include support for LTC2941 and LTC2943 Battery
-         Gauge IC. The driver reports the charge count continuously, and
-         measures the voltage and temperature every 10 seconds.
-
-config AB8500_BM
-       bool "AB8500 Battery Management Driver"
-       depends on AB8500_CORE && AB8500_GPADC
-       help
-         Say Y to include support for AB8500 battery management.
-
-config BATTERY_GOLDFISH
-       tristate "Goldfish battery driver"
-       depends on GOLDFISH || COMPILE_TEST
-       depends on HAS_IOMEM
-       help
-         Say Y to enable support for the battery and AC power in the
-         Goldfish emulator.
-
-config BATTERY_RT5033
-       tristate "RT5033 fuel gauge support"
-       depends on MFD_RT5033
-       help
-         This adds support for battery fuel gauge in Richtek RT5033 PMIC.
-         The fuelgauge calculates and determines the battery state of charge
-         according to battery open circuit voltage.
-
-config CHARGER_RT9455
-       tristate "Richtek RT9455 battery charger driver"
-       depends on I2C
-       depends on GPIOLIB || COMPILE_TEST
-       select REGMAP_I2C
-       help
-         Say Y to enable support for Richtek RT9455 battery charger.
-
-config AXP20X_POWER
-       tristate "AXP20x power supply driver"
-       depends on MFD_AXP20X
-       help
-         This driver provides support for the power supply features of
-         AXP20x PMIC.
-
-endif # POWER_SUPPLY
-
-source "drivers/power/reset/Kconfig"
 source "drivers/power/avs/Kconfig"
+source "drivers/power/reset/Kconfig"
+source "drivers/power/supply/Kconfig"
index e46b75d448a5734bfa40ae7a92648fd8feec5162..ff35c712d824c5a756de115b02ab3c5ffef9c6a2 100644 (file)
@@ -1,76 +1,3 @@
-subdir-ccflags-$(CONFIG_POWER_SUPPLY_DEBUG) := -DDEBUG
-
-power_supply-y                         := power_supply_core.o
-power_supply-$(CONFIG_SYSFS)           += power_supply_sysfs.o
-power_supply-$(CONFIG_LEDS_TRIGGERS)   += power_supply_leds.o
-
-obj-$(CONFIG_POWER_SUPPLY)     += power_supply.o
-obj-$(CONFIG_GENERIC_ADC_BATTERY)      += generic-adc-battery.o
-
-obj-$(CONFIG_PDA_POWER)                += pda_power.o
-obj-$(CONFIG_APM_POWER)                += apm_power.o
-obj-$(CONFIG_AXP20X_POWER)     += axp20x_usb_power.o
-obj-$(CONFIG_MAX8925_POWER)    += max8925_power.o
-obj-$(CONFIG_WM831X_BACKUP)    += wm831x_backup.o
-obj-$(CONFIG_WM831X_POWER)     += wm831x_power.o
-obj-$(CONFIG_WM8350_POWER)     += wm8350_power.o
-obj-$(CONFIG_TEST_POWER)       += test_power.o
-
-obj-$(CONFIG_BATTERY_88PM860X) += 88pm860x_battery.o
-obj-$(CONFIG_BATTERY_ACT8945A) += act8945a_charger.o
-obj-$(CONFIG_BATTERY_DS2760)   += ds2760_battery.o
-obj-$(CONFIG_BATTERY_DS2780)   += ds2780_battery.o
-obj-$(CONFIG_BATTERY_DS2781)   += ds2781_battery.o
-obj-$(CONFIG_BATTERY_DS2782)   += ds2782_battery.o
-obj-$(CONFIG_BATTERY_GAUGE_LTC2941)    += ltc2941-battery-gauge.o
-obj-$(CONFIG_BATTERY_GOLDFISH) += goldfish_battery.o
-obj-$(CONFIG_BATTERY_PMU)      += pmu_battery.o
-obj-$(CONFIG_BATTERY_OLPC)     += olpc_battery.o
-obj-$(CONFIG_BATTERY_TOSA)     += tosa_battery.o
-obj-$(CONFIG_BATTERY_COLLIE)   += collie_battery.o
-obj-$(CONFIG_BATTERY_IPAQ_MICRO) += ipaq_micro_battery.o
-obj-$(CONFIG_BATTERY_WM97XX)   += wm97xx_battery.o
-obj-$(CONFIG_BATTERY_SBS)      += sbs-battery.o
-obj-$(CONFIG_BATTERY_BQ27XXX)  += bq27xxx_battery.o
-obj-$(CONFIG_BATTERY_BQ27XXX_I2C) += bq27xxx_battery_i2c.o
-obj-$(CONFIG_BATTERY_DA9030)   += da9030_battery.o
-obj-$(CONFIG_BATTERY_DA9052)   += da9052-battery.o
-obj-$(CONFIG_CHARGER_DA9150)   += da9150-charger.o
-obj-$(CONFIG_BATTERY_DA9150)   += da9150-fg.o
-obj-$(CONFIG_BATTERY_MAX17040) += max17040_battery.o
-obj-$(CONFIG_BATTERY_MAX17042) += max17042_battery.o
-obj-$(CONFIG_BATTERY_Z2)       += z2_battery.o
-obj-$(CONFIG_BATTERY_RT5033)   += rt5033_battery.o
-obj-$(CONFIG_CHARGER_RT9455)   += rt9455_charger.o
-obj-$(CONFIG_BATTERY_S3C_ADC)  += s3c_adc_battery.o
-obj-$(CONFIG_BATTERY_TWL4030_MADC)     += twl4030_madc_battery.o
-obj-$(CONFIG_CHARGER_88PM860X) += 88pm860x_charger.o
-obj-$(CONFIG_CHARGER_PCF50633) += pcf50633-charger.o
-obj-$(CONFIG_BATTERY_JZ4740)   += jz4740-battery.o
-obj-$(CONFIG_BATTERY_INTEL_MID)        += intel_mid_battery.o
-obj-$(CONFIG_BATTERY_RX51)     += rx51_battery.o
-obj-$(CONFIG_AB8500_BM)                += ab8500_bmdata.o ab8500_charger.o ab8500_fg.o ab8500_btemp.o abx500_chargalg.o pm2301_charger.o
-obj-$(CONFIG_CHARGER_ISP1704)  += isp1704_charger.o
-obj-$(CONFIG_CHARGER_MAX8903)  += max8903_charger.o
-obj-$(CONFIG_CHARGER_TWL4030)  += twl4030_charger.o
-obj-$(CONFIG_CHARGER_LP8727)   += lp8727_charger.o
-obj-$(CONFIG_CHARGER_LP8788)   += lp8788-charger.o
-obj-$(CONFIG_CHARGER_GPIO)     += gpio-charger.o
-obj-$(CONFIG_CHARGER_MANAGER)  += charger-manager.o
-obj-$(CONFIG_CHARGER_MAX14577) += max14577_charger.o
-obj-$(CONFIG_CHARGER_MAX77693) += max77693_charger.o
-obj-$(CONFIG_CHARGER_MAX8997)  += max8997_charger.o
-obj-$(CONFIG_CHARGER_MAX8998)  += max8998_charger.o
-obj-$(CONFIG_CHARGER_QCOM_SMBB)        += qcom_smbb.o
-obj-$(CONFIG_CHARGER_BQ2415X)  += bq2415x_charger.o
-obj-$(CONFIG_CHARGER_BQ24190)  += bq24190_charger.o
-obj-$(CONFIG_CHARGER_BQ24257)  += bq24257_charger.o
-obj-$(CONFIG_CHARGER_BQ24735)  += bq24735-charger.o
-obj-$(CONFIG_CHARGER_BQ25890)  += bq25890_charger.o
 obj-$(CONFIG_POWER_AVS)                += avs/
-obj-$(CONFIG_CHARGER_SMB347)   += smb347-charger.o
-obj-$(CONFIG_CHARGER_TPS65090) += tps65090-charger.o
-obj-$(CONFIG_CHARGER_TPS65217) += tps65217_charger.o
 obj-$(CONFIG_POWER_RESET)      += reset/
-obj-$(CONFIG_AXP288_FUEL_GAUGE) += axp288_fuel_gauge.o
-obj-$(CONFIG_AXP288_CHARGER)   += axp288_charger.o
+obj-$(CONFIG_POWER_SUPPLY)     += supply/
diff --git a/drivers/power/act8945a_charger.c b/drivers/power/act8945a_charger.c
deleted file mode 100644 (file)
index b5c00e4..0000000
+++ /dev/null
@@ -1,359 +0,0 @@
-/*
- * Power supply driver for the Active-semi ACT8945A PMIC
- *
- * Copyright (C) 2015 Atmel Corporation
- *
- * Author: Wenyou Yang <wenyou.yang@atmel.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- */
-#include <linux/module.h>
-#include <linux/of.h>
-#include <linux/of_gpio.h>
-#include <linux/platform_device.h>
-#include <linux/power_supply.h>
-#include <linux/regmap.h>
-
-static const char *act8945a_charger_model = "ACT8945A";
-static const char *act8945a_charger_manufacturer = "Active-semi";
-
-/**
- * ACT8945A Charger Register Map
- */
-
-/* 0x70: Reserved */
-#define ACT8945A_APCH_CFG              0x71
-#define ACT8945A_APCH_STATUS           0x78
-#define ACT8945A_APCH_CTRL             0x79
-#define ACT8945A_APCH_STATE            0x7A
-
-/* ACT8945A_APCH_CFG */
-#define APCH_CFG_OVPSET                        (0x3 << 0)
-#define APCH_CFG_OVPSET_6V6            (0x0 << 0)
-#define APCH_CFG_OVPSET_7V             (0x1 << 0)
-#define APCH_CFG_OVPSET_7V5            (0x2 << 0)
-#define APCH_CFG_OVPSET_8V             (0x3 << 0)
-#define APCH_CFG_PRETIMO               (0x3 << 2)
-#define APCH_CFG_PRETIMO_40_MIN                (0x0 << 2)
-#define APCH_CFG_PRETIMO_60_MIN                (0x1 << 2)
-#define APCH_CFG_PRETIMO_80_MIN                (0x2 << 2)
-#define APCH_CFG_PRETIMO_DISABLED      (0x3 << 2)
-#define APCH_CFG_TOTTIMO               (0x3 << 4)
-#define APCH_CFG_TOTTIMO_3_HOUR                (0x0 << 4)
-#define APCH_CFG_TOTTIMO_4_HOUR                (0x1 << 4)
-#define APCH_CFG_TOTTIMO_5_HOUR                (0x2 << 4)
-#define APCH_CFG_TOTTIMO_DISABLED      (0x3 << 4)
-#define APCH_CFG_SUSCHG                        (0x1 << 7)
-
-#define APCH_STATUS_CHGDAT             BIT(0)
-#define APCH_STATUS_INDAT              BIT(1)
-#define APCH_STATUS_TEMPDAT            BIT(2)
-#define APCH_STATUS_TIMRDAT            BIT(3)
-#define APCH_STATUS_CHGSTAT            BIT(4)
-#define APCH_STATUS_INSTAT             BIT(5)
-#define APCH_STATUS_TEMPSTAT           BIT(6)
-#define APCH_STATUS_TIMRSTAT           BIT(7)
-
-#define APCH_CTRL_CHGEOCOUT            BIT(0)
-#define APCH_CTRL_INDIS                        BIT(1)
-#define APCH_CTRL_TEMPOUT              BIT(2)
-#define APCH_CTRL_TIMRPRE              BIT(3)
-#define APCH_CTRL_CHGEOCIN             BIT(4)
-#define APCH_CTRL_INCON                        BIT(5)
-#define APCH_CTRL_TEMPIN               BIT(6)
-#define APCH_CTRL_TIMRTOT              BIT(7)
-
-#define APCH_STATE_ACINSTAT            (0x1 << 1)
-#define APCH_STATE_CSTATE              (0x3 << 4)
-#define APCH_STATE_CSTATE_SHIFT                4
-#define APCH_STATE_CSTATE_DISABLED     0x00
-#define APCH_STATE_CSTATE_EOC          0x01
-#define APCH_STATE_CSTATE_FAST         0x02
-#define APCH_STATE_CSTATE_PRE          0x03
-
-struct act8945a_charger {
-       struct regmap *regmap;
-       bool battery_temperature;
-};
-
-static int act8945a_get_charger_state(struct regmap *regmap, int *val)
-{
-       int ret;
-       unsigned int status, state;
-
-       ret = regmap_read(regmap, ACT8945A_APCH_STATUS, &status);
-       if (ret < 0)
-               return ret;
-
-       ret = regmap_read(regmap, ACT8945A_APCH_STATE, &state);
-       if (ret < 0)
-               return ret;
-
-       state &= APCH_STATE_CSTATE;
-       state >>= APCH_STATE_CSTATE_SHIFT;
-
-       if (state == APCH_STATE_CSTATE_EOC) {
-               if (status & APCH_STATUS_CHGDAT)
-                       *val = POWER_SUPPLY_STATUS_FULL;
-               else
-                       *val = POWER_SUPPLY_STATUS_NOT_CHARGING;
-       } else if ((state == APCH_STATE_CSTATE_FAST) ||
-                  (state == APCH_STATE_CSTATE_PRE)) {
-               *val = POWER_SUPPLY_STATUS_CHARGING;
-       } else {
-               *val = POWER_SUPPLY_STATUS_NOT_CHARGING;
-       }
-
-       return 0;
-}
-
-static int act8945a_get_charge_type(struct regmap *regmap, int *val)
-{
-       int ret;
-       unsigned int state;
-
-       ret = regmap_read(regmap, ACT8945A_APCH_STATE, &state);
-       if (ret < 0)
-               return ret;
-
-       state &= APCH_STATE_CSTATE;
-       state >>= APCH_STATE_CSTATE_SHIFT;
-
-       switch (state) {
-       case APCH_STATE_CSTATE_PRE:
-               *val = POWER_SUPPLY_CHARGE_TYPE_TRICKLE;
-               break;
-       case APCH_STATE_CSTATE_FAST:
-               *val = POWER_SUPPLY_CHARGE_TYPE_FAST;
-               break;
-       case APCH_STATE_CSTATE_EOC:
-       case APCH_STATE_CSTATE_DISABLED:
-       default:
-               *val = POWER_SUPPLY_CHARGE_TYPE_NONE;
-       }
-
-       return 0;
-}
-
-static int act8945a_get_battery_health(struct act8945a_charger *charger,
-                                      struct regmap *regmap, int *val)
-{
-       int ret;
-       unsigned int status;
-
-       ret = regmap_read(regmap, ACT8945A_APCH_STATUS, &status);
-       if (ret < 0)
-               return ret;
-
-       if (charger->battery_temperature && !(status & APCH_STATUS_TEMPDAT))
-               *val = POWER_SUPPLY_HEALTH_OVERHEAT;
-       else if (!(status & APCH_STATUS_INDAT))
-               *val = POWER_SUPPLY_HEALTH_OVERVOLTAGE;
-       else if (status & APCH_STATUS_TIMRDAT)
-               *val = POWER_SUPPLY_HEALTH_SAFETY_TIMER_EXPIRE;
-       else
-               *val = POWER_SUPPLY_HEALTH_GOOD;
-
-       return 0;
-}
-
-static enum power_supply_property act8945a_charger_props[] = {
-       POWER_SUPPLY_PROP_STATUS,
-       POWER_SUPPLY_PROP_CHARGE_TYPE,
-       POWER_SUPPLY_PROP_TECHNOLOGY,
-       POWER_SUPPLY_PROP_HEALTH,
-       POWER_SUPPLY_PROP_MODEL_NAME,
-       POWER_SUPPLY_PROP_MANUFACTURER
-};
-
-static int act8945a_charger_get_property(struct power_supply *psy,
-                                        enum power_supply_property prop,
-                                        union power_supply_propval *val)
-{
-       struct act8945a_charger *charger = power_supply_get_drvdata(psy);
-       struct regmap *regmap = charger->regmap;
-       int ret = 0;
-
-       switch (prop) {
-       case POWER_SUPPLY_PROP_STATUS:
-               ret = act8945a_get_charger_state(regmap, &val->intval);
-               break;
-       case POWER_SUPPLY_PROP_CHARGE_TYPE:
-               ret = act8945a_get_charge_type(regmap, &val->intval);
-               break;
-       case POWER_SUPPLY_PROP_TECHNOLOGY:
-               val->intval = POWER_SUPPLY_TECHNOLOGY_LION;
-               break;
-       case POWER_SUPPLY_PROP_HEALTH:
-               ret = act8945a_get_battery_health(charger,
-                                                 regmap, &val->intval);
-               break;
-       case POWER_SUPPLY_PROP_MODEL_NAME:
-               val->strval = act8945a_charger_model;
-               break;
-       case POWER_SUPPLY_PROP_MANUFACTURER:
-               val->strval = act8945a_charger_manufacturer;
-               break;
-       default:
-               return -EINVAL;
-       }
-
-       return ret;
-}
-
-static const struct power_supply_desc act8945a_charger_desc = {
-       .name           = "act8945a-charger",
-       .type           = POWER_SUPPLY_TYPE_BATTERY,
-       .get_property   = act8945a_charger_get_property,
-       .properties     = act8945a_charger_props,
-       .num_properties = ARRAY_SIZE(act8945a_charger_props),
-};
-
-#define DEFAULT_TOTAL_TIME_OUT         3
-#define DEFAULT_PRE_TIME_OUT           40
-#define DEFAULT_INPUT_OVP_THRESHOLD    6600
-
-static int act8945a_charger_config(struct device *dev,
-                                  struct act8945a_charger *charger)
-{
-       struct device_node *np = dev->of_node;
-       enum of_gpio_flags flags;
-       struct regmap *regmap = charger->regmap;
-
-       u32 total_time_out;
-       u32 pre_time_out;
-       u32 input_voltage_threshold;
-       int chglev_pin;
-
-       unsigned int value = 0;
-
-       if (!np) {
-               dev_err(dev, "no charger of node\n");
-               return -EINVAL;
-       }
-
-       charger->battery_temperature = of_property_read_bool(np,
-                               "active-semi,check-battery-temperature");
-
-       chglev_pin = of_get_named_gpio_flags(np,
-                               "active-semi,chglev-gpios", 0, &flags);
-
-       if (gpio_is_valid(chglev_pin)) {
-               gpio_set_value(chglev_pin,
-                              ((flags == OF_GPIO_ACTIVE_LOW) ? 0 : 1));
-       }
-
-       if (of_property_read_u32(np,
-                                "active-semi,input-voltage-threshold-microvolt",
-                                &input_voltage_threshold))
-               input_voltage_threshold = DEFAULT_INPUT_OVP_THRESHOLD;
-
-       if (of_property_read_u32(np,
-                                "active-semi,precondition-timeout",
-                                &pre_time_out))
-               pre_time_out = DEFAULT_PRE_TIME_OUT;
-
-       if (of_property_read_u32(np, "active-semi,total-timeout",
-                                &total_time_out))
-               total_time_out = DEFAULT_TOTAL_TIME_OUT;
-
-       switch (input_voltage_threshold) {
-       case 8000:
-               value |= APCH_CFG_OVPSET_8V;
-               break;
-       case 7500:
-               value |= APCH_CFG_OVPSET_7V5;
-               break;
-       case 7000:
-               value |= APCH_CFG_OVPSET_7V;
-               break;
-       case 6600:
-       default:
-               value |= APCH_CFG_OVPSET_6V6;
-               break;
-       }
-
-       switch (pre_time_out) {
-       case 60:
-               value |= APCH_CFG_PRETIMO_60_MIN;
-               break;
-       case 80:
-               value |= APCH_CFG_PRETIMO_80_MIN;
-               break;
-       case 0:
-               value |= APCH_CFG_PRETIMO_DISABLED;
-               break;
-       case 40:
-       default:
-               value |= APCH_CFG_PRETIMO_40_MIN;
-               break;
-       }
-
-       switch (total_time_out) {
-       case 4:
-               value |= APCH_CFG_TOTTIMO_4_HOUR;
-               break;
-       case 5:
-               value |= APCH_CFG_TOTTIMO_5_HOUR;
-               break;
-       case 0:
-               value |= APCH_CFG_TOTTIMO_DISABLED;
-               break;
-       case 3:
-       default:
-               value |= APCH_CFG_TOTTIMO_3_HOUR;
-               break;
-       }
-
-       return regmap_write(regmap, ACT8945A_APCH_CFG, value);
-}
-
-static int act8945a_charger_probe(struct platform_device *pdev)
-{
-       struct act8945a_charger *charger;
-       struct power_supply *psy;
-       struct power_supply_config psy_cfg = {};
-       int ret;
-
-       charger = devm_kzalloc(&pdev->dev, sizeof(*charger), GFP_KERNEL);
-       if (!charger)
-               return -ENOMEM;
-
-       charger->regmap = dev_get_regmap(pdev->dev.parent, NULL);
-       if (!charger->regmap) {
-               dev_err(&pdev->dev, "Parent did not provide regmap\n");
-               return -EINVAL;
-       }
-
-       ret = act8945a_charger_config(pdev->dev.parent, charger);
-       if (ret)
-               return ret;
-
-       psy_cfg.of_node = pdev->dev.parent->of_node;
-       psy_cfg.drv_data = charger;
-
-       psy = devm_power_supply_register(&pdev->dev,
-                                        &act8945a_charger_desc,
-                                        &psy_cfg);
-       if (IS_ERR(psy)) {
-               dev_err(&pdev->dev, "failed to register power supply\n");
-               return PTR_ERR(psy);
-       }
-
-       return 0;
-}
-
-static struct platform_driver act8945a_charger_driver = {
-       .driver = {
-               .name = "act8945a-charger",
-       },
-       .probe  = act8945a_charger_probe,
-};
-module_platform_driver(act8945a_charger_driver);
-
-MODULE_DESCRIPTION("Active-semi ACT8945A ActivePath charger driver");
-MODULE_AUTHOR("Wenyou Yang <wenyou.yang@atmel.com>");
-MODULE_LICENSE("GPL");
index c70f1bffe038b8ad02c6c4980b62e039090c15a4..09380857a1c5c9814a860e43237f68eb1a6988d5 100644 (file)
@@ -139,7 +139,7 @@ static int rsctrl_probe(struct platform_device *pdev)
                }
 
                if (val >= WDT_MUX_NUMBER) {
-                       dev_err(dev, "ti,wdt-list property can contain"
+                       dev_err(dev, "ti,wdt-list property can contain "
                                "only numbers < 4\n");
                        return -EINVAL;
                }
index 2dfbbce0f8174dca4a50a8b9dd29e657bad8af78..fb512183ace3ed818004e10f072a2d4ebc45a184 100644 (file)
@@ -135,6 +135,65 @@ int reboot_mode_unregister(struct reboot_mode_driver *reboot)
 }
 EXPORT_SYMBOL_GPL(reboot_mode_unregister);
 
+static void devm_reboot_mode_release(struct device *dev, void *res)
+{
+       reboot_mode_unregister(*(struct reboot_mode_driver **)res);
+}
+
+/**
+ * devm_reboot_mode_register() - resource managed reboot_mode_register()
+ * @dev: device to associate this resource with
+ * @reboot: reboot mode driver
+ *
+ * Returns: 0 on success or a negative error code on failure.
+ */
+int devm_reboot_mode_register(struct device *dev,
+                             struct reboot_mode_driver *reboot)
+{
+       struct reboot_mode_driver **dr;
+       int rc;
+
+       dr = devres_alloc(devm_reboot_mode_release, sizeof(*dr), GFP_KERNEL);
+       if (!dr)
+               return -ENOMEM;
+
+       rc = reboot_mode_register(reboot);
+       if (rc) {
+               devres_free(dr);
+               return rc;
+       }
+
+       *dr = reboot;
+       devres_add(dev, dr);
+
+       return 0;
+}
+EXPORT_SYMBOL_GPL(devm_reboot_mode_register);
+
+static int devm_reboot_mode_match(struct device *dev, void *res, void *data)
+{
+       struct reboot_mode_driver **p = res;
+
+       if (WARN_ON(!p || !*p))
+               return 0;
+
+       return *p == data;
+}
+
+/**
+ * devm_reboot_mode_unregister() - resource managed reboot_mode_unregister()
+ * @dev: device to associate this resource with
+ * @reboot: reboot mode driver
+ */
+void devm_reboot_mode_unregister(struct device *dev,
+                                struct reboot_mode_driver *reboot)
+{
+       WARN_ON(devres_release(dev,
+                              devm_reboot_mode_release,
+                              devm_reboot_mode_match, reboot));
+}
+EXPORT_SYMBOL_GPL(devm_reboot_mode_unregister);
+
 MODULE_AUTHOR("Andy Yan <andy.yan@rock-chips.com");
 MODULE_DESCRIPTION("System reboot mode core library");
 MODULE_LICENSE("GPL v2");
index 2491bb71f5911ed39c78391ce439a600c0d17361..75f7fe5c881f0711051ba3385c2ac294d48903dc 100644 (file)
@@ -10,5 +10,9 @@ struct reboot_mode_driver {
 
 int reboot_mode_register(struct reboot_mode_driver *reboot);
 int reboot_mode_unregister(struct reboot_mode_driver *reboot);
+int devm_reboot_mode_register(struct device *dev,
+                             struct reboot_mode_driver *reboot);
+void devm_reboot_mode_unregister(struct device *dev,
+                                struct reboot_mode_driver *reboot);
 
 #endif
index a488877a3538c8c9761d1c8e468cdf1c3edb91de..2046b31232f7b1daec39367f3e10d859ab95d7b0 100644 (file)
@@ -28,28 +28,6 @@ struct reset_syscfg {
        unsigned int mask_rst_msk;
 };
 
-/* STiH415 */
-#define STIH415_SYSCFG_11      0x2c
-#define STIH415_SYSCFG_15      0x3c
-
-static struct reset_syscfg stih415_reset = {
-       .offset_rst = STIH415_SYSCFG_11,
-       .mask_rst = BIT(0),
-       .offset_rst_msk = STIH415_SYSCFG_15,
-       .mask_rst_msk = BIT(0)
-};
-
-/* STiH416 */
-#define STIH416_SYSCFG_500     0x7d0
-#define STIH416_SYSCFG_504     0x7e0
-
-static struct reset_syscfg stih416_reset = {
-       .offset_rst = STIH416_SYSCFG_500,
-       .mask_rst = BIT(0),
-       .offset_rst_msk = STIH416_SYSCFG_504,
-       .mask_rst_msk = BIT(0)
-};
-
 /* STiH407 */
 #define STIH407_SYSCFG_4000    0x0
 #define STIH407_SYSCFG_4008    0x20
@@ -61,16 +39,6 @@ static struct reset_syscfg stih407_reset = {
        .mask_rst_msk = BIT(0)
 };
 
-/* STiD127 */
-#define STID127_SYSCFG_700     0x0
-#define STID127_SYSCFG_773     0x124
-
-static struct reset_syscfg stid127_reset = {
-       .offset_rst = STID127_SYSCFG_773,
-       .mask_rst = BIT(0),
-       .offset_rst_msk = STID127_SYSCFG_700,
-       .mask_rst_msk = BIT(8)
-};
 
 static struct reset_syscfg *st_restart_syscfg;
 
@@ -99,17 +67,8 @@ static struct notifier_block st_restart_nb = {
 
 static const struct of_device_id st_reset_of_match[] = {
        {
-               .compatible = "st,stih415-restart",
-               .data = (void *)&stih415_reset,
-       }, {
-               .compatible = "st,stih416-restart",
-               .data = (void *)&stih416_reset,
-       }, {
                .compatible = "st,stih407-restart",
                .data = (void *)&stih407_reset,
-       }, {
-               .compatible = "st,stid127-restart",
-               .data = (void *)&stid127_reset,
        },
        {}
 };
index 9e1cba5dd58eb97b516239d0bffc6639c848f99f..1ecb51d671492b29aa46a37dc59039c5573efdd2 100644 (file)
@@ -53,8 +53,6 @@ static int syscon_reboot_mode_probe(struct platform_device *pdev)
        syscon_rbm->reboot.write = syscon_reboot_mode_write;
        syscon_rbm->mask = 0xffffffff;
 
-       dev_set_drvdata(&pdev->dev, syscon_rbm);
-
        syscon_rbm->map = syscon_node_to_regmap(pdev->dev.parent->of_node);
        if (IS_ERR(syscon_rbm->map))
                return PTR_ERR(syscon_rbm->map);
@@ -65,20 +63,13 @@ static int syscon_reboot_mode_probe(struct platform_device *pdev)
 
        of_property_read_u32(pdev->dev.of_node, "mask", &syscon_rbm->mask);
 
-       ret = reboot_mode_register(&syscon_rbm->reboot);
+       ret = devm_reboot_mode_register(&pdev->dev, &syscon_rbm->reboot);
        if (ret)
                dev_err(&pdev->dev, "can't register reboot mode\n");
 
        return ret;
 }
 
-static int syscon_reboot_mode_remove(struct platform_device *pdev)
-{
-       struct syscon_reboot_mode *syscon_rbm = dev_get_drvdata(&pdev->dev);
-
-       return reboot_mode_unregister(&syscon_rbm->reboot);
-}
-
 static const struct of_device_id syscon_reboot_mode_of_match[] = {
        { .compatible = "syscon-reboot-mode" },
        {}
@@ -86,7 +77,6 @@ static const struct of_device_id syscon_reboot_mode_of_match[] = {
 
 static struct platform_driver syscon_reboot_mode_driver = {
        .probe = syscon_reboot_mode_probe,
-       .remove = syscon_reboot_mode_remove,
        .driver = {
                .name = "syscon-reboot-mode",
                .of_match_table = syscon_reboot_mode_of_match,
index f07e93c97ba337624d202b19b55ab46fda170b21..73c3d93e5318b9ab2c7d6287c01e4a8b83d8de5e 100644 (file)
@@ -81,8 +81,10 @@ static int xgene_reboot_probe(struct platform_device *pdev)
        ctx->restart_handler.notifier_call = xgene_restart_handler;
        ctx->restart_handler.priority = 128;
        err = register_restart_handler(&ctx->restart_handler);
-       if (err)
+       if (err) {
+               iounmap(ctx->csr);
                dev_err(dev, "cannot register restart handler (err=%d)\n", err);
+       }
 
        return err;
 }
index a5b009673d0ee98be2716960f16bcbcda1de8c17..b0b1eb3a78c289090fef365d2e5772a924659ae5 100644 (file)
@@ -58,9 +58,12 @@ static int zx_reboot_probe(struct platform_device *pdev)
        }
 
        err = register_restart_handler(&zx_restart_nb);
-       if (err)
+       if (err) {
+               iounmap(base);
+               iounmap(pcu_base);
                dev_err(&pdev->dev, "Register restart handler failed(err=%d)\n",
                        err);
+       }
 
        return err;
 }
diff --git a/drivers/power/supply/Kconfig b/drivers/power/supply/Kconfig
new file mode 100644 (file)
index 0000000..76806a0
--- /dev/null
@@ -0,0 +1,514 @@
+menuconfig POWER_SUPPLY
+       bool "Power supply class support"
+       help
+         Say Y here to enable power supply class support. This allows
+         power supply (batteries, AC, USB) monitoring by userspace
+         via sysfs and uevent (if available) and/or APM kernel interface
+         (if selected below).
+
+if POWER_SUPPLY
+
+config POWER_SUPPLY_DEBUG
+       bool "Power supply debug"
+       help
+         Say Y here to enable debugging messages for power supply class
+         and drivers.
+
+config PDA_POWER
+       tristate "Generic PDA/phone power driver"
+       depends on !S390
+       help
+         Say Y here to enable generic power driver for PDAs and phones with
+         one or two external power supplies (AC/USB) connected to main and
+         backup batteries, and optional builtin charger.
+
+config APM_POWER
+       tristate "APM emulation for class batteries"
+       depends on APM_EMULATION
+       help
+         Say Y here to enable support APM status emulation using
+         battery class devices.
+
+config GENERIC_ADC_BATTERY
+       tristate "Generic battery support using IIO"
+       depends on IIO
+       help
+         Say Y here to enable support for the generic battery driver
+         which uses IIO framework to read adc.
+
+config MAX8925_POWER
+       tristate "MAX8925 battery charger support"
+       depends on MFD_MAX8925
+       help
+         Say Y here to enable support for the battery charger in the Maxim
+         MAX8925 PMIC.
+
+config WM831X_BACKUP
+       tristate "WM831X backup battery charger support"
+       depends on MFD_WM831X
+       help
+         Say Y here to enable support for the backup battery charger
+         in the Wolfson Microelectronics WM831x PMICs.
+
+config WM831X_POWER
+       tristate "WM831X PMU support"
+       depends on MFD_WM831X
+       help
+         Say Y here to enable support for the power management unit
+         provided by Wolfson Microelectronics WM831x PMICs.
+
+config WM8350_POWER
+        tristate "WM8350 PMU support"
+        depends on MFD_WM8350
+        help
+          Say Y here to enable support for the power management unit
+         provided by the Wolfson Microelectronics WM8350 PMIC.
+
+config TEST_POWER
+       tristate "Test power driver"
+       help
+         This driver is used for testing. It's safe to say M here.
+
+config BATTERY_88PM860X
+       tristate "Marvell 88PM860x battery driver"
+       depends on MFD_88PM860X
+       help
+         Say Y here to enable battery monitor for Marvell 88PM860x chip.
+
+config BATTERY_ACT8945A
+       tristate "Active-semi ACT8945A charger driver"
+       depends on MFD_ACT8945A || COMPILE_TEST
+       help
+         Say Y here to enable support for power supply provided by
+         Active-semi ActivePath ACT8945A charger.
+
+config BATTERY_DS2760
+       tristate "DS2760 battery driver (HP iPAQ & others)"
+       depends on W1 && W1_SLAVE_DS2760
+       help
+         Say Y here to enable support for batteries with ds2760 chip.
+
+config BATTERY_DS2780
+       tristate "DS2780 battery driver"
+       depends on HAS_IOMEM
+       select W1
+       select W1_SLAVE_DS2780
+       help
+         Say Y here to enable support for batteries with ds2780 chip.
+
+config BATTERY_DS2781
+       tristate "DS2781 battery driver"
+       depends on HAS_IOMEM
+       select W1
+       select W1_SLAVE_DS2781
+       help
+         If you enable this you will have the DS2781 battery driver support.
+
+         The battery monitor chip is used in many batteries/devices
+         as the one who is responsible for charging/discharging/monitoring
+         Li+ batteries.
+
+         If you are unsure, say N.
+
+config BATTERY_DS2782
+       tristate "DS2782/DS2786 standalone gas-gauge"
+       depends on I2C
+       help
+         Say Y here to enable support for the DS2782/DS2786 standalone battery
+         gas-gauge.
+
+config BATTERY_PMU
+       tristate "Apple PMU battery"
+       depends on PPC32 && ADB_PMU
+       help
+         Say Y here to expose battery information on Apple machines
+         through the generic battery class.
+
+config BATTERY_OLPC
+       tristate "One Laptop Per Child battery"
+       depends on X86_32 && OLPC
+       help
+         Say Y to enable support for the battery on the OLPC laptop.
+
+config BATTERY_TOSA
+       tristate "Sharp SL-6000 (tosa) battery"
+       depends on MACH_TOSA && MFD_TC6393XB && TOUCHSCREEN_WM97XX
+       help
+         Say Y to enable support for the battery on the Sharp Zaurus
+         SL-6000 (tosa) models.
+
+config BATTERY_COLLIE
+       tristate "Sharp SL-5500 (collie) battery"
+       depends on SA1100_COLLIE && MCP_UCB1200
+       help
+         Say Y to enable support for the battery on the Sharp Zaurus
+         SL-5500 (collie) models.
+
+config BATTERY_IPAQ_MICRO
+       tristate "iPAQ Atmel Micro ASIC battery driver"
+       depends on MFD_IPAQ_MICRO
+       help
+         Choose this option if you want to monitor battery status on
+         Compaq/HP iPAQ h3100 and h3600.
+
+config BATTERY_WM97XX
+       bool "WM97xx generic battery driver"
+       depends on TOUCHSCREEN_WM97XX=y
+       help
+         Say Y to enable support for battery measured by WM97xx aux port.
+
+config BATTERY_SBS
+        tristate "SBS Compliant gas gauge"
+        depends on I2C
+        help
+         Say Y to include support for SBS battery driver for SBS-compliant
+         gas gauges.
+
+config BATTERY_BQ27XXX
+       tristate "BQ27xxx battery driver"
+       help
+         Say Y here to enable support for batteries with BQ27xxx chips.
+
+config BATTERY_BQ27XXX_I2C
+       tristate "BQ27xxx I2C support"
+       depends on BATTERY_BQ27XXX
+       depends on I2C
+       default y
+       help
+         Say Y here to enable support for batteries with BQ27xxx chips
+         connected over an I2C bus.
+
+config BATTERY_DA9030
+       tristate "DA9030 battery driver"
+       depends on PMIC_DA903X
+       help
+         Say Y here to enable support for batteries charger integrated into
+         DA9030 PMIC.
+
+config BATTERY_DA9052
+       tristate "Dialog DA9052 Battery"
+       depends on PMIC_DA9052
+       help
+         Say Y here to enable support for batteries charger integrated into
+         DA9052 PMIC.
+
+config CHARGER_DA9150
+       tristate "Dialog Semiconductor DA9150 Charger support"
+       depends on MFD_DA9150
+       depends on DA9150_GPADC
+       depends on IIO
+       help
+         Say Y here to enable support for charger unit of the DA9150
+         Integrated Charger & Fuel-Gauge IC.
+
+         This driver can also be built as a module. If so, the module will be
+         called da9150-charger.
+
+config BATTERY_DA9150
+       tristate "Dialog Semiconductor DA9150 Fuel Gauge support"
+       depends on MFD_DA9150
+       help
+         Say Y here to enable support for the Fuel-Gauge unit of the DA9150
+         Integrated Charger & Fuel-Gauge IC
+
+         This driver can also be built as a module. If so, the module will be
+         called da9150-fg.
+
+config AXP288_CHARGER
+       tristate "X-Powers AXP288 Charger"
+       depends on MFD_AXP20X && EXTCON_AXP288
+       help
+         Say yes here to have support X-Power AXP288 power management IC (PMIC)
+         integrated charger.
+
+config AXP288_FUEL_GAUGE
+       tristate "X-Powers AXP288 Fuel Gauge"
+       depends on MFD_AXP20X && IIO
+       help
+         Say yes here to have support for X-Power power management IC (PMIC)
+         Fuel Gauge. The device provides battery statistics and status
+         monitoring as well as alerts for battery over/under voltage and
+         over/under temperature.
+
+config BATTERY_MAX17040
+       tristate "Maxim MAX17040 Fuel Gauge"
+       depends on I2C
+       help
+         MAX17040 is fuel-gauge systems for lithium-ion (Li+) batteries
+         in handheld and portable equipment. The MAX17040 is configured
+         to operate with a single lithium cell
+
+config BATTERY_MAX17042
+       tristate "Maxim MAX17042/17047/17050/8997/8966 Fuel Gauge"
+       depends on I2C
+       select REGMAP_I2C
+       help
+         MAX17042 is fuel-gauge systems for lithium-ion (Li+) batteries
+         in handheld and portable equipment. The MAX17042 is configured
+         to operate with a single lithium cell. MAX8997 and MAX8966 are
+         multi-function devices that include fuel gauages that are compatible
+         with MAX17042. This driver also supports max17047/50 chips which are
+         improved version of max17042.
+
+config BATTERY_Z2
+       tristate "Z2 battery driver"
+       depends on I2C && MACH_ZIPIT2
+       help
+         Say Y to include support for the battery on the Zipit Z2.
+
+config BATTERY_S3C_ADC
+       tristate "Battery driver for Samsung ADC based monitoring"
+       depends on S3C_ADC
+       help
+         Say Y here to enable support for iPAQ h1930/h1940/rx1950 battery
+
+config BATTERY_TWL4030_MADC
+       tristate "TWL4030 MADC battery driver"
+       depends on TWL4030_MADC
+       help
+         Say Y here to enable this dumb driver for batteries managed
+         through the TWL4030 MADC.
+
+config CHARGER_88PM860X
+       tristate "Marvell 88PM860x Charger driver"
+       depends on MFD_88PM860X && BATTERY_88PM860X
+       help
+         Say Y here to enable charger for Marvell 88PM860x chip.
+
+config CHARGER_PCF50633
+       tristate "NXP PCF50633 MBC"
+       depends on MFD_PCF50633
+       help
+        Say Y to include support for NXP PCF50633 Main Battery Charger.
+
+config BATTERY_JZ4740
+       tristate "Ingenic JZ4740 battery"
+       depends on MACH_JZ4740
+       depends on MFD_JZ4740_ADC
+       help
+         Say Y to enable support for the battery on Ingenic JZ4740 based
+         boards.
+
+         This driver can be build as a module. If so, the module will be
+         called jz4740-battery.
+
+config BATTERY_INTEL_MID
+       tristate "Battery driver for Intel MID platforms"
+       depends on INTEL_SCU_IPC && SPI
+       help
+         Say Y here to enable the battery driver on Intel MID
+         platforms.
+
+config BATTERY_RX51
+       tristate "Nokia RX-51 (N900) battery driver"
+       depends on TWL4030_MADC
+       help
+         Say Y here to enable support for battery information on Nokia
+         RX-51, also known as N900 tablet.
+
+config CHARGER_ISP1704
+       tristate "ISP1704 USB Charger Detection"
+       depends on USB_PHY
+       depends on USB_GADGET || !USB_GADGET # if USB_GADGET=m, this can't be 'y'
+       help
+         Say Y to enable support for USB Charger Detection with
+         ISP1707/ISP1704 USB transceivers.
+
+config CHARGER_MAX8903
+       tristate "MAX8903 Battery DC-DC Charger for USB and Adapter Power"
+       help
+         Say Y to enable support for the MAX8903 DC-DC charger and sysfs.
+         The driver supports controlling charger-enable and current-limit
+         pins based on the status of charger connections with interrupt
+         handlers.
+
+config CHARGER_TWL4030
+       tristate "OMAP TWL4030 BCI charger driver"
+       depends on IIO && TWL4030_CORE
+       help
+         Say Y here to enable support for TWL4030 Battery Charge Interface.
+
+config CHARGER_LP8727
+       tristate "TI/National Semiconductor LP8727 charger driver"
+       depends on I2C
+       help
+         Say Y here to enable support for LP8727 Charger Driver.
+
+config CHARGER_LP8788
+       tristate "TI LP8788 charger driver"
+       depends on MFD_LP8788
+       depends on LP8788_ADC
+       depends on IIO
+       help
+         Say Y to enable support for the LP8788 linear charger.
+
+config CHARGER_GPIO
+       tristate "GPIO charger"
+       depends on GPIOLIB || COMPILE_TEST
+       help
+         Say Y to include support for chargers which report their online status
+         through a GPIO pin.
+
+         This driver can be build as a module. If so, the module will be
+         called gpio-charger.
+
+config CHARGER_MANAGER
+       bool "Battery charger manager for multiple chargers"
+       depends on REGULATOR
+       select EXTCON
+       help
+          Say Y to enable charger-manager support, which allows multiple
+          chargers attached to a battery and multiple batteries attached to a
+          system. The charger-manager also can monitor charging status in
+          runtime and in suspend-to-RAM by waking up the system periodically
+          with help of suspend_again support.
+
+config CHARGER_MAX14577
+       tristate "Maxim MAX14577/77836 battery charger driver"
+       depends on MFD_MAX14577
+       help
+         Say Y to enable support for the battery charger control sysfs and
+         platform data of MAX14577/77836 MUICs.
+
+config CHARGER_MAX77693
+       tristate "Maxim MAX77693 battery charger driver"
+       depends on MFD_MAX77693
+       help
+         Say Y to enable support for the Maxim MAX77693 battery charger.
+
+config CHARGER_MAX8997
+       tristate "Maxim MAX8997/MAX8966 PMIC battery charger driver"
+       depends on MFD_MAX8997 && REGULATOR_MAX8997
+       help
+         Say Y to enable support for the battery charger control sysfs and
+         platform data of MAX8997/LP3974 PMICs.
+
+config CHARGER_MAX8998
+       tristate "Maxim MAX8998/LP3974 PMIC battery charger driver"
+       depends on MFD_MAX8998 && REGULATOR_MAX8998
+       help
+         Say Y to enable support for the battery charger control sysfs and
+         platform data of MAX8998/LP3974 PMICs.
+
+config CHARGER_QCOM_SMBB
+       tristate "Qualcomm Switch-Mode Battery Charger and Boost"
+       depends on MFD_SPMI_PMIC || COMPILE_TEST
+       depends on OF
+       depends on EXTCON
+       help
+         Say Y to include support for the Switch-Mode Battery Charger and
+         Boost (SMBB) hardware found in Qualcomm PM8941 PMICs.  The charger
+         is an integrated, single-cell lithium-ion battery charger.  DT
+         configuration is required for loading, see the devicetree
+         documentation for more detail.  The base name for this driver is
+         'pm8941_charger'.
+
+config CHARGER_BQ2415X
+       tristate "TI BQ2415x battery charger driver"
+       depends on I2C
+       help
+         Say Y to enable support for the TI BQ2415x battery charger
+         PMICs.
+
+         You'll need this driver to charge batteries on e.g. Nokia
+         RX-51/N900.
+
+config CHARGER_BQ24190
+       tristate "TI BQ24190 battery charger driver"
+       depends on I2C
+       depends on GPIOLIB || COMPILE_TEST
+       help
+         Say Y to enable support for the TI BQ24190 battery charger.
+
+config CHARGER_BQ24257
+       tristate "TI BQ24250/24251/24257 battery charger driver"
+       depends on I2C
+       depends on GPIOLIB || COMPILE_TEST
+       depends on REGMAP_I2C
+       help
+         Say Y to enable support for the TI BQ24250, BQ24251, and BQ24257 battery
+         chargers.
+
+config CHARGER_BQ24735
+       tristate "TI BQ24735 battery charger support"
+       depends on I2C
+       depends on GPIOLIB || COMPILE_TEST
+       help
+         Say Y to enable support for the TI BQ24735 battery charger.
+
+config CHARGER_BQ25890
+       tristate "TI BQ25890 battery charger driver"
+       depends on I2C
+       depends on GPIOLIB || COMPILE_TEST
+       select REGMAP_I2C
+       help
+         Say Y to enable support for the TI BQ25890 battery charger.
+
+config CHARGER_SMB347
+       tristate "Summit Microelectronics SMB347 Battery Charger"
+       depends on I2C
+       select REGMAP_I2C
+       help
+         Say Y to include support for Summit Microelectronics SMB347
+         Battery Charger.
+
+config CHARGER_TPS65090
+       tristate "TPS65090 battery charger driver"
+       depends on MFD_TPS65090
+       help
+        Say Y here to enable support for battery charging with TPS65090
+        PMIC chips.
+
+config CHARGER_TPS65217
+       tristate "TPS65217 battery charger driver"
+       depends on MFD_TPS65217
+       help
+        Say Y here to enable support for battery charging with TPS65217
+        PMIC chips.
+
+config BATTERY_GAUGE_LTC2941
+       tristate "LTC2941/LTC2943 Battery Gauge Driver"
+       depends on I2C
+       help
+         Say Y here to include support for LTC2941 and LTC2943 Battery
+         Gauge IC. The driver reports the charge count continuously, and
+         measures the voltage and temperature every 10 seconds.
+
+config AB8500_BM
+       bool "AB8500 Battery Management Driver"
+       depends on AB8500_CORE && AB8500_GPADC
+       help
+         Say Y to include support for AB8500 battery management.
+
+config BATTERY_GOLDFISH
+       tristate "Goldfish battery driver"
+       depends on GOLDFISH || COMPILE_TEST
+       depends on HAS_IOMEM
+       help
+         Say Y to enable support for the battery and AC power in the
+         Goldfish emulator.
+
+config BATTERY_RT5033
+       tristate "RT5033 fuel gauge support"
+       depends on MFD_RT5033
+       help
+         This adds support for battery fuel gauge in Richtek RT5033 PMIC.
+         The fuelgauge calculates and determines the battery state of charge
+         according to battery open circuit voltage.
+
+config CHARGER_RT9455
+       tristate "Richtek RT9455 battery charger driver"
+       depends on I2C
+       depends on GPIOLIB || COMPILE_TEST
+       select REGMAP_I2C
+       help
+         Say Y to enable support for Richtek RT9455 battery charger.
+
+config AXP20X_POWER
+       tristate "AXP20x power supply driver"
+       depends on MFD_AXP20X
+       help
+         This driver provides support for the power supply features of
+         AXP20x PMIC.
+
+endif # POWER_SUPPLY
diff --git a/drivers/power/supply/Makefile b/drivers/power/supply/Makefile
new file mode 100644 (file)
index 0000000..36c599d
--- /dev/null
@@ -0,0 +1,74 @@
+subdir-ccflags-$(CONFIG_POWER_SUPPLY_DEBUG) := -DDEBUG
+
+power_supply-y                         := power_supply_core.o
+power_supply-$(CONFIG_SYSFS)           += power_supply_sysfs.o
+power_supply-$(CONFIG_LEDS_TRIGGERS)   += power_supply_leds.o
+
+obj-$(CONFIG_POWER_SUPPLY)     += power_supply.o
+obj-$(CONFIG_GENERIC_ADC_BATTERY)      += generic-adc-battery.o
+
+obj-$(CONFIG_PDA_POWER)                += pda_power.o
+obj-$(CONFIG_APM_POWER)                += apm_power.o
+obj-$(CONFIG_AXP20X_POWER)     += axp20x_usb_power.o
+obj-$(CONFIG_MAX8925_POWER)    += max8925_power.o
+obj-$(CONFIG_WM831X_BACKUP)    += wm831x_backup.o
+obj-$(CONFIG_WM831X_POWER)     += wm831x_power.o
+obj-$(CONFIG_WM8350_POWER)     += wm8350_power.o
+obj-$(CONFIG_TEST_POWER)       += test_power.o
+
+obj-$(CONFIG_BATTERY_88PM860X) += 88pm860x_battery.o
+obj-$(CONFIG_BATTERY_ACT8945A) += act8945a_charger.o
+obj-$(CONFIG_BATTERY_DS2760)   += ds2760_battery.o
+obj-$(CONFIG_BATTERY_DS2780)   += ds2780_battery.o
+obj-$(CONFIG_BATTERY_DS2781)   += ds2781_battery.o
+obj-$(CONFIG_BATTERY_DS2782)   += ds2782_battery.o
+obj-$(CONFIG_BATTERY_GAUGE_LTC2941)    += ltc2941-battery-gauge.o
+obj-$(CONFIG_BATTERY_GOLDFISH) += goldfish_battery.o
+obj-$(CONFIG_BATTERY_PMU)      += pmu_battery.o
+obj-$(CONFIG_BATTERY_OLPC)     += olpc_battery.o
+obj-$(CONFIG_BATTERY_TOSA)     += tosa_battery.o
+obj-$(CONFIG_BATTERY_COLLIE)   += collie_battery.o
+obj-$(CONFIG_BATTERY_IPAQ_MICRO) += ipaq_micro_battery.o
+obj-$(CONFIG_BATTERY_WM97XX)   += wm97xx_battery.o
+obj-$(CONFIG_BATTERY_SBS)      += sbs-battery.o
+obj-$(CONFIG_BATTERY_BQ27XXX)  += bq27xxx_battery.o
+obj-$(CONFIG_BATTERY_BQ27XXX_I2C) += bq27xxx_battery_i2c.o
+obj-$(CONFIG_BATTERY_DA9030)   += da9030_battery.o
+obj-$(CONFIG_BATTERY_DA9052)   += da9052-battery.o
+obj-$(CONFIG_CHARGER_DA9150)   += da9150-charger.o
+obj-$(CONFIG_BATTERY_DA9150)   += da9150-fg.o
+obj-$(CONFIG_BATTERY_MAX17040) += max17040_battery.o
+obj-$(CONFIG_BATTERY_MAX17042) += max17042_battery.o
+obj-$(CONFIG_BATTERY_Z2)       += z2_battery.o
+obj-$(CONFIG_BATTERY_RT5033)   += rt5033_battery.o
+obj-$(CONFIG_CHARGER_RT9455)   += rt9455_charger.o
+obj-$(CONFIG_BATTERY_S3C_ADC)  += s3c_adc_battery.o
+obj-$(CONFIG_BATTERY_TWL4030_MADC)     += twl4030_madc_battery.o
+obj-$(CONFIG_CHARGER_88PM860X) += 88pm860x_charger.o
+obj-$(CONFIG_CHARGER_PCF50633) += pcf50633-charger.o
+obj-$(CONFIG_BATTERY_JZ4740)   += jz4740-battery.o
+obj-$(CONFIG_BATTERY_INTEL_MID)        += intel_mid_battery.o
+obj-$(CONFIG_BATTERY_RX51)     += rx51_battery.o
+obj-$(CONFIG_AB8500_BM)                += ab8500_bmdata.o ab8500_charger.o ab8500_fg.o ab8500_btemp.o abx500_chargalg.o pm2301_charger.o
+obj-$(CONFIG_CHARGER_ISP1704)  += isp1704_charger.o
+obj-$(CONFIG_CHARGER_MAX8903)  += max8903_charger.o
+obj-$(CONFIG_CHARGER_TWL4030)  += twl4030_charger.o
+obj-$(CONFIG_CHARGER_LP8727)   += lp8727_charger.o
+obj-$(CONFIG_CHARGER_LP8788)   += lp8788-charger.o
+obj-$(CONFIG_CHARGER_GPIO)     += gpio-charger.o
+obj-$(CONFIG_CHARGER_MANAGER)  += charger-manager.o
+obj-$(CONFIG_CHARGER_MAX14577) += max14577_charger.o
+obj-$(CONFIG_CHARGER_MAX77693) += max77693_charger.o
+obj-$(CONFIG_CHARGER_MAX8997)  += max8997_charger.o
+obj-$(CONFIG_CHARGER_MAX8998)  += max8998_charger.o
+obj-$(CONFIG_CHARGER_QCOM_SMBB)        += qcom_smbb.o
+obj-$(CONFIG_CHARGER_BQ2415X)  += bq2415x_charger.o
+obj-$(CONFIG_CHARGER_BQ24190)  += bq24190_charger.o
+obj-$(CONFIG_CHARGER_BQ24257)  += bq24257_charger.o
+obj-$(CONFIG_CHARGER_BQ24735)  += bq24735-charger.o
+obj-$(CONFIG_CHARGER_BQ25890)  += bq25890_charger.o
+obj-$(CONFIG_CHARGER_SMB347)   += smb347-charger.o
+obj-$(CONFIG_CHARGER_TPS65090) += tps65090-charger.o
+obj-$(CONFIG_CHARGER_TPS65217) += tps65217_charger.o
+obj-$(CONFIG_AXP288_FUEL_GAUGE) += axp288_fuel_gauge.o
+obj-$(CONFIG_AXP288_CHARGER)   += axp288_charger.o
similarity index 99%
rename from drivers/power/ab8500_btemp.c
rename to drivers/power/supply/ab8500_btemp.c
index bf2e5dd301e7f791736674c6ee516e4c5c5779ca..6ffdc18f2599b04a96d0432d5f18dc6a8d973fbe 100644 (file)
@@ -1095,7 +1095,7 @@ static int ab8500_btemp_probe(struct platform_device *pdev)
 
        /* Create a work queue for the btemp */
        di->btemp_wq =
-               create_singlethread_workqueue("ab8500_btemp_wq");
+               alloc_workqueue("ab8500_btemp_wq", WQ_MEM_RECLAIM, 0);
        if (di->btemp_wq == NULL) {
                dev_err(di->dev, "failed to create work queue\n");
                return -ENOMEM;
similarity index 99%
rename from drivers/power/ab8500_charger.c
rename to drivers/power/supply/ab8500_charger.c
index 30de5d42b26af95905b1a07f10b6d69cb7bd0994..5cee9aa87aa338b3e310c136317850e47e62d9cd 100644 (file)
@@ -3540,8 +3540,8 @@ static int ab8500_charger_probe(struct platform_device *pdev)
        di->usb_state.usb_current = -1;
 
        /* Create a work queue for the charger */
-       di->charger_wq =
-               create_singlethread_workqueue("ab8500_charger_wq");
+       di->charger_wq = alloc_ordered_workqueue("ab8500_charger_wq",
+                                                WQ_MEM_RECLAIM);
        if (di->charger_wq == NULL) {
                dev_err(di->dev, "failed to create work queue\n");
                return -ENOMEM;
similarity index 99%
rename from drivers/power/ab8500_fg.c
rename to drivers/power/supply/ab8500_fg.c
index 5a36cf88578ac18a9305b1398ed888020dbefa0c..2199f673118c001e17ab09b4175d90946687d511 100644 (file)
@@ -245,13 +245,8 @@ static LIST_HEAD(ab8500_fg_list);
  */
 struct ab8500_fg *ab8500_fg_get(void)
 {
-       struct ab8500_fg *fg;
-
-       if (list_empty(&ab8500_fg_list))
-               return NULL;
-
-       fg = list_first_entry(&ab8500_fg_list, struct ab8500_fg, node);
-       return fg;
+       return list_first_entry_or_null(&ab8500_fg_list, struct ab8500_fg,
+                                       node);
 }
 
 /* Main battery properties */
@@ -3096,7 +3091,7 @@ static int ab8500_fg_probe(struct platform_device *pdev)
        ab8500_fg_discharge_state_to(di, AB8500_FG_DISCHARGE_INIT);
 
        /* Create a work queue for running the FG algorithm */
-       di->fg_wq = create_singlethread_workqueue("ab8500_fg_wq");
+       di->fg_wq = alloc_ordered_workqueue("ab8500_fg_wq", WQ_MEM_RECLAIM);
        if (di->fg_wq == NULL) {
                dev_err(di->dev, "failed to create work queue\n");
                return -ENOMEM;
similarity index 99%
rename from drivers/power/abx500_chargalg.c
rename to drivers/power/supply/abx500_chargalg.c
index d9104b1ab7cfd765ae59bd71220f68f0df3e9adb..a4411d6bbc962c21c394c7f3e702c34e4e04d9c2 100644 (file)
@@ -2091,8 +2091,8 @@ static int abx500_chargalg_probe(struct platform_device *pdev)
                abx500_chargalg_maintenance_timer_expired;
 
        /* Create a work queue for the chargalg */
-       di->chargalg_wq =
-               create_singlethread_workqueue("abx500_chargalg_wq");
+       di->chargalg_wq = alloc_ordered_workqueue("abx500_chargalg_wq",
+                                                  WQ_MEM_RECLAIM);
        if (di->chargalg_wq == NULL) {
                dev_err(di->dev, "failed to create work queue\n");
                return -ENOMEM;
diff --git a/drivers/power/supply/act8945a_charger.c b/drivers/power/supply/act8945a_charger.c
new file mode 100644 (file)
index 0000000..d1eb2e3
--- /dev/null
@@ -0,0 +1,666 @@
+/*
+ * Power supply driver for the Active-semi ACT8945A PMIC
+ *
+ * Copyright (C) 2015 Atmel Corporation
+ *
+ * Author: Wenyou Yang <wenyou.yang@atmel.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ */
+#include <linux/interrupt.h>
+#include <linux/module.h>
+#include <linux/of.h>
+#include <linux/of_irq.h>
+#include <linux/platform_device.h>
+#include <linux/power_supply.h>
+#include <linux/regmap.h>
+#include <linux/gpio/consumer.h>
+
+static const char *act8945a_charger_model = "ACT8945A";
+static const char *act8945a_charger_manufacturer = "Active-semi";
+
+/**
+ * ACT8945A Charger Register Map
+ */
+
+/* 0x70: Reserved */
+#define ACT8945A_APCH_CFG              0x71
+#define ACT8945A_APCH_STATUS           0x78
+#define ACT8945A_APCH_CTRL             0x79
+#define ACT8945A_APCH_STATE            0x7A
+
+/* ACT8945A_APCH_CFG */
+#define APCH_CFG_OVPSET                        (0x3 << 0)
+#define APCH_CFG_OVPSET_6V6            (0x0 << 0)
+#define APCH_CFG_OVPSET_7V             (0x1 << 0)
+#define APCH_CFG_OVPSET_7V5            (0x2 << 0)
+#define APCH_CFG_OVPSET_8V             (0x3 << 0)
+#define APCH_CFG_PRETIMO               (0x3 << 2)
+#define APCH_CFG_PRETIMO_40_MIN                (0x0 << 2)
+#define APCH_CFG_PRETIMO_60_MIN                (0x1 << 2)
+#define APCH_CFG_PRETIMO_80_MIN                (0x2 << 2)
+#define APCH_CFG_PRETIMO_DISABLED      (0x3 << 2)
+#define APCH_CFG_TOTTIMO               (0x3 << 4)
+#define APCH_CFG_TOTTIMO_3_HOUR                (0x0 << 4)
+#define APCH_CFG_TOTTIMO_4_HOUR                (0x1 << 4)
+#define APCH_CFG_TOTTIMO_5_HOUR                (0x2 << 4)
+#define APCH_CFG_TOTTIMO_DISABLED      (0x3 << 4)
+#define APCH_CFG_SUSCHG                        (0x1 << 7)
+
+#define APCH_STATUS_CHGDAT             BIT(0)
+#define APCH_STATUS_INDAT              BIT(1)
+#define APCH_STATUS_TEMPDAT            BIT(2)
+#define APCH_STATUS_TIMRDAT            BIT(3)
+#define APCH_STATUS_CHGSTAT            BIT(4)
+#define APCH_STATUS_INSTAT             BIT(5)
+#define APCH_STATUS_TEMPSTAT           BIT(6)
+#define APCH_STATUS_TIMRSTAT           BIT(7)
+
+#define APCH_CTRL_CHGEOCOUT            BIT(0)
+#define APCH_CTRL_INDIS                        BIT(1)
+#define APCH_CTRL_TEMPOUT              BIT(2)
+#define APCH_CTRL_TIMRPRE              BIT(3)
+#define APCH_CTRL_CHGEOCIN             BIT(4)
+#define APCH_CTRL_INCON                        BIT(5)
+#define APCH_CTRL_TEMPIN               BIT(6)
+#define APCH_CTRL_TIMRTOT              BIT(7)
+
+#define APCH_STATE_ACINSTAT            (0x1 << 1)
+#define APCH_STATE_CSTATE              (0x3 << 4)
+#define APCH_STATE_CSTATE_SHIFT                4
+#define APCH_STATE_CSTATE_DISABLED     0x00
+#define APCH_STATE_CSTATE_EOC          0x01
+#define APCH_STATE_CSTATE_FAST         0x02
+#define APCH_STATE_CSTATE_PRE          0x03
+
+struct act8945a_charger {
+       struct power_supply *psy;
+       struct power_supply_desc desc;
+       struct regmap *regmap;
+       struct work_struct work;
+
+       bool init_done;
+       struct gpio_desc *lbo_gpio;
+       struct gpio_desc *chglev_gpio;
+};
+
+static int act8945a_get_charger_state(struct regmap *regmap, int *val)
+{
+       int ret;
+       unsigned int status, state;
+
+       ret = regmap_read(regmap, ACT8945A_APCH_STATUS, &status);
+       if (ret < 0)
+               return ret;
+
+       ret = regmap_read(regmap, ACT8945A_APCH_STATE, &state);
+       if (ret < 0)
+               return ret;
+
+       state &= APCH_STATE_CSTATE;
+       state >>= APCH_STATE_CSTATE_SHIFT;
+
+       switch (state) {
+       case APCH_STATE_CSTATE_PRE:
+       case APCH_STATE_CSTATE_FAST:
+               *val = POWER_SUPPLY_STATUS_CHARGING;
+               break;
+       case APCH_STATE_CSTATE_EOC:
+               if (status & APCH_STATUS_CHGDAT)
+                       *val = POWER_SUPPLY_STATUS_FULL;
+               else
+                       *val = POWER_SUPPLY_STATUS_CHARGING;
+               break;
+       case APCH_STATE_CSTATE_DISABLED:
+       default:
+               if (!(status & APCH_STATUS_INDAT))
+                       *val = POWER_SUPPLY_STATUS_DISCHARGING;
+               else
+                       *val = POWER_SUPPLY_STATUS_NOT_CHARGING;
+               break;
+       }
+
+       return 0;
+}
+
+static int act8945a_get_charge_type(struct regmap *regmap, int *val)
+{
+       int ret;
+       unsigned int status, state;
+
+       ret = regmap_read(regmap, ACT8945A_APCH_STATUS, &status);
+       if (ret < 0)
+               return ret;
+
+       ret = regmap_read(regmap, ACT8945A_APCH_STATE, &state);
+       if (ret < 0)
+               return ret;
+
+       state &= APCH_STATE_CSTATE;
+       state >>= APCH_STATE_CSTATE_SHIFT;
+
+       switch (state) {
+       case APCH_STATE_CSTATE_PRE:
+               *val = POWER_SUPPLY_CHARGE_TYPE_TRICKLE;
+               break;
+       case APCH_STATE_CSTATE_FAST:
+               *val = POWER_SUPPLY_CHARGE_TYPE_FAST;
+               break;
+       case APCH_STATE_CSTATE_EOC:
+               *val = POWER_SUPPLY_CHARGE_TYPE_NONE;
+               break;
+       case APCH_STATE_CSTATE_DISABLED:
+       default:
+               if (!(status & APCH_STATUS_INDAT))
+                       *val = POWER_SUPPLY_CHARGE_TYPE_NONE;
+               else
+                       *val = POWER_SUPPLY_CHARGE_TYPE_UNKNOWN;
+               break;
+       }
+
+       return 0;
+}
+
+static int act8945a_get_battery_health(struct regmap *regmap, int *val)
+{
+       int ret;
+       unsigned int status, state, config;
+
+       ret = regmap_read(regmap, ACT8945A_APCH_STATUS, &status);
+       if (ret < 0)
+               return ret;
+
+       ret = regmap_read(regmap, ACT8945A_APCH_CFG, &config);
+       if (ret < 0)
+               return ret;
+
+       ret = regmap_read(regmap, ACT8945A_APCH_STATE, &state);
+       if (ret < 0)
+               return ret;
+
+       state &= APCH_STATE_CSTATE;
+       state >>= APCH_STATE_CSTATE_SHIFT;
+
+       switch (state) {
+       case APCH_STATE_CSTATE_DISABLED:
+               if (config & APCH_CFG_SUSCHG) {
+                       *val = POWER_SUPPLY_HEALTH_UNKNOWN;
+               } else if (status & APCH_STATUS_INDAT) {
+                       if (!(status & APCH_STATUS_TEMPDAT))
+                               *val = POWER_SUPPLY_HEALTH_OVERHEAT;
+                       else if (status & APCH_STATUS_TIMRDAT)
+                               *val = POWER_SUPPLY_HEALTH_SAFETY_TIMER_EXPIRE;
+                       else
+                               *val = POWER_SUPPLY_HEALTH_OVERVOLTAGE;
+               } else {
+                       *val = POWER_SUPPLY_HEALTH_GOOD;
+               }
+               break;
+       case APCH_STATE_CSTATE_PRE:
+       case APCH_STATE_CSTATE_FAST:
+       case APCH_STATE_CSTATE_EOC:
+       default:
+               *val = POWER_SUPPLY_HEALTH_GOOD;
+               break;
+       }
+
+       return 0;
+}
+
+static int act8945a_get_capacity_level(struct act8945a_charger *charger,
+                                      struct regmap *regmap, int *val)
+{
+       int ret;
+       unsigned int status, state, config;
+       int lbo_level = gpiod_get_value(charger->lbo_gpio);
+
+       ret = regmap_read(regmap, ACT8945A_APCH_STATUS, &status);
+       if (ret < 0)
+               return ret;
+
+       ret = regmap_read(regmap, ACT8945A_APCH_CFG, &config);
+       if (ret < 0)
+               return ret;
+
+       ret = regmap_read(regmap, ACT8945A_APCH_STATE, &state);
+       if (ret < 0)
+               return ret;
+
+       state &= APCH_STATE_CSTATE;
+       state >>= APCH_STATE_CSTATE_SHIFT;
+
+       switch (state) {
+       case APCH_STATE_CSTATE_PRE:
+               *val = POWER_SUPPLY_CAPACITY_LEVEL_LOW;
+               break;
+       case APCH_STATE_CSTATE_FAST:
+               if (lbo_level)
+                       *val = POWER_SUPPLY_CAPACITY_LEVEL_HIGH;
+               else
+                       *val = POWER_SUPPLY_CAPACITY_LEVEL_LOW;
+               break;
+       case APCH_STATE_CSTATE_EOC:
+               if (status & APCH_STATUS_CHGDAT)
+                       *val = POWER_SUPPLY_CAPACITY_LEVEL_FULL;
+               else
+                       *val = POWER_SUPPLY_CAPACITY_LEVEL_NORMAL;
+               break;
+       case APCH_STATE_CSTATE_DISABLED:
+       default:
+               if (config & APCH_CFG_SUSCHG) {
+                       *val = POWER_SUPPLY_CAPACITY_LEVEL_UNKNOWN;
+               } else {
+                       *val = POWER_SUPPLY_CAPACITY_LEVEL_NORMAL;
+                       if (!(status & APCH_STATUS_INDAT)) {
+                               if (!lbo_level)
+                                       *val = POWER_SUPPLY_CAPACITY_LEVEL_CRITICAL;
+                       }
+               }
+               break;
+       }
+
+       return 0;
+}
+
+#define MAX_CURRENT_USB_HIGH   450000
+#define MAX_CURRENT_USB_LOW    90000
+#define MAX_CURRENT_USB_PRE    45000
+/*
+ * Riset(K) = 2336 * (1V/Ichg(mA)) - 0.205
+ * Riset = 2.43K
+ */
+#define MAX_CURRENT_AC_HIGH            886527
+#define MAX_CURRENT_AC_LOW             117305
+#define MAX_CURRENT_AC_HIGH_PRE                88653
+#define MAX_CURRENT_AC_LOW_PRE         11731
+
+static int act8945a_get_current_max(struct act8945a_charger *charger,
+                                   struct regmap *regmap, int *val)
+{
+       int ret;
+       unsigned int status, state;
+       unsigned int acin_state;
+       int chgin_level = gpiod_get_value(charger->chglev_gpio);
+
+       ret = regmap_read(regmap, ACT8945A_APCH_STATUS, &status);
+       if (ret < 0)
+               return ret;
+
+       ret = regmap_read(regmap, ACT8945A_APCH_STATE, &state);
+       if (ret < 0)
+               return ret;
+
+       acin_state = (state & APCH_STATE_ACINSTAT) >> 1;
+
+       state &= APCH_STATE_CSTATE;
+       state >>= APCH_STATE_CSTATE_SHIFT;
+
+       switch (state) {
+       case APCH_STATE_CSTATE_PRE:
+               if (acin_state) {
+                       if (chgin_level)
+                               *val = MAX_CURRENT_AC_HIGH_PRE;
+                       else
+                               *val = MAX_CURRENT_AC_LOW_PRE;
+               } else {
+                       *val = MAX_CURRENT_USB_PRE;
+               }
+               break;
+       case APCH_STATE_CSTATE_FAST:
+               if (acin_state) {
+                       if (chgin_level)
+                               *val = MAX_CURRENT_AC_HIGH;
+                       else
+                               *val = MAX_CURRENT_AC_LOW;
+               } else {
+                       if (chgin_level)
+                               *val = MAX_CURRENT_USB_HIGH;
+                       else
+                               *val = MAX_CURRENT_USB_LOW;
+               }
+               break;
+       case APCH_STATE_CSTATE_EOC:
+       case APCH_STATE_CSTATE_DISABLED:
+       default:
+               *val = 0;
+               break;
+       }
+
+       return 0;
+}
+
+static enum power_supply_property act8945a_charger_props[] = {
+       POWER_SUPPLY_PROP_STATUS,
+       POWER_SUPPLY_PROP_CHARGE_TYPE,
+       POWER_SUPPLY_PROP_TECHNOLOGY,
+       POWER_SUPPLY_PROP_HEALTH,
+       POWER_SUPPLY_PROP_CAPACITY_LEVEL,
+       POWER_SUPPLY_PROP_CURRENT_MAX,
+       POWER_SUPPLY_PROP_MODEL_NAME,
+       POWER_SUPPLY_PROP_MANUFACTURER
+};
+
+static int act8945a_charger_get_property(struct power_supply *psy,
+                                        enum power_supply_property prop,
+                                        union power_supply_propval *val)
+{
+       struct act8945a_charger *charger = power_supply_get_drvdata(psy);
+       struct regmap *regmap = charger->regmap;
+       int ret = 0;
+
+       switch (prop) {
+       case POWER_SUPPLY_PROP_STATUS:
+               ret = act8945a_get_charger_state(regmap, &val->intval);
+               break;
+       case POWER_SUPPLY_PROP_CHARGE_TYPE:
+               ret = act8945a_get_charge_type(regmap, &val->intval);
+               break;
+       case POWER_SUPPLY_PROP_TECHNOLOGY:
+               val->intval = POWER_SUPPLY_TECHNOLOGY_LION;
+               break;
+       case POWER_SUPPLY_PROP_HEALTH:
+               ret = act8945a_get_battery_health(regmap, &val->intval);
+               break;
+       case POWER_SUPPLY_PROP_CAPACITY_LEVEL:
+               ret = act8945a_get_capacity_level(charger,
+                                                 regmap, &val->intval);
+               break;
+       case POWER_SUPPLY_PROP_CURRENT_MAX:
+               ret = act8945a_get_current_max(charger,
+                                              regmap, &val->intval);
+               break;
+       case POWER_SUPPLY_PROP_MODEL_NAME:
+               val->strval = act8945a_charger_model;
+               break;
+       case POWER_SUPPLY_PROP_MANUFACTURER:
+               val->strval = act8945a_charger_manufacturer;
+               break;
+       default:
+               return -EINVAL;
+       }
+
+       return ret;
+}
+
+static int act8945a_enable_interrupt(struct act8945a_charger *charger)
+{
+       struct regmap *regmap = charger->regmap;
+       unsigned char ctrl;
+       int ret;
+
+       ctrl = APCH_CTRL_CHGEOCOUT | APCH_CTRL_CHGEOCIN |
+              APCH_CTRL_INDIS | APCH_CTRL_INCON |
+              APCH_CTRL_TEMPOUT | APCH_CTRL_TEMPIN |
+              APCH_CTRL_TIMRPRE | APCH_CTRL_TIMRTOT;
+       ret = regmap_write(regmap, ACT8945A_APCH_CTRL, ctrl);
+       if (ret)
+               return ret;
+
+       ctrl = APCH_STATUS_CHGSTAT | APCH_STATUS_INSTAT |
+              APCH_STATUS_TEMPSTAT | APCH_STATUS_TIMRSTAT;
+       ret = regmap_write(regmap, ACT8945A_APCH_STATUS, ctrl);
+       if (ret)
+               return ret;
+
+       return 0;
+}
+
+static unsigned int act8945a_set_supply_type(struct act8945a_charger *charger,
+                                            unsigned int *type)
+{
+       unsigned int status, state;
+       int ret;
+
+       ret = regmap_read(charger->regmap, ACT8945A_APCH_STATUS, &status);
+       if (ret < 0)
+               return ret;
+
+       ret = regmap_read(charger->regmap, ACT8945A_APCH_STATE, &state);
+       if (ret < 0)
+               return ret;
+
+       if (status & APCH_STATUS_INDAT) {
+               if (state & APCH_STATE_ACINSTAT)
+                       *type = POWER_SUPPLY_TYPE_MAINS;
+               else
+                       *type = POWER_SUPPLY_TYPE_USB;
+       } else {
+               *type = POWER_SUPPLY_TYPE_BATTERY;
+       }
+
+       return 0;
+}
+
+static void act8945a_work(struct work_struct *work)
+{
+       struct act8945a_charger *charger =
+                       container_of(work, struct act8945a_charger, work);
+
+       act8945a_set_supply_type(charger, &charger->desc.type);
+
+       power_supply_changed(charger->psy);
+}
+
+static irqreturn_t act8945a_status_changed(int irq, void *dev_id)
+{
+       struct act8945a_charger *charger = dev_id;
+
+       if (charger->init_done)
+               schedule_work(&charger->work);
+
+       return IRQ_HANDLED;
+}
+
+#define DEFAULT_TOTAL_TIME_OUT         3
+#define DEFAULT_PRE_TIME_OUT           40
+#define DEFAULT_INPUT_OVP_THRESHOLD    6600
+
+static int act8945a_charger_config(struct device *dev,
+                                  struct act8945a_charger *charger)
+{
+       struct device_node *np = dev->of_node;
+       struct regmap *regmap = charger->regmap;
+
+       u32 total_time_out;
+       u32 pre_time_out;
+       u32 input_voltage_threshold;
+       int err, ret;
+
+       unsigned int tmp;
+       unsigned int value = 0;
+
+       if (!np) {
+               dev_err(dev, "no charger of node\n");
+               return -EINVAL;
+       }
+
+       ret = regmap_read(regmap, ACT8945A_APCH_CFG, &tmp);
+       if (ret)
+               return ret;
+
+       if (tmp & APCH_CFG_SUSCHG) {
+               value |= APCH_CFG_SUSCHG;
+               dev_info(dev, "have been suspended\n");
+       }
+
+       charger->lbo_gpio = devm_gpiod_get_optional(dev, "active-semi,lbo",
+                                                   GPIOD_IN);
+       if (IS_ERR(charger->lbo_gpio)) {
+               err = PTR_ERR(charger->lbo_gpio);
+               dev_err(dev, "unable to claim gpio \"lbo\": %d\n", err);
+               return err;
+       }
+
+       ret = devm_request_irq(dev, gpiod_to_irq(charger->lbo_gpio),
+                              act8945a_status_changed,
+                              (IRQF_TRIGGER_FALLING | IRQF_TRIGGER_RISING),
+                              "act8945a_lbo_detect", charger);
+       if (ret)
+               dev_info(dev, "failed to request gpio \"lbo\" IRQ\n");
+
+       charger->chglev_gpio = devm_gpiod_get_optional(dev,
+                                                      "active-semi,chglev",
+                                                      GPIOD_IN);
+       if (IS_ERR(charger->chglev_gpio)) {
+               err = PTR_ERR(charger->chglev_gpio);
+               dev_err(dev, "unable to claim gpio \"chglev\": %d\n", err);
+               return err;
+       }
+
+       if (of_property_read_u32(np,
+                                "active-semi,input-voltage-threshold-microvolt",
+                                &input_voltage_threshold))
+               input_voltage_threshold = DEFAULT_INPUT_OVP_THRESHOLD;
+
+       if (of_property_read_u32(np,
+                                "active-semi,precondition-timeout",
+                                &pre_time_out))
+               pre_time_out = DEFAULT_PRE_TIME_OUT;
+
+       if (of_property_read_u32(np, "active-semi,total-timeout",
+                                &total_time_out))
+               total_time_out = DEFAULT_TOTAL_TIME_OUT;
+
+       switch (input_voltage_threshold) {
+       case 8000:
+               value |= APCH_CFG_OVPSET_8V;
+               break;
+       case 7500:
+               value |= APCH_CFG_OVPSET_7V5;
+               break;
+       case 7000:
+               value |= APCH_CFG_OVPSET_7V;
+               break;
+       case 6600:
+       default:
+               value |= APCH_CFG_OVPSET_6V6;
+               break;
+       }
+
+       switch (pre_time_out) {
+       case 60:
+               value |= APCH_CFG_PRETIMO_60_MIN;
+               break;
+       case 80:
+               value |= APCH_CFG_PRETIMO_80_MIN;
+               break;
+       case 0:
+               value |= APCH_CFG_PRETIMO_DISABLED;
+               break;
+       case 40:
+       default:
+               value |= APCH_CFG_PRETIMO_40_MIN;
+               break;
+       }
+
+       switch (total_time_out) {
+       case 4:
+               value |= APCH_CFG_TOTTIMO_4_HOUR;
+               break;
+       case 5:
+               value |= APCH_CFG_TOTTIMO_5_HOUR;
+               break;
+       case 0:
+               value |= APCH_CFG_TOTTIMO_DISABLED;
+               break;
+       case 3:
+       default:
+               value |= APCH_CFG_TOTTIMO_3_HOUR;
+               break;
+       }
+
+       return regmap_write(regmap, ACT8945A_APCH_CFG, value);
+}
+
+static int act8945a_charger_probe(struct platform_device *pdev)
+{
+       struct act8945a_charger *charger;
+       struct power_supply_config psy_cfg = {};
+       int irq, ret;
+
+       charger = devm_kzalloc(&pdev->dev, sizeof(*charger), GFP_KERNEL);
+       if (!charger)
+               return -ENOMEM;
+
+       charger->regmap = dev_get_regmap(pdev->dev.parent, NULL);
+       if (!charger->regmap) {
+               dev_err(&pdev->dev, "Parent did not provide regmap\n");
+               return -EINVAL;
+       }
+
+       ret = act8945a_charger_config(&pdev->dev, charger);
+       if (ret)
+               return ret;
+
+       irq = of_irq_get(pdev->dev.of_node, 0);
+       if (irq == -EPROBE_DEFER) {
+               dev_err(&pdev->dev, "failed to find IRQ number\n");
+               return -EPROBE_DEFER;
+       }
+
+       ret = devm_request_irq(&pdev->dev, irq, act8945a_status_changed,
+                              IRQF_TRIGGER_FALLING, "act8945a_interrupt",
+                              charger);
+       if (ret) {
+               dev_err(&pdev->dev, "failed to request nIRQ pin IRQ\n");
+               return ret;
+       }
+
+       charger->desc.name = "act8945a-charger";
+       charger->desc.get_property = act8945a_charger_get_property;
+       charger->desc.properties = act8945a_charger_props;
+       charger->desc.num_properties = ARRAY_SIZE(act8945a_charger_props);
+
+       ret = act8945a_set_supply_type(charger, &charger->desc.type);
+       if (ret)
+               return -EINVAL;
+
+       psy_cfg.of_node = pdev->dev.of_node;
+       psy_cfg.drv_data = charger;
+
+       charger->psy = devm_power_supply_register(&pdev->dev,
+                                                 &charger->desc,
+                                                 &psy_cfg);
+       if (IS_ERR(charger->psy)) {
+               dev_err(&pdev->dev, "failed to register power supply\n");
+               return PTR_ERR(charger->psy);
+       }
+
+       platform_set_drvdata(pdev, charger);
+
+       INIT_WORK(&charger->work, act8945a_work);
+
+       ret = act8945a_enable_interrupt(charger);
+       if (ret)
+               return -EIO;
+
+       charger->init_done = true;
+
+       return 0;
+}
+
+static int act8945a_charger_remove(struct platform_device *pdev)
+{
+       struct act8945a_charger *charger = platform_get_drvdata(pdev);
+
+       charger->init_done = false;
+       cancel_work_sync(&charger->work);
+
+       return 0;
+}
+
+static struct platform_driver act8945a_charger_driver = {
+       .driver = {
+               .name = "act8945a-charger",
+       },
+       .probe  = act8945a_charger_probe,
+       .remove = act8945a_charger_remove,
+};
+module_platform_driver(act8945a_charger_driver);
+
+MODULE_DESCRIPTION("Active-semi ACT8945A ActivePath charger driver");
+MODULE_AUTHOR("Wenyou Yang <wenyou.yang@atmel.com>");
+MODULE_LICENSE("GPL");
similarity index 99%
rename from drivers/power/axp288_charger.c
rename to drivers/power/supply/axp288_charger.c
index 4030eeb7cf65a885c3d5a7be1f68ae984cbd6c04..75b8e0c7402b15bbe7b3aadadcc1b47aff538dff 100644 (file)
@@ -23,7 +23,6 @@
 #include <linux/usb/otg.h>
 #include <linux/notifier.h>
 #include <linux/power_supply.h>
-#include <linux/notifier.h>
 #include <linux/property.h>
 #include <linux/mfd/axp20x.h>
 #include <linux/extcon.h>
similarity index 99%
rename from drivers/power/axp288_fuel_gauge.c
rename to drivers/power/supply/axp288_fuel_gauge.c
index 50c0110d6b58008df681c5bfcac66e89dcac5e46..5bdde692f72488c3793e1bf0574d8659f0df4a58 100644 (file)
@@ -22,7 +22,6 @@
 #include <linux/regmap.h>
 #include <linux/jiffies.h>
 #include <linux/interrupt.h>
-#include <linux/device.h>
 #include <linux/workqueue.h>
 #include <linux/mfd/axp20x.h>
 #include <linux/platform_device.h>
similarity index 100%
rename from drivers/power/bq24257_charger.c
rename to drivers/power/supply/bq24257_charger.c
index 1fea2c7ef97feda56cfc71f9b1ab82e7d3d35351..6fc31bdc639bc54ac0fbd9008740d19912391330 100644 (file)
@@ -1068,6 +1068,12 @@ static int bq24257_probe(struct i2c_client *client,
                return ret;
        }
 
+       ret = bq24257_power_supply_init(bq);
+       if (ret < 0) {
+               dev_err(dev, "Failed to register power supply\n");
+               return ret;
+       }
+
        ret = devm_request_threaded_irq(dev, client->irq, NULL,
                                        bq24257_irq_handler_thread,
                                        IRQF_TRIGGER_FALLING |
@@ -1078,12 +1084,6 @@ static int bq24257_probe(struct i2c_client *client,
                return ret;
        }
 
-       ret = bq24257_power_supply_init(bq);
-       if (ret < 0) {
-               dev_err(dev, "Failed to register power supply\n");
-               return ret;
-       }
-
        ret = sysfs_create_group(&bq->charger->dev.kobj, &bq24257_attr_group);
        if (ret < 0) {
                dev_err(dev, "Can't create sysfs entries\n");
similarity index 92%
rename from drivers/power/bq24735-charger.c
rename to drivers/power/supply/bq24735-charger.c
index fa454c19ce1747ff27f090766b4acf40c0481a3a..eb7783b42e0acdd2cf8eb4e1b75bbfdbc3df9605 100644 (file)
@@ -25,7 +25,7 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/of.h>
-#include <linux/of_gpio.h>
+#include <linux/gpio/consumer.h>
 #include <linux/power_supply.h>
 #include <linux/slab.h>
 
@@ -49,6 +49,7 @@ struct bq24735 {
        struct i2c_client               *client;
        struct bq24735_platform         *pdata;
        struct mutex                    lock;
+       struct gpio_desc                *status_gpio;
        bool                            charging;
 };
 
@@ -177,12 +178,8 @@ static int bq24735_config_charger(struct bq24735 *charger)
 
 static bool bq24735_charger_is_present(struct bq24735 *charger)
 {
-       struct bq24735_platform *pdata = charger->pdata;
-       int ret;
-
-       if (pdata->status_gpio_valid) {
-               ret = gpio_get_value_cansleep(pdata->status_gpio);
-               return ret ^= pdata->status_gpio_active_low == 0;
+       if (charger->status_gpio) {
+               return !gpiod_get_value_cansleep(charger->status_gpio);
        } else {
                int ac = 0;
 
@@ -201,8 +198,12 @@ static bool bq24735_charger_is_present(struct bq24735 *charger)
 
 static int bq24735_charger_is_charging(struct bq24735 *charger)
 {
-       int ret = bq24735_read_word(charger->client, BQ24735_CHG_OPT);
+       int ret;
 
+       if (!bq24735_charger_is_present(charger))
+               return 0;
+
+       ret  = bq24735_read_word(charger->client, BQ24735_CHG_OPT);
        if (ret < 0)
                return ret;
 
@@ -304,7 +305,6 @@ static struct bq24735_platform *bq24735_parse_dt_data(struct i2c_client *client)
        struct device_node *np = client->dev.of_node;
        u32 val;
        int ret;
-       enum of_gpio_flags flags;
 
        pdata = devm_kzalloc(&client->dev, sizeof(*pdata), GFP_KERNEL);
        if (!pdata) {
@@ -313,12 +313,6 @@ static struct bq24735_platform *bq24735_parse_dt_data(struct i2c_client *client)
                return NULL;
        }
 
-       pdata->status_gpio = of_get_named_gpio_flags(np, "ti,ac-detect-gpios",
-                                                    0, &flags);
-
-       if (flags & OF_GPIO_ACTIVE_LOW)
-               pdata->status_gpio_active_low = 1;
-
        ret = of_property_read_u32(np, "ti,charge-current", &val);
        if (!ret)
                pdata->charge_current = val;
@@ -392,21 +386,16 @@ static int bq24735_charger_probe(struct i2c_client *client,
 
        i2c_set_clientdata(client, charger);
 
-       if (gpio_is_valid(charger->pdata->status_gpio)) {
-               ret = devm_gpio_request(&client->dev,
-                                       charger->pdata->status_gpio,
-                                       name);
-               if (ret) {
-                       dev_err(&client->dev,
-                               "Failed GPIO request for GPIO %d: %d\n",
-                               charger->pdata->status_gpio, ret);
-               }
-
-               charger->pdata->status_gpio_valid = !ret;
+       charger->status_gpio = devm_gpiod_get_optional(&client->dev,
+                                                      "ti,ac-detect",
+                                                      GPIOD_IN);
+       if (IS_ERR(charger->status_gpio)) {
+               ret = PTR_ERR(charger->status_gpio);
+               dev_err(&client->dev, "Getting gpio failed: %d\n", ret);
+               return ret;
        }
 
-       if (!charger->pdata->status_gpio_valid
-           || bq24735_charger_is_present(charger)) {
+       if (!charger->status_gpio || bq24735_charger_is_present(charger)) {
                ret = bq24735_read_word(client, BQ24735_MANUFACTURER_ID);
                if (ret < 0) {
                        dev_err(&client->dev, "Failed to read manufacturer id : %d\n",
similarity index 96%
rename from drivers/power/bq27xxx_battery.c
rename to drivers/power/supply/bq27xxx_battery.c
index 323d05a12f9b80fc855286d74a9b0e72021d1a03..3b0dbc689d7299bde340b044311ab8ad859bd726 100644 (file)
@@ -39,6 +39,7 @@
 
 #include <linux/device.h>
 #include <linux/module.h>
+#include <linux/mutex.h>
 #include <linux/param.h>
 #include <linux/jiffies.h>
 #include <linux/workqueue.h>
@@ -390,8 +391,35 @@ static struct {
        BQ27XXX_PROP(BQ27421, bq27421_battery_props),
 };
 
+static DEFINE_MUTEX(bq27xxx_list_lock);
+static LIST_HEAD(bq27xxx_battery_devices);
+
+static int poll_interval_param_set(const char *val, const struct kernel_param *kp)
+{
+       struct bq27xxx_device_info *di;
+       int ret;
+
+       ret = param_set_uint(val, kp);
+       if (ret < 0)
+               return ret;
+
+       mutex_lock(&bq27xxx_list_lock);
+       list_for_each_entry(di, &bq27xxx_battery_devices, list) {
+               cancel_delayed_work_sync(&di->work);
+               schedule_delayed_work(&di->work, 0);
+       }
+       mutex_unlock(&bq27xxx_list_lock);
+
+       return ret;
+}
+
+static const struct kernel_param_ops param_ops_poll_interval = {
+       .get = param_get_uint,
+       .set = poll_interval_param_set,
+};
+
 static unsigned int poll_interval = 360;
-module_param(poll_interval, uint, 0644);
+module_param_cb(poll_interval, &param_ops_poll_interval, &poll_interval, 0644);
 MODULE_PARM_DESC(poll_interval,
                 "battery poll interval in seconds - 0 disables polling");
 
@@ -644,8 +672,9 @@ static bool bq27xxx_battery_dead(struct bq27xxx_device_info *di, u16 flags)
 static int bq27xxx_battery_read_health(struct bq27xxx_device_info *di)
 {
        int flags;
+       bool has_singe_flag = di->chip == BQ27000 || di->chip == BQ27010;
 
-       flags = bq27xxx_read(di, BQ27XXX_REG_FLAGS, false);
+       flags = bq27xxx_read(di, BQ27XXX_REG_FLAGS, has_singe_flag);
        if (flags < 0) {
                dev_err(di->dev, "error reading flag register:%d\n", flags);
                return flags;
@@ -745,7 +774,7 @@ static int bq27xxx_battery_current(struct bq27xxx_device_info *di,
        }
 
        if (di->chip == BQ27000 || di->chip == BQ27010) {
-               flags = bq27xxx_read(di, BQ27XXX_REG_FLAGS, false);
+               flags = bq27xxx_read(di, BQ27XXX_REG_FLAGS, true);
                if (flags & BQ27000_FLAG_CHGS) {
                        dev_dbg(di->dev, "negative current!\n");
                        curr = -curr;
@@ -971,6 +1000,10 @@ int bq27xxx_battery_setup(struct bq27xxx_device_info *di)
 
        bq27xxx_battery_update(di);
 
+       mutex_lock(&bq27xxx_list_lock);
+       list_add(&di->list, &bq27xxx_battery_devices);
+       mutex_unlock(&bq27xxx_list_lock);
+
        return 0;
 }
 EXPORT_SYMBOL_GPL(bq27xxx_battery_setup);
@@ -989,6 +1022,10 @@ void bq27xxx_battery_teardown(struct bq27xxx_device_info *di)
 
        power_supply_unregister(di->bat);
 
+       mutex_lock(&bq27xxx_list_lock);
+       list_del(&di->list);
+       mutex_unlock(&bq27xxx_list_lock);
+
        mutex_destroy(&di->lock);
 }
 EXPORT_SYMBOL_GPL(bq27xxx_battery_teardown);
similarity index 99%
rename from drivers/power/ds2760_battery.c
rename to drivers/power/supply/ds2760_battery.c
index 80f73ccb77ab707b56614e44c66d84d60c143b0e..17225689e3f65c6e3c03746b1e868ae287c0067f 100644 (file)
@@ -28,8 +28,8 @@
 #include <linux/platform_device.h>
 #include <linux/power_supply.h>
 
-#include "../w1/w1.h"
-#include "../w1/slaves/w1_ds2760.h"
+#include "../../w1/w1.h"
+#include "../../w1/slaves/w1_ds2760.h"
 
 struct ds2760_device_info {
        struct device *dev;
@@ -566,7 +566,8 @@ static int ds2760_battery_probe(struct platform_device *pdev)
        INIT_DELAYED_WORK(&di->monitor_work, ds2760_battery_work);
        INIT_DELAYED_WORK(&di->set_charged_work,
                          ds2760_battery_set_charged_work);
-       di->monitor_wqueue = create_singlethread_workqueue(dev_name(&pdev->dev));
+       di->monitor_wqueue = alloc_ordered_workqueue(dev_name(&pdev->dev),
+                                                    WQ_MEM_RECLAIM);
        if (!di->monitor_wqueue) {
                retval = -ESRCH;
                goto workqueue_failed;
similarity index 99%
rename from drivers/power/ds2780_battery.c
rename to drivers/power/supply/ds2780_battery.c
index d3743d0ad55bdcb5af7db6cc41b728b994f1840e..1b3b6fa89c28d3cf528b880c7699aa3d2d74417b 100644 (file)
@@ -21,8 +21,8 @@
 #include <linux/power_supply.h>
 #include <linux/idr.h>
 
-#include "../w1/w1.h"
-#include "../w1/slaves/w1_ds2780.h"
+#include "../../w1/w1.h"
+#include "../../w1/slaves/w1_ds2780.h"
 
 /* Current unit measurement in uA for a 1 milli-ohm sense resistor */
 #define DS2780_CURRENT_UNITS   1563
similarity index 99%
rename from drivers/power/ds2781_battery.c
rename to drivers/power/supply/ds2781_battery.c
index c3680024f3992af41f7a4ff8a5598b628df67c43..cc0149131f89b12e6232faa33ecd8f386653a980 100644 (file)
@@ -19,8 +19,8 @@
 #include <linux/power_supply.h>
 #include <linux/idr.h>
 
-#include "../w1/w1.h"
-#include "../w1/slaves/w1_ds2781.h"
+#include "../../w1/w1.h"
+#include "../../w1/slaves/w1_ds2781.h"
 
 /* Current unit measurement in uA for a 1 milli-ohm sense resistor */
 #define DS2781_CURRENT_UNITS   1563
similarity index 99%
rename from drivers/power/intel_mid_battery.c
rename to drivers/power/supply/intel_mid_battery.c
index 9fa4acc107caf1a7bc37d47f4630e44e2c98d839..dc7feef1bea459c922aeadd2ab002b0603dcf90a 100644 (file)
@@ -689,8 +689,7 @@ static int probe(int irq, struct device *dev)
        /* initialize all required framework before enabling interrupts */
        INIT_WORK(&pbi->handler, pmic_battery_handle_intrpt);
        INIT_DELAYED_WORK(&pbi->monitor_battery, pmic_battery_monitor);
-       pbi->monitor_wqueue =
-                       create_singlethread_workqueue(dev_name(dev));
+       pbi->monitor_wqueue = alloc_workqueue(dev_name(dev), WQ_MEM_RECLAIM, 0);
        if (!pbi->monitor_wqueue) {
                dev_err(dev, "%s(): wqueue init failed\n", __func__);
                retval = -ESRCH;
similarity index 99%
rename from drivers/power/ipaq_micro_battery.c
rename to drivers/power/supply/ipaq_micro_battery.c
index 35b01c7d775b45c00f5ed98549c216f744f155a0..4af7b770f293957e12234fbde112c33ccb72cdbb 100644 (file)
@@ -235,7 +235,7 @@ static int micro_batt_probe(struct platform_device *pdev)
                return -ENOMEM;
 
        mb->micro = dev_get_drvdata(pdev->dev.parent);
-       mb->wq = create_singlethread_workqueue("ipaq-battery-wq");
+       mb->wq = alloc_workqueue("ipaq-battery-wq", WQ_MEM_RECLAIM, 0);
        if (!mb->wq)
                return -ENOMEM;
 
similarity index 99%
rename from drivers/power/max14577_charger.c
rename to drivers/power/supply/max14577_charger.c
index a36bcaf62dd44fad1044f390db7e908b7f95acfd..449fc56f09ebd87b49aee68e7791b4475e750414 100644 (file)
@@ -2,7 +2,7 @@
  * max14577_charger.c - Battery charger driver for the Maxim 14577/77836
  *
  * Copyright (C) 2013,2014 Samsung Electronics
- * Krzysztof Kozlowski <k.kozlowski@samsung.com>
+ * Krzysztof Kozlowski <krzk@kernel.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -643,6 +643,6 @@ static struct platform_driver max14577_charger_driver = {
 };
 module_platform_driver(max14577_charger_driver);
 
-MODULE_AUTHOR("Krzysztof Kozlowski <k.kozlowski@samsung.com>");
+MODULE_AUTHOR("Krzysztof Kozlowski <krzk@kernel.org>");
 MODULE_DESCRIPTION("Maxim 14577/77836 charger driver");
 MODULE_LICENSE("GPL");
similarity index 99%
rename from drivers/power/max77693_charger.c
rename to drivers/power/supply/max77693_charger.c
index 060cab5ae3aa2de0f91e2d6b376e2daa7b2b1863..6c78884bad5e3789501233b8f4991ffac0ab863b 100644 (file)
@@ -2,7 +2,7 @@
  * max77693_charger.c - Battery charger driver for the Maxim 77693
  *
  * Copyright (C) 2014 Samsung Electronics
- * Krzysztof Kozlowski <k.kozlowski@samsung.com>
+ * Krzysztof Kozlowski <krzk@kernel.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -766,6 +766,6 @@ static struct platform_driver max77693_charger_driver = {
 };
 module_platform_driver(max77693_charger_driver);
 
-MODULE_AUTHOR("Krzysztof Kozlowski <k.kozlowski@samsung.com>");
+MODULE_AUTHOR("Krzysztof Kozlowski <krzk@kernel.org>");
 MODULE_DESCRIPTION("Maxim 77693 charger driver");
 MODULE_LICENSE("GPL");
similarity index 99%
rename from drivers/power/pm2301_charger.c
rename to drivers/power/supply/pm2301_charger.c
index fb62ed3fc38c446041ded70e7da2c014e3f60cae..78561b6884fc7a443b6b8e563252de6f4038f536 100644 (file)
@@ -1054,7 +1054,8 @@ static int pm2xxx_wall_charger_probe(struct i2c_client *i2c_client,
        pm2->ac_chg.external = true;
 
        /* Create a work queue for the charger */
-       pm2->charger_wq = create_singlethread_workqueue("pm2xxx_charger_wq");
+       pm2->charger_wq = alloc_ordered_workqueue("pm2xxx_charger_wq",
+                                                 WQ_MEM_RECLAIM);
        if (pm2->charger_wq == NULL) {
                ret = -ENOMEM;
                dev_err(pm2->dev, "failed to create work queue\n");
similarity index 83%
rename from drivers/power/sbs-battery.c
rename to drivers/power/supply/sbs-battery.c
index 768b9fcb58eacdc533e8094f8f68327bfae518e2..8bb2eb38eb1c872e7a50f7aa765c9c4c712c79f1 100644 (file)
@@ -26,7 +26,7 @@
 #include <linux/i2c.h>
 #include <linux/slab.h>
 #include <linux/interrupt.h>
-#include <linux/gpio.h>
+#include <linux/gpio/consumer.h>
 #include <linux/of.h>
 #include <linux/stat.h>
 
@@ -41,6 +41,7 @@ enum {
        REG_TIME_TO_EMPTY,
        REG_TIME_TO_FULL,
        REG_STATUS,
+       REG_CAPACITY_LEVEL,
        REG_CYCLE_COUNT,
        REG_SERIAL_NUMBER,
        REG_REMAINING_CAPACITY,
@@ -68,6 +69,7 @@ enum sbs_battery_mode {
 #define MANUFACTURER_ACCESS_SLEEP      0x0011
 
 /* battery status value bits */
+#define BATTERY_INITIALIZED            0x80
 #define BATTERY_DISCHARGING            0x40
 #define BATTERY_FULL_CHARGED           0x20
 #define BATTERY_FULL_DISCHARGED                0x10
@@ -110,6 +112,8 @@ static const struct chip_data {
                SBS_DATA(POWER_SUPPLY_PROP_TIME_TO_FULL_AVG, 0x13, 0, 65535),
        [REG_STATUS] =
                SBS_DATA(POWER_SUPPLY_PROP_STATUS, 0x16, 0, 65535),
+       [REG_CAPACITY_LEVEL] =
+               SBS_DATA(POWER_SUPPLY_PROP_CAPACITY_LEVEL, 0x16, 0, 65535),
        [REG_CYCLE_COUNT] =
                SBS_DATA(POWER_SUPPLY_PROP_CYCLE_COUNT, 0x17, 0, 65535),
        [REG_DESIGN_CAPACITY] =
@@ -131,6 +135,7 @@ static const struct chip_data {
 
 static enum power_supply_property sbs_properties[] = {
        POWER_SUPPLY_PROP_STATUS,
+       POWER_SUPPLY_PROP_CAPACITY_LEVEL,
        POWER_SUPPLY_PROP_HEALTH,
        POWER_SUPPLY_PROP_PRESENT,
        POWER_SUPPLY_PROP_TECHNOLOGY,
@@ -158,13 +163,13 @@ static enum power_supply_property sbs_properties[] = {
 struct sbs_info {
        struct i2c_client               *client;
        struct power_supply             *power_supply;
-       struct sbs_platform_data        *pdata;
        bool                            is_present;
-       bool                            gpio_detect;
+       struct gpio_desc                *gpio_detect;
        bool                            enable_detection;
-       int                             irq;
        int                             last_state;
        int                             poll_time;
+       u32                             i2c_retry_count;
+       u32                             poll_retry_count;
        struct delayed_work             work;
        int                             ignore_changes;
 };
@@ -179,8 +184,7 @@ static int sbs_read_word_data(struct i2c_client *client, u8 address)
        s32 ret = 0;
        int retries = 1;
 
-       if (chip->pdata)
-               retries = max(chip->pdata->i2c_retry_count + 1, 1);
+       retries = chip->i2c_retry_count;
 
        while (retries > 0) {
                ret = i2c_smbus_read_word_data(client, address);
@@ -207,10 +211,8 @@ static int sbs_read_string_data(struct i2c_client *client, u8 address,
        int retries_length = 1, retries_block = 1;
        u8 block_buffer[I2C_SMBUS_BLOCK_MAX + 1];
 
-       if (chip->pdata) {
-               retries_length = max(chip->pdata->i2c_retry_count + 1, 1);
-               retries_block = max(chip->pdata->i2c_retry_count + 1, 1);
-       }
+       retries_length = chip->i2c_retry_count;
+       retries_block = chip->i2c_retry_count;
 
        /* Adapter needs to support these two functions */
        if (!i2c_check_functionality(client->adapter,
@@ -274,8 +276,7 @@ static int sbs_write_word_data(struct i2c_client *client, u8 address,
        s32 ret = 0;
        int retries = 1;
 
-       if (chip->pdata)
-               retries = max(chip->pdata->i2c_retry_count + 1, 1);
+       retries = chip->i2c_retry_count;
 
        while (retries > 0) {
                ret = i2c_smbus_write_word_data(client, address,
@@ -302,32 +303,31 @@ static int sbs_get_battery_presence_and_health(
        s32 ret;
        struct sbs_info *chip = i2c_get_clientdata(client);
 
-       if (psp == POWER_SUPPLY_PROP_PRESENT &&
-               chip->gpio_detect) {
-               ret = gpio_get_value(chip->pdata->battery_detect);
-               if (ret == chip->pdata->battery_detect_present)
-                       val->intval = 1;
-               else
-                       val->intval = 0;
+       if (psp == POWER_SUPPLY_PROP_PRESENT && chip->gpio_detect) {
+               ret = gpiod_get_value_cansleep(chip->gpio_detect);
+               if (ret < 0)
+                       return ret;
+               val->intval = ret;
                chip->is_present = val->intval;
                return ret;
        }
 
-       /* Write to ManufacturerAccess with
-        * ManufacturerAccess command and then
-        * read the status */
-       ret = sbs_write_word_data(client, sbs_data[REG_MANUFACTURER_DATA].addr,
-                                       MANUFACTURER_ACCESS_STATUS);
+       /*
+        * Write to ManufacturerAccess with ManufacturerAccess command
+        * and then read the status. Do not check for error on the write
+        * since not all batteries implement write access to this command,
+        * while others mandate it.
+        */
+       sbs_write_word_data(client, sbs_data[REG_MANUFACTURER_DATA].addr,
+                           MANUFACTURER_ACCESS_STATUS);
+
+       ret = sbs_read_word_data(client, sbs_data[REG_MANUFACTURER_DATA].addr);
        if (ret < 0) {
                if (psp == POWER_SUPPLY_PROP_PRESENT)
                        val->intval = 0; /* battery removed */
                return ret;
        }
 
-       ret = sbs_read_word_data(client, sbs_data[REG_MANUFACTURER_DATA].addr);
-       if (ret < 0)
-               return ret;
-
        if (ret < sbs_data[REG_MANUFACTURER_DATA].min_value ||
            ret > sbs_data[REG_MANUFACTURER_DATA].max_value) {
                val->intval = 0;
@@ -377,8 +377,23 @@ static int sbs_get_battery_property(struct i2c_client *client,
        if (ret >= sbs_data[reg_offset].min_value &&
            ret <= sbs_data[reg_offset].max_value) {
                val->intval = ret;
-               if (psp != POWER_SUPPLY_PROP_STATUS)
+               if (psp == POWER_SUPPLY_PROP_CAPACITY_LEVEL) {
+                       if (!(ret & BATTERY_INITIALIZED))
+                               val->intval =
+                                       POWER_SUPPLY_CAPACITY_LEVEL_UNKNOWN;
+                       else if (ret & BATTERY_FULL_CHARGED)
+                               val->intval =
+                                       POWER_SUPPLY_CAPACITY_LEVEL_FULL;
+                       else if (ret & BATTERY_FULL_DISCHARGED)
+                               val->intval =
+                                       POWER_SUPPLY_CAPACITY_LEVEL_CRITICAL;
+                       else
+                               val->intval =
+                                       POWER_SUPPLY_CAPACITY_LEVEL_NORMAL;
+                       return 0;
+               } else if (psp != POWER_SUPPLY_PROP_STATUS) {
                        return 0;
+               }
 
                if (ret & BATTERY_FULL_CHARGED)
                        val->intval = POWER_SUPPLY_STATUS_FULL;
@@ -590,6 +605,7 @@ static int sbs_get_property(struct power_supply *psy,
                break;
 
        case POWER_SUPPLY_PROP_STATUS:
+       case POWER_SUPPLY_PROP_CAPACITY_LEVEL:
        case POWER_SUPPLY_PROP_CYCLE_COUNT:
        case POWER_SUPPLY_PROP_VOLTAGE_NOW:
        case POWER_SUPPLY_PROP_CURRENT_NOW:
@@ -661,8 +677,14 @@ done:
 
 static irqreturn_t sbs_irq(int irq, void *devid)
 {
-       struct power_supply *battery = devid;
+       struct sbs_info *chip = devid;
+       struct power_supply *battery = chip->power_supply;
+       int ret;
 
+       ret = gpiod_get_value_cansleep(chip->gpio_detect);
+       if (ret < 0)
+               return ret;
+       chip->is_present = ret;
        power_supply_changed(battery);
 
        return IRQ_HANDLED;
@@ -681,7 +703,7 @@ static void sbs_external_power_changed(struct power_supply *psy)
        cancel_delayed_work_sync(&chip->work);
 
        schedule_delayed_work(&chip->work, HZ);
-       chip->poll_time = chip->pdata->poll_retry_count;
+       chip->poll_time = chip->poll_retry_count;
 }
 
 static void sbs_delayed_work(struct work_struct *work)
@@ -717,80 +739,6 @@ static void sbs_delayed_work(struct work_struct *work)
        }
 }
 
-#if defined(CONFIG_OF)
-
-#include <linux/of_device.h>
-#include <linux/of_gpio.h>
-
-static const struct of_device_id sbs_dt_ids[] = {
-       { .compatible = "sbs,sbs-battery" },
-       { .compatible = "ti,bq20z75" },
-       { }
-};
-MODULE_DEVICE_TABLE(of, sbs_dt_ids);
-
-static struct sbs_platform_data *sbs_of_populate_pdata(
-               struct i2c_client *client)
-{
-       struct device_node *of_node = client->dev.of_node;
-       struct sbs_platform_data *pdata = client->dev.platform_data;
-       enum of_gpio_flags gpio_flags;
-       int rc;
-       u32 prop;
-
-       /* verify this driver matches this device */
-       if (!of_node)
-               return NULL;
-
-       /* if platform data is set, honor it */
-       if (pdata)
-               return pdata;
-
-       /* first make sure at least one property is set, otherwise
-        * it won't change behavior from running without pdata.
-        */
-       if (!of_get_property(of_node, "sbs,i2c-retry-count", NULL) &&
-               !of_get_property(of_node, "sbs,poll-retry-count", NULL) &&
-               !of_get_property(of_node, "sbs,battery-detect-gpios", NULL))
-               goto of_out;
-
-       pdata = devm_kzalloc(&client->dev, sizeof(struct sbs_platform_data),
-                               GFP_KERNEL);
-       if (!pdata)
-               goto of_out;
-
-       rc = of_property_read_u32(of_node, "sbs,i2c-retry-count", &prop);
-       if (!rc)
-               pdata->i2c_retry_count = prop;
-
-       rc = of_property_read_u32(of_node, "sbs,poll-retry-count", &prop);
-       if (!rc)
-               pdata->poll_retry_count = prop;
-
-       if (!of_get_property(of_node, "sbs,battery-detect-gpios", NULL)) {
-               pdata->battery_detect = -1;
-               goto of_out;
-       }
-
-       pdata->battery_detect = of_get_named_gpio_flags(of_node,
-                       "sbs,battery-detect-gpios", 0, &gpio_flags);
-
-       if (gpio_flags & OF_GPIO_ACTIVE_LOW)
-               pdata->battery_detect_present = 0;
-       else
-               pdata->battery_detect_present = 1;
-
-of_out:
-       return pdata;
-}
-#else
-static struct sbs_platform_data *sbs_of_populate_pdata(
-       struct i2c_client *client)
-{
-       return client->dev.platform_data;
-}
-#endif
-
 static const struct power_supply_desc sbs_default_desc = {
        .type = POWER_SUPPLY_TYPE_BATTERY,
        .properties = sbs_properties,
@@ -819,13 +767,12 @@ static int sbs_probe(struct i2c_client *client,
        if (!sbs_desc->name)
                return -ENOMEM;
 
-       chip = kzalloc(sizeof(struct sbs_info), GFP_KERNEL);
+       chip = devm_kzalloc(&client->dev, sizeof(struct sbs_info), GFP_KERNEL);
        if (!chip)
                return -ENOMEM;
 
        chip->client = client;
        chip->enable_detection = false;
-       chip->gpio_detect = false;
        psy_cfg.of_node = client->dev.of_node;
        psy_cfg.drv_data = chip;
        /* ignore first notification of external change, it is generated
@@ -834,11 +781,31 @@ static int sbs_probe(struct i2c_client *client,
        chip->ignore_changes = 1;
        chip->last_state = POWER_SUPPLY_STATUS_UNKNOWN;
 
-       pdata = sbs_of_populate_pdata(client);
+       /* use pdata if available, fall back to DT properties,
+        * or hardcoded defaults if not
+        */
+       rc = of_property_read_u32(client->dev.of_node, "sbs,i2c-retry-count",
+                                 &chip->i2c_retry_count);
+       if (rc)
+               chip->i2c_retry_count = 0;
+
+       rc = of_property_read_u32(client->dev.of_node, "sbs,poll-retry-count",
+                                 &chip->poll_retry_count);
+       if (rc)
+               chip->poll_retry_count = 0;
 
        if (pdata) {
-               chip->gpio_detect = gpio_is_valid(pdata->battery_detect);
-               chip->pdata = pdata;
+               chip->poll_retry_count = pdata->poll_retry_count;
+               chip->i2c_retry_count  = pdata->i2c_retry_count;
+       }
+       chip->i2c_retry_count = chip->i2c_retry_count + 1;
+
+       chip->gpio_detect = devm_gpiod_get_optional(&client->dev,
+                       "sbs,battery-detect", GPIOD_IN);
+       if (IS_ERR(chip->gpio_detect)) {
+               dev_err(&client->dev, "Failed to get gpio: %ld\n",
+                       PTR_ERR(chip->gpio_detect));
+               return PTR_ERR(chip->gpio_detect);
        }
 
        i2c_set_clientdata(client, chip);
@@ -846,47 +813,26 @@ static int sbs_probe(struct i2c_client *client,
        if (!chip->gpio_detect)
                goto skip_gpio;
 
-       rc = gpio_request(pdata->battery_detect, dev_name(&client->dev));
-       if (rc) {
-               dev_warn(&client->dev, "Failed to request gpio: %d\n", rc);
-               chip->gpio_detect = false;
-               goto skip_gpio;
-       }
-
-       rc = gpio_direction_input(pdata->battery_detect);
-       if (rc) {
-               dev_warn(&client->dev, "Failed to get gpio as input: %d\n", rc);
-               gpio_free(pdata->battery_detect);
-               chip->gpio_detect = false;
-               goto skip_gpio;
-       }
-
-       irq = gpio_to_irq(pdata->battery_detect);
+       irq = gpiod_to_irq(chip->gpio_detect);
        if (irq <= 0) {
                dev_warn(&client->dev, "Failed to get gpio as irq: %d\n", irq);
-               gpio_free(pdata->battery_detect);
-               chip->gpio_detect = false;
                goto skip_gpio;
        }
 
-       rc = request_irq(irq, sbs_irq,
+       rc = devm_request_threaded_irq(&client->dev, irq, NULL, sbs_irq,
                IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
-               dev_name(&client->dev), chip->power_supply);
+               dev_name(&client->dev), chip);
        if (rc) {
                dev_warn(&client->dev, "Failed to request irq: %d\n", rc);
-               gpio_free(pdata->battery_detect);
-               chip->gpio_detect = false;
                goto skip_gpio;
        }
 
-       chip->irq = irq;
-
 skip_gpio:
        /*
         * Before we register, we might need to make sure we can actually talk
         * to the battery.
         */
-       if (!force_load) {
+       if (!(force_load || chip->gpio_detect)) {
                rc = sbs_read_word_data(client, sbs_data[REG_STATUS].addr);
 
                if (rc < 0) {
@@ -896,7 +842,7 @@ skip_gpio:
                }
        }
 
-       chip->power_supply = power_supply_register(&client->dev, sbs_desc,
+       chip->power_supply = devm_power_supply_register(&client->dev, sbs_desc,
                                                   &psy_cfg);
        if (IS_ERR(chip->power_supply)) {
                dev_err(&client->dev,
@@ -915,13 +861,6 @@ skip_gpio:
        return 0;
 
 exit_psupply:
-       if (chip->irq)
-               free_irq(chip->irq, chip->power_supply);
-       if (chip->gpio_detect)
-               gpio_free(pdata->battery_detect);
-
-       kfree(chip);
-
        return rc;
 }
 
@@ -929,18 +868,8 @@ static int sbs_remove(struct i2c_client *client)
 {
        struct sbs_info *chip = i2c_get_clientdata(client);
 
-       if (chip->irq)
-               free_irq(chip->irq, chip->power_supply);
-       if (chip->gpio_detect)
-               gpio_free(chip->pdata->battery_detect);
-
-       power_supply_unregister(chip->power_supply);
-
        cancel_delayed_work_sync(&chip->work);
 
-       kfree(chip);
-       chip = NULL;
-
        return 0;
 }
 
@@ -950,16 +879,16 @@ static int sbs_suspend(struct device *dev)
 {
        struct i2c_client *client = to_i2c_client(dev);
        struct sbs_info *chip = i2c_get_clientdata(client);
-       s32 ret;
 
        if (chip->poll_time > 0)
                cancel_delayed_work_sync(&chip->work);
 
-       /* write to manufacturer access with sleep command */
-       ret = sbs_write_word_data(client, sbs_data[REG_MANUFACTURER_DATA].addr,
+       /*
+        * Write to manufacturer access with sleep command.
+        * Support is manufacturer dependend, so ignore errors.
+        */
+       sbs_write_word_data(client, sbs_data[REG_MANUFACTURER_DATA].addr,
                MANUFACTURER_ACCESS_SLEEP);
-       if (chip->is_present && ret < 0)
-               return ret;
 
        return 0;
 }
@@ -978,13 +907,20 @@ static const struct i2c_device_id sbs_id[] = {
 };
 MODULE_DEVICE_TABLE(i2c, sbs_id);
 
+static const struct of_device_id sbs_dt_ids[] = {
+       { .compatible = "sbs,sbs-battery" },
+       { .compatible = "ti,bq20z75" },
+       { }
+};
+MODULE_DEVICE_TABLE(of, sbs_dt_ids);
+
 static struct i2c_driver sbs_battery_driver = {
        .probe          = sbs_probe,
        .remove         = sbs_remove,
        .id_table       = sbs_id,
        .driver = {
                .name   = "sbs-battery",
-               .of_match_table = of_match_ptr(sbs_dt_ids),
+               .of_match_table = sbs_dt_ids,
                .pm     = SBS_PM_OPS,
        },
 };
similarity index 89%
rename from drivers/power/tps65217_charger.c
rename to drivers/power/supply/tps65217_charger.c
index 4c56e54af6ace4b11133d7a1944a54ca0725ddf6..9fd019f9b88c4ac1ed2c0988d13486c5f4b26b6f 100644 (file)
@@ -46,6 +46,8 @@ struct tps65217_charger {
        int     prev_ac_online;
 
        struct task_struct      *poll_task;
+
+       int     irq;
 };
 
 static enum power_supply_property tps65217_ac_props[] = {
@@ -198,6 +200,7 @@ static int tps65217_charger_probe(struct platform_device *pdev)
        struct tps65217 *tps = dev_get_drvdata(pdev->dev.parent);
        struct tps65217_charger *charger;
        struct power_supply_config cfg = {};
+       int irq;
        int ret;
 
        dev_dbg(&pdev->dev, "%s\n", __func__);
@@ -221,18 +224,40 @@ static int tps65217_charger_probe(struct platform_device *pdev)
                return PTR_ERR(charger->ac);
        }
 
+       irq = platform_get_irq_byname(pdev, "AC");
+       if (irq < 0)
+               irq = -ENXIO;
+       charger->irq = irq;
+
        ret = tps65217_config_charger(charger);
        if (ret < 0) {
                dev_err(charger->dev, "charger config failed, err %d\n", ret);
                return ret;
        }
 
-       charger->poll_task = kthread_run(tps65217_charger_poll_task,
-                                     charger, "ktps65217charger");
-       if (IS_ERR(charger->poll_task)) {
-               ret = PTR_ERR(charger->poll_task);
-               dev_err(charger->dev, "Unable to run kthread err %d\n", ret);
-               return ret;
+       if (irq != -ENXIO) {
+               ret = devm_request_threaded_irq(&pdev->dev, irq, NULL,
+                                               tps65217_charger_irq,
+                                               0, "tps65217-charger",
+                                               charger);
+               if (ret) {
+                       dev_err(charger->dev,
+                               "Unable to register irq %d err %d\n", irq,
+                               ret);
+                       return ret;
+               }
+
+               /* Check current state */
+               tps65217_charger_irq(irq, charger);
+       } else {
+               charger->poll_task = kthread_run(tps65217_charger_poll_task,
+                                               charger, "ktps65217charger");
+               if (IS_ERR(charger->poll_task)) {
+                       ret = PTR_ERR(charger->poll_task);
+                       dev_err(charger->dev,
+                               "Unable to run kthread err %d\n", ret);
+                       return ret;
+               }
        }
 
        return 0;
@@ -242,7 +267,8 @@ static int tps65217_charger_remove(struct platform_device *pdev)
 {
        struct tps65217_charger *charger = platform_get_drvdata(pdev);
 
-       kthread_stop(charger->poll_task);
+       if (charger->irq == -ENXIO)
+               kthread_stop(charger->poll_task);
 
        return 0;
 }
similarity index 99%
rename from drivers/power/wm97xx_battery.c
rename to drivers/power/supply/wm97xx_battery.c
index c2f09ed35050a15d20148c4439614b8098ee90a7..6285626d142a3b28b3e6df3565f3e63614f401f7 100644 (file)
@@ -1,6 +1,4 @@
 /*
- * linux/drivers/power/wm97xx_battery.c
- *
  * Battery measurement code for WM97xx
  *
  * based on tosa_battery.c
similarity index 99%
rename from drivers/power/z2_battery.c
rename to drivers/power/supply/z2_battery.c
index b201e3facf7343abe17439d93ea4eacd234a1e30..8a43b49cfd35f0966461ea0cca32847c9f55861e 100644 (file)
@@ -317,7 +317,6 @@ MODULE_DEVICE_TABLE(i2c, z2_batt_id);
 static struct i2c_driver z2_batt_driver = {
        .driver = {
                .name   = "z2-battery",
-               .owner  = THIS_MODULE,
                .pm     = Z2_BATTERY_PM_OPS
        },
        .probe          = z2_batt_probe,
index 6b750c1a45fab6e5c4d094612a30d1064a275404..b04be59f914c74fe8159e045daf59e479bfc1933 100644 (file)
@@ -28,10 +28,6 @@ struct bq24735_platform {
 
        const char *name;
 
-       int status_gpio;
-       int status_gpio_active_low;
-       bool status_gpio_valid;
-
        bool ext_control;
 
        char **supplied_to;
index b50c0492629dbfa9f902f214ad714f1c2df372bc..e30deb04615618e5c424d341b794a8f8274643c5 100644 (file)
@@ -58,6 +58,7 @@ struct bq27xxx_device_info {
        unsigned long last_update;
        struct delayed_work work;
        struct power_supply *bat;
+       struct list_head list;
        struct mutex lock;
        u8 *regs;
 };
index 2b0a9d9ff57e40c8109ea20c72f802a0d464dbb6..519b8b43239a5135024d6d67b3c2452d463d73bd 100644 (file)
 
 /**
  * struct sbs_platform_data - platform data for sbs devices
- * @battery_detect:            GPIO which is used to detect battery presence
- * @battery_detect_present:    gpio state when battery is present (0 / 1)
  * @i2c_retry_count:           # of times to retry on i2c IO failure
  * @poll_retry_count:          # of times to retry looking for new status after
  *                             external change notification
  */
 struct sbs_platform_data {
-       int battery_detect;
-       int battery_detect_present;
-       int i2c_retry_count;
-       int poll_retry_count;
+       u32 i2c_retry_count;
+       u32 poll_retry_count;
 };
 
 #endif