[GIT PULL] battery-2.6.git: fixes for v3.14
Hello Linus, Could you please pull battery-2.6.git tree containing several fixes for v3.14 kernel. The following changes since commit 573189354b7c97cd2256b87cf083ee435584594e: MAINTAINERS: Pick up power supply maintainership (2014-01-21 03:33:09 +0400) are available in the git repository at: git://git.infradead.org/battery-2.6.git tags/for-v3.14-fixes for you to fetch changes up to ac323d8d807060f7c95a685a9fe861e7b6300993: power: max17040: Fix NULL pointer dereference when there is no platform_data (2014-02-01 20:11:32 +0400) Few fixes: - Fix NULL pointer dereference in max17040 driver - Add bq2415x dts bindings documentation - Fix misleading comment in ds2782 driver - Remove useless check in isp1704 charger driver. Krzysztof Kozlowski (1): power: max17040: Fix NULL pointer dereference when there is no platform_data Matthias Brugger (1): power: ds2782_battery: Typo in comment Sebastian Reichel (1): dt: binding documentation for bq2415x charger Wei Yongjun (1): isp1704_charger: remove useless check in isp1704_charger_probe() .../devicetree/bindings/power/bq2415x.txt | 47 ++ drivers/power/ds2782_battery.c | 2 +- drivers/power/isp1704_charger.c| 2 - drivers/power/max17040_battery.c | 5 ++- 4 files changed, 51 insertions(+), 5 deletions(-) create mode 100644 Documentation/devicetree/bindings/power/bq2415x.txt -- With best wishes Dmitry -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[GIT PULL] battery-2.6.git: fixes for v3.14
Hello Linus, Could you please pull battery-2.6.git tree containing several fixes for v3.14 kernel. The following changes since commit 573189354b7c97cd2256b87cf083ee435584594e: MAINTAINERS: Pick up power supply maintainership (2014-01-21 03:33:09 +0400) are available in the git repository at: git://git.infradead.org/battery-2.6.git tags/for-v3.14-fixes for you to fetch changes up to ac323d8d807060f7c95a685a9fe861e7b6300993: power: max17040: Fix NULL pointer dereference when there is no platform_data (2014-02-01 20:11:32 +0400) Few fixes: - Fix NULL pointer dereference in max17040 driver - Add bq2415x dts bindings documentation - Fix misleading comment in ds2782 driver - Remove useless check in isp1704 charger driver. Krzysztof Kozlowski (1): power: max17040: Fix NULL pointer dereference when there is no platform_data Matthias Brugger (1): power: ds2782_battery: Typo in comment Sebastian Reichel (1): dt: binding documentation for bq2415x charger Wei Yongjun (1): isp1704_charger: remove useless check in isp1704_charger_probe() .../devicetree/bindings/power/bq2415x.txt | 47 ++ drivers/power/ds2782_battery.c | 2 +- drivers/power/isp1704_charger.c| 2 - drivers/power/max17040_battery.c | 5 ++- 4 files changed, 51 insertions(+), 5 deletions(-) create mode 100644 Documentation/devicetree/bindings/power/bq2415x.txt -- With best wishes Dmitry -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[GIT PULL] battery-2.6.git
Hello Linus, I'm picking up power supply maintainership from Anton Vorontov. Could you please pull battery-2.6 git tree changes prepared for the v3.14 release. The following changes since commit 93353e8088057dd988362e6cae727af43734b494: max17042_battery: Fix build errors caused by missing REGMAP_I2C config (2013-12-01 14:25:03 -0800) are available in the git repository at: git://git.infradead.org/battery-2.6.git tags/for-v3.14 for you to fetch changes up to 573189354b7c97cd2256b87cf083ee435584594e: MAINTAINERS: Pick up power supply maintainership (2014-01-21 03:33:09 +0400) Highlights: - Power supply notifier - Several drivers gained DT support - Added Maxim 14577 driver - Change of maintainer Anton Vorontsov (1): charger-manager: of_cm_parse_desc() should be static Dmitry Eremin-Solenikov (2): gpio-charger: Support wakeup events MAINTAINERS: Pick up power supply maintainership Jonghwa Lee (3): charger-manager: Modify the way of checking battery's temperature charger-manager: Support deivce tree in charger manager driver max17042_battery: Add IRQF_ONESHOT flag to use default irq handler Krzysztof Kozlowski (1): power_supply: Add charger support for Maxim 14577 Laxman Dewangan (2): mfd: AS3722: Add dt node properties for system power controller power: reset: Add as3722 power-off driver Pali Rohár (2): power_supply: Add power_supply notifier bq2415x_charger: Use power_supply notifier for automode Sebastian Reichel (4): power_supply: Add power_supply_get_by_phandle bq2415x_charger: Add DT support isp1704_charger: Add DT support dt: Binding documentation for isp1704 charger Documentation/devicetree/bindings/mfd/as3722.txt | 11 + .../devicetree/bindings/power/isp1704.txt | 17 ++ .../bindings/power_supply/charger-manager.txt | 81 ++ MAINTAINERS| 2 +- drivers/power/Kconfig | 7 + drivers/power/Makefile | 1 + drivers/power/bq2415x_charger.c| 121 ++-- drivers/power/charger-manager.c| 299 +--- drivers/power/gpio-charger.c | 19 +- drivers/power/isp1704_charger.c| 54 +++- drivers/power/max14577_charger.c | 311 + drivers/power/max17042_battery.c | 6 +- drivers/power/power_supply_core.c | 44 +++ drivers/power/reset/Kconfig| 6 + drivers/power/reset/Makefile | 1 + drivers/power/reset/as3722-poweroff.c | 96 +++ include/linux/power/bq2415x_charger.h | 48 +--- include/linux/power/charger-manager.h | 34 ++- include/linux/power/isp1704_charger.h | 1 + include/linux/power_supply.h | 16 ++ 20 files changed, 1043 insertions(+), 132 deletions(-) create mode 100644 Documentation/devicetree/bindings/power/isp1704.txt create mode 100644 Documentation/devicetree/bindings/power_supply/charger-manager.txt create mode 100644 drivers/power/max14577_charger.c create mode 100644 drivers/power/reset/as3722-poweroff.c -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[GIT PULL] battery-2.6.git
Hello Linus, I'm picking up power supply maintainership from Anton Vorontov. Could you please pull battery-2.6 git tree changes prepared for the v3.14 release. The following changes since commit 93353e8088057dd988362e6cae727af43734b494: max17042_battery: Fix build errors caused by missing REGMAP_I2C config (2013-12-01 14:25:03 -0800) are available in the git repository at: git://git.infradead.org/battery-2.6.git tags/for-v3.14 for you to fetch changes up to 573189354b7c97cd2256b87cf083ee435584594e: MAINTAINERS: Pick up power supply maintainership (2014-01-21 03:33:09 +0400) Highlights: - Power supply notifier - Several drivers gained DT support - Added Maxim 14577 driver - Change of maintainer Anton Vorontsov (1): charger-manager: of_cm_parse_desc() should be static Dmitry Eremin-Solenikov (2): gpio-charger: Support wakeup events MAINTAINERS: Pick up power supply maintainership Jonghwa Lee (3): charger-manager: Modify the way of checking battery's temperature charger-manager: Support deivce tree in charger manager driver max17042_battery: Add IRQF_ONESHOT flag to use default irq handler Krzysztof Kozlowski (1): power_supply: Add charger support for Maxim 14577 Laxman Dewangan (2): mfd: AS3722: Add dt node properties for system power controller power: reset: Add as3722 power-off driver Pali Rohár (2): power_supply: Add power_supply notifier bq2415x_charger: Use power_supply notifier for automode Sebastian Reichel (4): power_supply: Add power_supply_get_by_phandle bq2415x_charger: Add DT support isp1704_charger: Add DT support dt: Binding documentation for isp1704 charger Documentation/devicetree/bindings/mfd/as3722.txt | 11 + .../devicetree/bindings/power/isp1704.txt | 17 ++ .../bindings/power_supply/charger-manager.txt | 81 ++ MAINTAINERS| 2 +- drivers/power/Kconfig | 7 + drivers/power/Makefile | 1 + drivers/power/bq2415x_charger.c| 121 ++-- drivers/power/charger-manager.c| 299 +--- drivers/power/gpio-charger.c | 19 +- drivers/power/isp1704_charger.c| 54 +++- drivers/power/max14577_charger.c | 311 + drivers/power/max17042_battery.c | 6 +- drivers/power/power_supply_core.c | 44 +++ drivers/power/reset/Kconfig| 6 + drivers/power/reset/Makefile | 1 + drivers/power/reset/as3722-poweroff.c | 96 +++ include/linux/power/bq2415x_charger.h | 48 +--- include/linux/power/charger-manager.h | 34 ++- include/linux/power/isp1704_charger.h | 1 + include/linux/power_supply.h | 16 ++ 20 files changed, 1043 insertions(+), 132 deletions(-) create mode 100644 Documentation/devicetree/bindings/power/isp1704.txt create mode 100644 Documentation/devicetree/bindings/power_supply/charger-manager.txt create mode 100644 drivers/power/max14577_charger.c create mode 100644 drivers/power/reset/as3722-poweroff.c -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[GIT PULL] battery-2.6.git
Hello Linus, Please pull battery-2.6 git tree to receive two fixes prepared for the v3.13 release: - Fix build error caused by max17042_battery conversion to the regmap API. - Fix kernel oops when booting with wakeup_source_activate enabled. Thank you! Anton The following changes since commit dc1ccc48159d63eca5089e507c82c7d22ef60839: Linux 3.13-rc2 (2013-11-29 12:57:14 -0800) are available in the git repository at: git://git.infradead.org/battery-2.6.git tags/for-v3.13-fixes for you to fetch changes up to 93353e8088057dd988362e6cae727af43734b494: max17042_battery: Fix build errors caused by missing REGMAP_I2C config (2013-12-01 14:25:03 -0800) Austin Boyle (1): max17042_battery: Fix build errors caused by missing REGMAP_I2C config Shuah Khan (1): power_supply: Fix Oops from NULL pointer dereference from wakeup_source_activate drivers/power/Kconfig | 1 + drivers/power/power_supply_core.c | 12 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[GIT PULL] battery-2.6.git
Hello Linus, Please pull battery-2.6 git tree to receive two fixes prepared for the v3.13 release: - Fix build error caused by max17042_battery conversion to the regmap API. - Fix kernel oops when booting with wakeup_source_activate enabled. Thank you! Anton The following changes since commit dc1ccc48159d63eca5089e507c82c7d22ef60839: Linux 3.13-rc2 (2013-11-29 12:57:14 -0800) are available in the git repository at: git://git.infradead.org/battery-2.6.git tags/for-v3.13-fixes for you to fetch changes up to 93353e8088057dd988362e6cae727af43734b494: max17042_battery: Fix build errors caused by missing REGMAP_I2C config (2013-12-01 14:25:03 -0800) Austin Boyle (1): max17042_battery: Fix build errors caused by missing REGMAP_I2C config Shuah Khan (1): power_supply: Fix Oops from NULL pointer dereference from wakeup_source_activate drivers/power/Kconfig | 1 + drivers/power/power_supply_core.c | 12 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[GIT PULL] battery-2.6.git
Hello Linus, Please pull battery-2.6 git tree to receive changes prepared for the v3.13 release. Highlights: - A new driver for TI BQ24735 Battery Chargers, courtesy of NVidia. - Device tree bindings for TWL4030 chips. - Random fixes and cleanups. Thank you, Anton The following changes since commit 61e6cfa80de5760bbe406f4e815b7739205754d2: Linux 3.12-rc5 (2013-10-13 15:41:28 -0700) are available in the git repository at: git://git.infradead.org/battery-2.6.git tags/for-v3.13 for you to fetch changes up to c8024234c20eaf7b163cc4dbd963cb9cd03a4ff1: pm2301-charger: Remove unneeded NULL checks (2013-11-12 22:36:34 -0800) Alexandre Belloni (1): bq2415x_charger: Fix max battery regulation voltage Anton Vorontsov (1): power_supply: Fix documentation for TEMP_*ALERT* properties Dan Carpenter (1): pm2301-charger: Remove unneeded NULL checks Darbha Sriharsha (1): power_supply: Add support for bq24735 charger Jonghwa Lee (2): charger-manager : Replace kzalloc to devm_kzalloc and remove uneccessary code max17042_battery: Support regmap to access device's registers Manish Badarkhe (2): tps65090-charger: Use "IS_ENABLED(CONFIG_OF)" for DT code max17042_battery: Use SIMPLE_DEV_PM_OPS NeilBrown (1): twl4030_charger: Add devicetree support Pali Rohár (1): isp1704_charger: Fix driver to work with changes introduced in v3.5 Sachin Kamat (4): ab8500-charger: Check return value of regulator_enable ab8500-charger: Remove redundant break pm2301-charger: Check return value of regulator_enable pm2301-charger: Staticize pm2xxx_charger_die_therm_mngt Wei Yongjun (1): tps65090-charger: Drop devm_free_irq of devm_ allocated irq .../devicetree/bindings/power/twl-charger.txt | 20 + .../bindings/power_supply/ti,bq24735.txt | 32 ++ Documentation/power/power_supply_class.txt | 8 +- arch/arm/boot/dts/twl4030.dtsi | 6 + drivers/power/Kconfig | 6 + drivers/power/Makefile | 1 + drivers/power/ab8500_charger.c | 17 +- drivers/power/bq2415x_charger.c| 6 +- drivers/power/bq24735-charger.c| 419 + drivers/power/charger-manager.c| 85 ++--- drivers/power/isp1704_charger.c| 91 ++--- drivers/power/max17042_battery.c | 373 +- drivers/power/pm2301_charger.c | 27 +- drivers/power/tps65090-charger.c | 30 +- drivers/power/twl4030_charger.c| 47 ++- include/linux/power/bq24735-charger.h | 39 ++ 16 files changed, 852 insertions(+), 355 deletions(-) create mode 100644 Documentation/devicetree/bindings/power/twl-charger.txt create mode 100644 Documentation/devicetree/bindings/power_supply/ti,bq24735.txt create mode 100644 drivers/power/bq24735-charger.c create mode 100644 include/linux/power/bq24735-charger.h -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[GIT PULL] battery-2.6.git
Hello Linus, Please pull battery-2.6 git tree to receive changes prepared for the v3.13 release. Highlights: - A new driver for TI BQ24735 Battery Chargers, courtesy of NVidia. - Device tree bindings for TWL4030 chips. - Random fixes and cleanups. Thank you, Anton The following changes since commit 61e6cfa80de5760bbe406f4e815b7739205754d2: Linux 3.12-rc5 (2013-10-13 15:41:28 -0700) are available in the git repository at: git://git.infradead.org/battery-2.6.git tags/for-v3.13 for you to fetch changes up to c8024234c20eaf7b163cc4dbd963cb9cd03a4ff1: pm2301-charger: Remove unneeded NULL checks (2013-11-12 22:36:34 -0800) Alexandre Belloni (1): bq2415x_charger: Fix max battery regulation voltage Anton Vorontsov (1): power_supply: Fix documentation for TEMP_*ALERT* properties Dan Carpenter (1): pm2301-charger: Remove unneeded NULL checks Darbha Sriharsha (1): power_supply: Add support for bq24735 charger Jonghwa Lee (2): charger-manager : Replace kzalloc to devm_kzalloc and remove uneccessary code max17042_battery: Support regmap to access device's registers Manish Badarkhe (2): tps65090-charger: Use IS_ENABLED(CONFIG_OF) for DT code max17042_battery: Use SIMPLE_DEV_PM_OPS NeilBrown (1): twl4030_charger: Add devicetree support Pali Rohár (1): isp1704_charger: Fix driver to work with changes introduced in v3.5 Sachin Kamat (4): ab8500-charger: Check return value of regulator_enable ab8500-charger: Remove redundant break pm2301-charger: Check return value of regulator_enable pm2301-charger: Staticize pm2xxx_charger_die_therm_mngt Wei Yongjun (1): tps65090-charger: Drop devm_free_irq of devm_ allocated irq .../devicetree/bindings/power/twl-charger.txt | 20 + .../bindings/power_supply/ti,bq24735.txt | 32 ++ Documentation/power/power_supply_class.txt | 8 +- arch/arm/boot/dts/twl4030.dtsi | 6 + drivers/power/Kconfig | 6 + drivers/power/Makefile | 1 + drivers/power/ab8500_charger.c | 17 +- drivers/power/bq2415x_charger.c| 6 +- drivers/power/bq24735-charger.c| 419 + drivers/power/charger-manager.c| 85 ++--- drivers/power/isp1704_charger.c| 91 ++--- drivers/power/max17042_battery.c | 373 +- drivers/power/pm2301_charger.c | 27 +- drivers/power/tps65090-charger.c | 30 +- drivers/power/twl4030_charger.c| 47 ++- include/linux/power/bq24735-charger.h | 39 ++ 16 files changed, 852 insertions(+), 355 deletions(-) create mode 100644 Documentation/devicetree/bindings/power/twl-charger.txt create mode 100644 Documentation/devicetree/bindings/power_supply/ti,bq24735.txt create mode 100644 drivers/power/bq24735-charger.c create mode 100644 include/linux/power/bq24735-charger.h -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[GIT PULL] battery-2.6.git
Hello Linus, Please pull battery-2.6 git tree to receive changes prepared for the v3.12 release. Here is what we have: New drivers: - APM X-Gene system reboot driver by Feng Kan and Loc Ho (APM). - Qualcomm MSM reboot/poweroff driver by Abhimanyu Kapur (Codeaurora). - Texas Instruments BQ24190 charger driver by Mark A. Greer (Animal Creek Technologies). - Texas Instruments TWL4030 MADC battery driver by Lukas Märdian and Marek Belisko (Golden Delicious Computers). The driver is used on Freerunner GTA04 phones. Highlighted fixes and improvements: - Suspend/wakeup logic improvements: power supply objects will block system suspend until all power supply events are processed. Thanks to Zoran Markovic (Linaro), Arve Hjonnevag and Todd Poynor (Google). Thanks! Anton The following changes since commit c095ba7224d8edc71dcef0d655911399a8bd4a3f: Linux 3.11-rc4 (2013-08-04 13:46:46 -0700) are available in the git repository at: git://git.infradead.org/battery-2.6.git tags/for-v3.12 for you to fetch changes up to db15e6312efd537e2deb2cbad110c23f98704a3c: rx51_battery: Fix channel number when reading adc value (2013-08-30 17:49:15 -0700) Abhimanyu Kapur (1): power: reset: Add msm restart support Andrea Adami (2): power supply: collie_battery: Convert to use dev_pm_ops power_supply: tosa_battery: Get rid of irq_to_gpio usage Anton Vorontsov (1): bq24190_charger: Workaround SS definition problem on i386 builds Dan Carpenter (1): ab8500-charger: We print an unintended error message Jingoo Han (1): power_supply: Replace strict_strtol() with kstrtol() Kevin Hilman (1): MAINTAINERS: drivers/power: add entry for SmartReflex AVS drivers Libo Chen (1): max8925_power: Fix missing of_node_put Loc Ho (1): power: Add APM X-Gene system reboot driver Marek Belisko (3): rx51_battery: Replace hardcoded channels values. power: Add twl4030_madc battery driver. rx51_battery: Fix channel number when reading adc value Mark A. Greer (1): bq24190_charger: Add support for TI BQ24190 Battery Charger Paul Gortmaker (1): power_supply: Make goldfish_battery depend on GOLDFISH || COMPILE_TEST Pawel Moll (1): vexpress-poweroff: Should depend on the required infrastructure Peter Ujfalusi (1): twl4030-charger: Fix compiler warning with regulator_enable() Zoran Markovic (1): power_supply: Prevent suspend until power supply events are processed .../bindings/power_supply/msm-poweroff.txt | 17 + MAINTAINERS|8 + drivers/power/Kconfig | 15 +- drivers/power/Makefile |2 + drivers/power/ab8500_charger.c |1 + drivers/power/bq24190_charger.c| 1549 drivers/power/collie_battery.c |2 +- drivers/power/max8925_power.c |1 + drivers/power/power_supply_core.c | 38 +- drivers/power/power_supply_sysfs.c |2 +- drivers/power/reset/Kconfig| 15 +- drivers/power/reset/Makefile |2 + drivers/power/reset/msm-poweroff.c | 73 + drivers/power/reset/xgene-reboot.c | 103 ++ drivers/power/rx51_battery.c | 14 +- drivers/power/tosa_battery.c |2 +- drivers/power/twl4030_charger.c|7 +- drivers/power/twl4030_madc_battery.c | 245 include/linux/power/bq24190_charger.h | 16 + include/linux/power/twl4030_madc_battery.h | 39 + include/linux/power_supply.h |3 + 21 files changed, 2137 insertions(+), 17 deletions(-) create mode 100644 Documentation/devicetree/bindings/power_supply/msm-poweroff.txt create mode 100644 drivers/power/bq24190_charger.c create mode 100644 drivers/power/reset/msm-poweroff.c create mode 100644 drivers/power/reset/xgene-reboot.c create mode 100644 drivers/power/twl4030_madc_battery.c create mode 100644 include/linux/power/bq24190_charger.h create mode 100644 include/linux/power/twl4030_madc_battery.h -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[GIT PULL] battery-2.6.git
Hello Linus, Please pull battery-2.6 git tree to receive changes prepared for the v3.12 release. Here is what we have: New drivers: - APM X-Gene system reboot driver by Feng Kan and Loc Ho (APM). - Qualcomm MSM reboot/poweroff driver by Abhimanyu Kapur (Codeaurora). - Texas Instruments BQ24190 charger driver by Mark A. Greer (Animal Creek Technologies). - Texas Instruments TWL4030 MADC battery driver by Lukas Märdian and Marek Belisko (Golden Delicious Computers). The driver is used on Freerunner GTA04 phones. Highlighted fixes and improvements: - Suspend/wakeup logic improvements: power supply objects will block system suspend until all power supply events are processed. Thanks to Zoran Markovic (Linaro), Arve Hjonnevag and Todd Poynor (Google). Thanks! Anton The following changes since commit c095ba7224d8edc71dcef0d655911399a8bd4a3f: Linux 3.11-rc4 (2013-08-04 13:46:46 -0700) are available in the git repository at: git://git.infradead.org/battery-2.6.git tags/for-v3.12 for you to fetch changes up to db15e6312efd537e2deb2cbad110c23f98704a3c: rx51_battery: Fix channel number when reading adc value (2013-08-30 17:49:15 -0700) Abhimanyu Kapur (1): power: reset: Add msm restart support Andrea Adami (2): power supply: collie_battery: Convert to use dev_pm_ops power_supply: tosa_battery: Get rid of irq_to_gpio usage Anton Vorontsov (1): bq24190_charger: Workaround SS definition problem on i386 builds Dan Carpenter (1): ab8500-charger: We print an unintended error message Jingoo Han (1): power_supply: Replace strict_strtol() with kstrtol() Kevin Hilman (1): MAINTAINERS: drivers/power: add entry for SmartReflex AVS drivers Libo Chen (1): max8925_power: Fix missing of_node_put Loc Ho (1): power: Add APM X-Gene system reboot driver Marek Belisko (3): rx51_battery: Replace hardcoded channels values. power: Add twl4030_madc battery driver. rx51_battery: Fix channel number when reading adc value Mark A. Greer (1): bq24190_charger: Add support for TI BQ24190 Battery Charger Paul Gortmaker (1): power_supply: Make goldfish_battery depend on GOLDFISH || COMPILE_TEST Pawel Moll (1): vexpress-poweroff: Should depend on the required infrastructure Peter Ujfalusi (1): twl4030-charger: Fix compiler warning with regulator_enable() Zoran Markovic (1): power_supply: Prevent suspend until power supply events are processed .../bindings/power_supply/msm-poweroff.txt | 17 + MAINTAINERS|8 + drivers/power/Kconfig | 15 +- drivers/power/Makefile |2 + drivers/power/ab8500_charger.c |1 + drivers/power/bq24190_charger.c| 1549 drivers/power/collie_battery.c |2 +- drivers/power/max8925_power.c |1 + drivers/power/power_supply_core.c | 38 +- drivers/power/power_supply_sysfs.c |2 +- drivers/power/reset/Kconfig| 15 +- drivers/power/reset/Makefile |2 + drivers/power/reset/msm-poweroff.c | 73 + drivers/power/reset/xgene-reboot.c | 103 ++ drivers/power/rx51_battery.c | 14 +- drivers/power/tosa_battery.c |2 +- drivers/power/twl4030_charger.c|7 +- drivers/power/twl4030_madc_battery.c | 245 include/linux/power/bq24190_charger.h | 16 + include/linux/power/twl4030_madc_battery.h | 39 + include/linux/power_supply.h |3 + 21 files changed, 2137 insertions(+), 17 deletions(-) create mode 100644 Documentation/devicetree/bindings/power_supply/msm-poweroff.txt create mode 100644 drivers/power/bq24190_charger.c create mode 100644 drivers/power/reset/msm-poweroff.c create mode 100644 drivers/power/reset/xgene-reboot.c create mode 100644 drivers/power/twl4030_madc_battery.c create mode 100644 include/linux/power/bq24190_charger.h create mode 100644 include/linux/power/twl4030_madc_battery.h -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[GIT PULL] battery-2.6.git
Hello Linus,
Please pull battery-2.6 git tree to receive changes prepared for the v3.11
release. This time there is nothing exciting in there, just assorted fixes
and cleanups.
Thanks!
Anton
The following changes since commit d683b96b072dc4680fc74964eca77e6a23d1fa6e:
Linux 3.10-rc4 (2013-06-02 17:11:17 +0900)
are available in the git repository at:
git://git.infradead.org/battery-2.6.git tags/for-v3.11
for you to fetch changes up to 5a6c2208455f25b3e6f939adc2da59aa00d4806e:
charger-manager: Fix regulator_get() return check (2013-06-28 18:37:03 -0700)
Andrew Chew (1):
tps65090-charger: Fix AC detect
Anton Vorontsov (2):
MAINTAINERS: Update email address for Anton Vorontsov
power_supply: Move of_node out of the #ifdef CONFIG_OF
Axel Lin (3):
pm2301_charger: Fix NULL pointer dereference
pm2301_charger: Return error if create_singlethread_workqueue fails
generic-adc-battery: Fix checking if none of the channels are supported
Jingoo Han (10):
88pm860x_battery: Remove unnecessary platform_set_drvdata()
88pm860x_charger: Remove unnecessary platform_set_drvdata()
ab8500_bm: Remove unnecessary platform_set_drvdata()
bq27x00_battery: Remove unnecessary platform_set_drvdata()
gpio-charger: Remove unnecessary platform_set_drvdata()
jz4740-battery: Remove unnecessary platform_set_drvdata()
rx51_battery: Remove unnecessary platform_set_drvdata()
twl4030_charger: Remove unnecessary platform_set_drvdata()
power: Use platform_{get,set}_drvdata()
power_supply: Replace strict_strtoul() with kstrtoul()
Joe Perches (1):
charger-manager: Add missing newlines, fix a couple of typos, add pr_fmt
Jonghwa Lee (2):
charger-manager: Fix a bug when it unregisters notifier block of extcon
charger-manager: Fix regulator_get() return check
Kees Cook (1):
charger-manager: Ensure event is not used as format string
Kim, Milo (1):
lp8727_charger: Support the device tree feature
Pawel Moll (1):
power/reset: Make the vexpress driver optional on arm and arm64
Rhyland Klein (3):
power_supply: Add of_node_put to fix refcount
sbs-battery: Add dt to power_supply struct
tps65090-charger: Add dt node to power_supply
.../bindings/power_supply/lp8727_charger.txt | 44 +++
MAINTAINERS| 8 +-
drivers/power/88pm860x_battery.c | 1 -
drivers/power/88pm860x_charger.c | 1 -
drivers/power/ab8500_btemp.c | 1 -
drivers/power/ab8500_charger.c | 2 -
drivers/power/ab8500_fg.c | 7 +-
drivers/power/abx500_chargalg.c| 1 -
drivers/power/bq27x00_battery.c| 2 -
drivers/power/charger-manager.c| 146 +
drivers/power/generic-adc-battery.c| 4 +-
drivers/power/gpio-charger.c | 2 -
drivers/power/intel_mid_battery.c | 2 +-
drivers/power/jz4740-battery.c | 4 +-
drivers/power/lp8727_charger.c | 68 ++
drivers/power/pcf50633-charger.c | 8 +-
drivers/power/pm2301_charger.c | 11 +-
drivers/power/power_supply_core.c | 4 +
drivers/power/reset/Kconfig| 3 +-
drivers/power/rx51_battery.c | 5 +-
drivers/power/sbs-battery.c| 1 +
drivers/power/tps65090-charger.c | 40 +-
drivers/power/twl4030_charger.c| 2 -
include/linux/power_supply.h | 4 +-
24 files changed, 241 insertions(+), 130 deletions(-)
create mode 100644
Documentation/devicetree/bindings/power_supply/lp8727_charger.txt
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[GIT PULL] battery-2.6.git
Hello Linus,
Please pull battery-2.6 git tree to receive changes prepared for the v3.11
release. This time there is nothing exciting in there, just assorted fixes
and cleanups.
Thanks!
Anton
The following changes since commit d683b96b072dc4680fc74964eca77e6a23d1fa6e:
Linux 3.10-rc4 (2013-06-02 17:11:17 +0900)
are available in the git repository at:
git://git.infradead.org/battery-2.6.git tags/for-v3.11
for you to fetch changes up to 5a6c2208455f25b3e6f939adc2da59aa00d4806e:
charger-manager: Fix regulator_get() return check (2013-06-28 18:37:03 -0700)
Andrew Chew (1):
tps65090-charger: Fix AC detect
Anton Vorontsov (2):
MAINTAINERS: Update email address for Anton Vorontsov
power_supply: Move of_node out of the #ifdef CONFIG_OF
Axel Lin (3):
pm2301_charger: Fix NULL pointer dereference
pm2301_charger: Return error if create_singlethread_workqueue fails
generic-adc-battery: Fix checking if none of the channels are supported
Jingoo Han (10):
88pm860x_battery: Remove unnecessary platform_set_drvdata()
88pm860x_charger: Remove unnecessary platform_set_drvdata()
ab8500_bm: Remove unnecessary platform_set_drvdata()
bq27x00_battery: Remove unnecessary platform_set_drvdata()
gpio-charger: Remove unnecessary platform_set_drvdata()
jz4740-battery: Remove unnecessary platform_set_drvdata()
rx51_battery: Remove unnecessary platform_set_drvdata()
twl4030_charger: Remove unnecessary platform_set_drvdata()
power: Use platform_{get,set}_drvdata()
power_supply: Replace strict_strtoul() with kstrtoul()
Joe Perches (1):
charger-manager: Add missing newlines, fix a couple of typos, add pr_fmt
Jonghwa Lee (2):
charger-manager: Fix a bug when it unregisters notifier block of extcon
charger-manager: Fix regulator_get() return check
Kees Cook (1):
charger-manager: Ensure event is not used as format string
Kim, Milo (1):
lp8727_charger: Support the device tree feature
Pawel Moll (1):
power/reset: Make the vexpress driver optional on arm and arm64
Rhyland Klein (3):
power_supply: Add of_node_put to fix refcount
sbs-battery: Add dt to power_supply struct
tps65090-charger: Add dt node to power_supply
.../bindings/power_supply/lp8727_charger.txt | 44 +++
MAINTAINERS| 8 +-
drivers/power/88pm860x_battery.c | 1 -
drivers/power/88pm860x_charger.c | 1 -
drivers/power/ab8500_btemp.c | 1 -
drivers/power/ab8500_charger.c | 2 -
drivers/power/ab8500_fg.c | 7 +-
drivers/power/abx500_chargalg.c| 1 -
drivers/power/bq27x00_battery.c| 2 -
drivers/power/charger-manager.c| 146 +
drivers/power/generic-adc-battery.c| 4 +-
drivers/power/gpio-charger.c | 2 -
drivers/power/intel_mid_battery.c | 2 +-
drivers/power/jz4740-battery.c | 4 +-
drivers/power/lp8727_charger.c | 68 ++
drivers/power/pcf50633-charger.c | 8 +-
drivers/power/pm2301_charger.c | 11 +-
drivers/power/power_supply_core.c | 4 +
drivers/power/reset/Kconfig| 3 +-
drivers/power/rx51_battery.c | 5 +-
drivers/power/sbs-battery.c| 1 +
drivers/power/tps65090-charger.c | 40 +-
drivers/power/twl4030_charger.c| 2 -
include/linux/power_supply.h | 4 +-
24 files changed, 241 insertions(+), 130 deletions(-)
create mode 100644
Documentation/devicetree/bindings/power_supply/lp8727_charger.txt
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: [GIT PULL] battery-2.6.git
On Sat, 2013-05-25 at 15:23 -0700, Anton Vorontsov wrote: > Please pull battery-2.6 git tree to get a few one-liners: wrong kfree > usage fix, module alias fixup and kconfig adjustments. The patches really > small, so for convenience I inline them here. Please note git.infradead.org has just been migrated to a virtual machine, and was rebooted once or twice after this pull request was sent. We don't anticipate any more reboots imminently. The new IP address (2001:1868:205::9, or 198.137.202.9 for those stuck in the 20th century) should have propagated in DNS already and the migration should theoretically be fairly seamless. But please let me know if anything goes wrong. It will be moving again, onto real hardware once it becomes available, hopefully in the next week or so. It will retain the same IP addresses. -- dwmw2 smime.p7s Description: S/MIME cryptographic signature
Re: [GIT PULL] battery-2.6.git
On Sun, May 26, 2013 at 12:23:32AM +0100, David Woodhouse wrote: > On Sat, 2013-05-25 at 15:23 -0700, Anton Vorontsov wrote: > > Please pull battery-2.6 git tree to get a few one-liners: wrong kfree > > usage fix, module alias fixup and kconfig adjustments. The patches really > > small, so for convenience I inline them here. > > Please note git.infradead.org has just been migrated to a virtual > machine, and was rebooted once or twice after this pull request was > sent. We don't anticipate any more reboots imminently. > > The new IP address (2001:1868:205::9, or 198.137.202.9 for those stuck > in the 20th century) should have propagated in DNS already and the > migration should theoretically be fairly seamless. But please let me > know if anything goes wrong. > > It will be moving again, onto real hardware once it becomes available, > hopefully in the next week or so. It will retain the same IP addresses. Thanks a lot for your efforts and letting us know, David! Anton -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[GIT PULL] battery-2.6.git
Hello Linus,
Please pull battery-2.6 git tree to get a few one-liners: wrong kfree
usage fix, module alias fixup and kconfig adjustments. The patches really
small, so for convenience I inline them here.
Thanks!
Anton
The following changes since commit 6b170807cd5cac8dc6353f47a88ccb14bbf76c4f:
pm2301-charger: Fix suspend/resume (2013-04-16 19:00:01 -0700)
are available in the git repository at:
git://git.infradead.org/battery-2.6.git tags/for-v3.10-fixes
for you to fetch changes up to dccab6092d3c25bf943d12fb658e63fd88bf8b4a:
pm2301_charger: Fix module alias prefix (2013-05-10 11:57:14 -0700)
Axel Lin (2):
wm831x_backup: Fix wrong kfree call for devdata->backup.name
pm2301_charger: Fix module alias prefix
Randy Dunlap (1):
lp8788-charger: Fix kconfig dependency
Xiong Zhou (1):
bq27x00: Fix I2C dependency in KConfig
drivers/power/Kconfig | 2 ++
drivers/power/pm2301_charger.c | 2 +-
drivers/power/wm831x_backup.c | 1 -
3 files changed, 3 insertions(+), 2 deletions(-)
commit dccab6092d3c25bf943d12fb658e63fd88bf8b4a
Author: Axel Lin
Date: Sat May 4 18:51:09 2013 +0800
pm2301_charger: Fix module alias prefix
This driver is a i2c driver, use "i2c" rather than "platform" prefix for
module alias.
Signed-off-by: Axel Lin
Signed-off-by: Anton Vorontsov
diff --git a/drivers/power/pm2301_charger.c b/drivers/power/pm2301_charger.c
index f123f3c..e9c6ba0 100644
--- a/drivers/power/pm2301_charger.c
+++ b/drivers/power/pm2301_charger.c
@@ -1269,5 +1269,5 @@ module_exit(pm2xxx_charger_exit);
MODULE_LICENSE("GPL v2");
MODULE_AUTHOR("Rajkumar kasirajan, Olivier Launay");
-MODULE_ALIAS("platform:pm2xxx-charger");
+MODULE_ALIAS("i2c:pm2xxx-charger");
MODULE_DESCRIPTION("PM2xxx charger management driver");
commit c909fc8573af3cff9184551e79cf37784b5ddc24
Author: Axel Lin
Date: Sat May 4 13:57:55 2013 +0800
wm831x_backup: Fix wrong kfree call for devdata->backup.name
devdata->backup.name points to devdata->name, the memory for devdata->name
is part of struct wm831x_backup. Thus remove kfree call for
devdata->backup.name.
Signed-off-by: Axel Lin
Acked-by: Mark Brown
Signed-off-by: Anton Vorontsov
diff --git a/drivers/power/wm831x_backup.c b/drivers/power/wm831x_backup.c
index 58cbb00..56fb509 100644
--- a/drivers/power/wm831x_backup.c
+++ b/drivers/power/wm831x_backup.c
@@ -207,7 +207,6 @@ static int wm831x_backup_remove(struct platform_device
*pdev)
struct wm831x_backup *devdata = platform_get_drvdata(pdev);
power_supply_unregister(>backup);
- kfree(devdata->backup.name);
return 0;
}
commit a2d0dbb4b55681874c5f288538ae55ae69baeaff
Author: Xiong Zhou
Date: Tue May 7 10:15:56 2013 +0800
bq27x00: Fix I2C dependency in KConfig
This patch fixes build failure(randconfig) of next-20130501. When config
I2C as m, BATTERY_BQ27x00 as y, here comes the failure. The driver depends
on I2C only if I2C is not disabled, as Lars commented. Last version of
this patch make the driver depend on I2C unconditionally.
Failure message:
drivers/built-in.o: In function `bq27x00_read_i2c':
bq27x00_battery.c:(.text+0x1082a7): undefined reference to `i2c_transfer'
drivers/built-in.o: In function `bq27x00_battery_init':
bq27x00_battery.c:(.init.text+0x6085): undefined reference to
`i2c_register_driver'
bq27x00_battery.c:(.init.text+0x60c7): undefined reference to
`i2c_del_driver'
drivers/built-in.o: In function `bq27x00_battery_exit':
bq27x00_battery.c:(.exit.text+0xbf0): undefined reference to
`i2c_del_driver'
make: *** [vmlinux] Error 1
Signed-off-by: Xiong Zhou
Cc: Lars-Peter Clausen
Signed-off-by: Anton Vorontsov
diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig
index 814bcb9..674e633 100644
--- a/drivers/power/Kconfig
+++ b/drivers/power/Kconfig
@@ -152,6 +152,7 @@ config BATTERY_SBS
config BATTERY_BQ27x00
tristate "BQ27x00 battery driver"
+ depends on I2C || I2C=n
help
Say Y here to enable support for batteries with BQ27x00 (I2C/HDQ)
chips.
commit 237a1b01fdb29df6a28d50d6dbe7a988c4fb3625
Author: Randy Dunlap
Date: Wed May 1 12:18:43 2013 -0700
lp8788-charger: Fix kconfig dependency
Fix build errors in lp8788-charger by making it depend on IIO.
Fixes errors when CONFIG_IIO=m and CHARGER_LP8788=y.
lp8788-charger.c:(.text+0x2146b5): undefined reference to `iio_channel_get'
lp8788-charger.c:(.text+0x2146ce): undefined reference to `iio_channel_get'
lp8788-charger.c:(.text+0x214a86): undefined reference to
`iio_read_channel_processed'
lp8788-charger.c:(.text+0x214b51): undefined reference to
`iio_read_channel_processed'
lp8788-charger.c:(.text+0x214c30): undefined reference to
`iio_read_channel_processed'
[GIT PULL] battery-2.6.git
Hello Linus, Please pull battery-2.6 git tree to get a few one-liners: wrong kfree usage fix, module alias fixup and kconfig adjustments. The patches really small, so for convenience I inline them here. Thanks! Anton The following changes since commit 6b170807cd5cac8dc6353f47a88ccb14bbf76c4f: pm2301-charger: Fix suspend/resume (2013-04-16 19:00:01 -0700) are available in the git repository at: git://git.infradead.org/battery-2.6.git tags/for-v3.10-fixes for you to fetch changes up to dccab6092d3c25bf943d12fb658e63fd88bf8b4a: pm2301_charger: Fix module alias prefix (2013-05-10 11:57:14 -0700) Axel Lin (2): wm831x_backup: Fix wrong kfree call for devdata-backup.name pm2301_charger: Fix module alias prefix Randy Dunlap (1): lp8788-charger: Fix kconfig dependency Xiong Zhou (1): bq27x00: Fix I2C dependency in KConfig drivers/power/Kconfig | 2 ++ drivers/power/pm2301_charger.c | 2 +- drivers/power/wm831x_backup.c | 1 - 3 files changed, 3 insertions(+), 2 deletions(-) commit dccab6092d3c25bf943d12fb658e63fd88bf8b4a Author: Axel Lin axel@ingics.com Date: Sat May 4 18:51:09 2013 +0800 pm2301_charger: Fix module alias prefix This driver is a i2c driver, use i2c rather than platform prefix for module alias. Signed-off-by: Axel Lin axel@ingics.com Signed-off-by: Anton Vorontsov an...@enomsg.org diff --git a/drivers/power/pm2301_charger.c b/drivers/power/pm2301_charger.c index f123f3c..e9c6ba0 100644 --- a/drivers/power/pm2301_charger.c +++ b/drivers/power/pm2301_charger.c @@ -1269,5 +1269,5 @@ module_exit(pm2xxx_charger_exit); MODULE_LICENSE(GPL v2); MODULE_AUTHOR(Rajkumar kasirajan, Olivier Launay); -MODULE_ALIAS(platform:pm2xxx-charger); +MODULE_ALIAS(i2c:pm2xxx-charger); MODULE_DESCRIPTION(PM2xxx charger management driver); commit c909fc8573af3cff9184551e79cf37784b5ddc24 Author: Axel Lin axel@ingics.com Date: Sat May 4 13:57:55 2013 +0800 wm831x_backup: Fix wrong kfree call for devdata-backup.name devdata-backup.name points to devdata-name, the memory for devdata-name is part of struct wm831x_backup. Thus remove kfree call for devdata-backup.name. Signed-off-by: Axel Lin axel@ingics.com Acked-by: Mark Brown broo...@opensource.wolfsonmicro.com Signed-off-by: Anton Vorontsov an...@enomsg.org diff --git a/drivers/power/wm831x_backup.c b/drivers/power/wm831x_backup.c index 58cbb00..56fb509 100644 --- a/drivers/power/wm831x_backup.c +++ b/drivers/power/wm831x_backup.c @@ -207,7 +207,6 @@ static int wm831x_backup_remove(struct platform_device *pdev) struct wm831x_backup *devdata = platform_get_drvdata(pdev); power_supply_unregister(devdata-backup); - kfree(devdata-backup.name); return 0; } commit a2d0dbb4b55681874c5f288538ae55ae69baeaff Author: Xiong Zhou jencce.ker...@gmail.com Date: Tue May 7 10:15:56 2013 +0800 bq27x00: Fix I2C dependency in KConfig This patch fixes build failure(randconfig) of next-20130501. When config I2C as m, BATTERY_BQ27x00 as y, here comes the failure. The driver depends on I2C only if I2C is not disabled, as Lars commented. Last version of this patch make the driver depend on I2C unconditionally. Failure message: drivers/built-in.o: In function `bq27x00_read_i2c': bq27x00_battery.c:(.text+0x1082a7): undefined reference to `i2c_transfer' drivers/built-in.o: In function `bq27x00_battery_init': bq27x00_battery.c:(.init.text+0x6085): undefined reference to `i2c_register_driver' bq27x00_battery.c:(.init.text+0x60c7): undefined reference to `i2c_del_driver' drivers/built-in.o: In function `bq27x00_battery_exit': bq27x00_battery.c:(.exit.text+0xbf0): undefined reference to `i2c_del_driver' make: *** [vmlinux] Error 1 Signed-off-by: Xiong Zhou jencce.ker...@gmail.com Cc: Lars-Peter Clausen l...@metafoo.de Signed-off-by: Anton Vorontsov an...@enomsg.org diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig index 814bcb9..674e633 100644 --- a/drivers/power/Kconfig +++ b/drivers/power/Kconfig @@ -152,6 +152,7 @@ config BATTERY_SBS config BATTERY_BQ27x00 tristate BQ27x00 battery driver + depends on I2C || I2C=n help Say Y here to enable support for batteries with BQ27x00 (I2C/HDQ) chips. commit 237a1b01fdb29df6a28d50d6dbe7a988c4fb3625 Author: Randy Dunlap rdun...@infradead.org Date: Wed May 1 12:18:43 2013 -0700 lp8788-charger: Fix kconfig dependency Fix build errors in lp8788-charger by making it depend on IIO. Fixes errors when CONFIG_IIO=m and CHARGER_LP8788=y. lp8788-charger.c:(.text+0x2146b5): undefined reference to `iio_channel_get' lp8788-charger.c:(.text+0x2146ce): undefined reference to `iio_channel_get' lp8788-charger.c:(.text+0x214a86): undefined reference to
Re: [GIT PULL] battery-2.6.git
On Sun, May 26, 2013 at 12:23:32AM +0100, David Woodhouse wrote: On Sat, 2013-05-25 at 15:23 -0700, Anton Vorontsov wrote: Please pull battery-2.6 git tree to get a few one-liners: wrong kfree usage fix, module alias fixup and kconfig adjustments. The patches really small, so for convenience I inline them here. Please note git.infradead.org has just been migrated to a virtual machine, and was rebooted once or twice after this pull request was sent. We don't anticipate any more reboots imminently. The new IP address (2001:1868:205::9, or 198.137.202.9 for those stuck in the 20th century) should have propagated in DNS already and the migration should theoretically be fairly seamless. But please let me know if anything goes wrong. It will be moving again, onto real hardware once it becomes available, hopefully in the next week or so. It will retain the same IP addresses. Thanks a lot for your efforts and letting us know, David! Anton -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [GIT PULL] battery-2.6.git
On Sat, 2013-05-25 at 15:23 -0700, Anton Vorontsov wrote: Please pull battery-2.6 git tree to get a few one-liners: wrong kfree usage fix, module alias fixup and kconfig adjustments. The patches really small, so for convenience I inline them here. Please note git.infradead.org has just been migrated to a virtual machine, and was rebooted once or twice after this pull request was sent. We don't anticipate any more reboots imminently. The new IP address (2001:1868:205::9, or 198.137.202.9 for those stuck in the 20th century) should have propagated in DNS already and the migration should theoretically be fairly seamless. But please let me know if anything goes wrong. It will be moving again, onto real hardware once it becomes available, hopefully in the next week or so. It will retain the same IP addresses. -- dwmw2 smime.p7s Description: S/MIME cryptographic signature
[GIT PULL] battery-2.6.git
Hello Linus,
Please pull battery-2.6 git tree to receive changes queued for v3.10. Here
are some highlights for this merge cycle:
- OpenFirmware/DeviceTree support for the Power Supply core: the core now
automatically populates supplied_from hierarchy from the device tree.
With these patches chargers and batteries can now lookup each other
without the board files support shim. Rhyland Klein at NVIDIA did the
work;
- New ST-Ericsson ABX500 hwmon driver. The driver is heavily using the
AB85xx core and depends on some recent changes to it, so that is why the
driver comes through the battery tree. It has an appropriate ack from
the hwmon maintainer (i.e. Guenter Roeck). Martin Persson at ST-Ericsson
and Hongbo Zhang at Linaro authored the driver;
- Final bits to sync AB85xx ST-Ericsson changes into mainline. The changes
touch mfd parts, but these were acked by the appropriate MFD maintainer
(i.e. Samuel Ortiz). Lee Jones at Linaro did most of the work and lead
the submission process.
Minor changes, but still worth mentioning:
- Battery temperature reporting fix for Nokia N900 phones;
- Versatile Express poweroff driver moved into drivers/power/reset/.
- Tree-wise: use devm_kzalloc() where appropriate;
- Tree-wise: dev_pm_ops cleanups/fixes.
Thanks!
Anton
The following changes since commit 8bb9660418e05bb1845ac1a2428444d78e322cc7:
Linux 3.9-rc4 (2013-03-23 16:52:44 -0700)
are available in the git repository at:
git://git.infradead.org/battery-2.6.git tags/for-v3.10
for you to fetch changes up to 6b170807cd5cac8dc6353f47a88ccb14bbf76c4f:
pm2301-charger: Fix suspend/resume (2013-04-16 19:00:01 -0700)
Andrei Epure (1):
charger-manager: Use kmemdup instead of kzalloc + memcpy
Andrey Gelman (1):
test_power: Fix a bug in setting module parameter values
Anton Vorontsov (3):
Merge branch 'for-mfd-and-power' of
git://git.linaro.org/people/ljones/linux-3.0-ux500
Merge branch 'urgent'
Merge branch 'vexpress' of git://git.kernel.org/.../cmarinas/linux-aarch64
Catalin Marinas (2):
arm: vexpress: Move the poweroff/restart code to drivers/power/reset
arm: vexpress: Decouple vexpress-poweroff implementation from machine_desc
Daniel WILLERUD (1):
mfd: ab8500-gpadc: Implemented suspend/resume
Dariusz Szymczak (1):
mfd: ab8500-core: Hierarchical interrupt registers
Hakan Berg (3):
ab8500-btemp: Filter btemp readings
ab8500-fg: Allow capacity to raise from 1% when charging
ab8500-charger: Add AB8505_USB_LINK_STATUS
Hongbo Zhang (5):
ab8500_btemp: Make ab8500_btemp_get* interfaces public
ab8500_bmdata: Eliminate CamelCase warning of some variables
ab8500_{bmdata,fg}: Add const attributes to some data arrays
ab8500_bmdata: Export abx500_res_to_temp tables for hwmon
hwmon: Add ST-Ericsson ABX500 hwmon driver
Jingoo Han (15):
twl4030_charger: Use module_platform_driver_probe()
wm831x_backup: Use devm_kzalloc()
88pm860x_charger: Drop kfree of devm_kzalloc'd data
rx51_battery: Use devm_kzalloc()
pcf50633-charger: Use devm_kzalloc()
max8998_charger: Use devm_kzalloc()
max8997_charger: Use devm_kzalloc()
max8903_charger: Use devm_kzalloc()
isp1704_charger: Use devm_kzalloc()
gpio-charger: Use devm_kzalloc()
ds2780_battery: Use devm_kzalloc()
ds2760_battery: Use devm_kzalloc()
da9052-battery: Use devm_kzalloc()
da9030_battery: Use devm_kzalloc()
max8925_power: Use devm_kzalloc()
Jonas Aaberg (3):
mfd: ab8500-gpadc: Reread on failure
mfd: ab8500-debug: Better error handling on crash
mfd: ab8500-debug: Add wake-up info
Kim, Milo (1):
lp8788-charger: Use PAGE_SIZE for the sysfs read operation
Lars-Peter Clausen (5):
pm2301_charger: Remove __dev* annotations
ds2782_battery: Use dev_pm_ops
max17040_battery: Use dev_pm_ops
sbs-battery: Use dev_pm_ops
pm2301-charger: Fix suspend/resume
Lee Jones (33):
mfd: ab8500-gpadc: Add gpadc hw conversion
mfd: ab8500-core: APE Interrupts are not cleared
mfd: ab8500-debug: Function to save all ABB registers to mem
mfd: ab8500-core: Add ADC support for ab8540
mfd: ab8500-core: Rework MFD sub-device initialisation structures
mfd: ab8500-core: Add Interrupt support for ab8540
mfd: ab8500-debugfs: Add tests for ab8540 based platform initialisations
mfd: ab8500-debug: Add support for ab8505 and ab9540
mfd: ab8500-sysctrl: Add new reset function
mfd: ab8500-gpadc: Add support for the AB8540
mfd: ab8500-debug: Add support for the AB8540
mfd: ab8500-gpadc: Optimise GPADC driver
mfd: ab8500-core: Add additional resources to ab8505_iddet_resources
mfd: ab8500-debugfs: Dump sim registers
mfd: ab8500-debug: Add ADC input channel usb_id in debugfs
mfd:
[GIT PULL] battery-2.6.git
Hello Linus,
Please pull battery-2.6 git tree to receive changes queued for v3.10. Here
are some highlights for this merge cycle:
- OpenFirmware/DeviceTree support for the Power Supply core: the core now
automatically populates supplied_from hierarchy from the device tree.
With these patches chargers and batteries can now lookup each other
without the board files support shim. Rhyland Klein at NVIDIA did the
work;
- New ST-Ericsson ABX500 hwmon driver. The driver is heavily using the
AB85xx core and depends on some recent changes to it, so that is why the
driver comes through the battery tree. It has an appropriate ack from
the hwmon maintainer (i.e. Guenter Roeck). Martin Persson at ST-Ericsson
and Hongbo Zhang at Linaro authored the driver;
- Final bits to sync AB85xx ST-Ericsson changes into mainline. The changes
touch mfd parts, but these were acked by the appropriate MFD maintainer
(i.e. Samuel Ortiz). Lee Jones at Linaro did most of the work and lead
the submission process.
Minor changes, but still worth mentioning:
- Battery temperature reporting fix for Nokia N900 phones;
- Versatile Express poweroff driver moved into drivers/power/reset/.
- Tree-wise: use devm_kzalloc() where appropriate;
- Tree-wise: dev_pm_ops cleanups/fixes.
Thanks!
Anton
The following changes since commit 8bb9660418e05bb1845ac1a2428444d78e322cc7:
Linux 3.9-rc4 (2013-03-23 16:52:44 -0700)
are available in the git repository at:
git://git.infradead.org/battery-2.6.git tags/for-v3.10
for you to fetch changes up to 6b170807cd5cac8dc6353f47a88ccb14bbf76c4f:
pm2301-charger: Fix suspend/resume (2013-04-16 19:00:01 -0700)
Andrei Epure (1):
charger-manager: Use kmemdup instead of kzalloc + memcpy
Andrey Gelman (1):
test_power: Fix a bug in setting module parameter values
Anton Vorontsov (3):
Merge branch 'for-mfd-and-power' of
git://git.linaro.org/people/ljones/linux-3.0-ux500
Merge branch 'urgent'
Merge branch 'vexpress' of git://git.kernel.org/.../cmarinas/linux-aarch64
Catalin Marinas (2):
arm: vexpress: Move the poweroff/restart code to drivers/power/reset
arm: vexpress: Decouple vexpress-poweroff implementation from machine_desc
Daniel WILLERUD (1):
mfd: ab8500-gpadc: Implemented suspend/resume
Dariusz Szymczak (1):
mfd: ab8500-core: Hierarchical interrupt registers
Hakan Berg (3):
ab8500-btemp: Filter btemp readings
ab8500-fg: Allow capacity to raise from 1% when charging
ab8500-charger: Add AB8505_USB_LINK_STATUS
Hongbo Zhang (5):
ab8500_btemp: Make ab8500_btemp_get* interfaces public
ab8500_bmdata: Eliminate CamelCase warning of some variables
ab8500_{bmdata,fg}: Add const attributes to some data arrays
ab8500_bmdata: Export abx500_res_to_temp tables for hwmon
hwmon: Add ST-Ericsson ABX500 hwmon driver
Jingoo Han (15):
twl4030_charger: Use module_platform_driver_probe()
wm831x_backup: Use devm_kzalloc()
88pm860x_charger: Drop kfree of devm_kzalloc'd data
rx51_battery: Use devm_kzalloc()
pcf50633-charger: Use devm_kzalloc()
max8998_charger: Use devm_kzalloc()
max8997_charger: Use devm_kzalloc()
max8903_charger: Use devm_kzalloc()
isp1704_charger: Use devm_kzalloc()
gpio-charger: Use devm_kzalloc()
ds2780_battery: Use devm_kzalloc()
ds2760_battery: Use devm_kzalloc()
da9052-battery: Use devm_kzalloc()
da9030_battery: Use devm_kzalloc()
max8925_power: Use devm_kzalloc()
Jonas Aaberg (3):
mfd: ab8500-gpadc: Reread on failure
mfd: ab8500-debug: Better error handling on crash
mfd: ab8500-debug: Add wake-up info
Kim, Milo (1):
lp8788-charger: Use PAGE_SIZE for the sysfs read operation
Lars-Peter Clausen (5):
pm2301_charger: Remove __dev* annotations
ds2782_battery: Use dev_pm_ops
max17040_battery: Use dev_pm_ops
sbs-battery: Use dev_pm_ops
pm2301-charger: Fix suspend/resume
Lee Jones (33):
mfd: ab8500-gpadc: Add gpadc hw conversion
mfd: ab8500-core: APE Interrupts are not cleared
mfd: ab8500-debug: Function to save all ABB registers to mem
mfd: ab8500-core: Add ADC support for ab8540
mfd: ab8500-core: Rework MFD sub-device initialisation structures
mfd: ab8500-core: Add Interrupt support for ab8540
mfd: ab8500-debugfs: Add tests for ab8540 based platform initialisations
mfd: ab8500-debug: Add support for ab8505 and ab9540
mfd: ab8500-sysctrl: Add new reset function
mfd: ab8500-gpadc: Add support for the AB8540
mfd: ab8500-debug: Add support for the AB8540
mfd: ab8500-gpadc: Optimise GPADC driver
mfd: ab8500-core: Add additional resources to ab8505_iddet_resources
mfd: ab8500-debugfs: Dump sim registers
mfd: ab8500-debug: Add ADC input channel usb_id in debugfs
mfd:
[GIT PULL] battery-2.6.git
Hello Linus, Here is a battery/power_supply queue for v3.9. There are two tags: for-v3.9 and for-v3.9-merged. The second one is exactly the same as the first one, except that in the -merged tag I merged v3.8 back into battery tree to fix some conflicts so that you wouldn't need to do it. Highlights (included in tag message): - Four new drivers: o goldfish_battery: This is Android Emulator battery driver. Originally from Google, but Intel folks reshaped it for mainline; o pm2301_charger: A new driver for ST-Ericsson 2301 Power Management chip, uses AB8500 battery management core; o qnap-poweroff: The driver adds poweroff functionality for QNAP NAS boxes; o restart-poweroff: A generic driver that implements 'power off by restarting'. The actual poweroff functionality is implemented through a bootloader, so Linux' task is just to restart the box. The driver is useful on Buffalo Linkstation LS-XHL and LS-CHLv2 boards. Andrew Lunn worked on submitting the driver (as well as qnap-poweroff above). - A lot of fixes for ab8500 drivers. This is a part of efforts of syncing internal ST-Ericsson development tree with the mainline. Lee Jones @ Linaro worked on compilation and reshaping these series; - New health properties for the power supplies: "Watchdog timer expire" and "Safety timer expire"; - As usual, a bunch of fixes/cleanups here and there. Please pull. Thanks! The following changes since commit 19f949f52599ba7c3f67a5897ac6be14bfcb1200: Linux 3.8 (2013-02-18 15:58:34 -0800) are available in the git repository at: git://git.infradead.org/battery-2.6.git tags/for-v3.9-merged for you to fetch changes up to 845e37e009281b63fe15348f37bd7f815ea65da0: Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux (2013-02-18 22:55:13 -0800) Andrew Lunn (3): power/reset: Add a new driver to turn QNAP board power off power/reset: Add a new driver implementing 'power off by restarting' qnap-poweroff: Fix license string Anton Vorontsov (4): Merge branch 'for-anton' of git://git.linaro.org/people/ljones/linux-3.0-ux500 Merge branch 'ab8500-from-Rajanikanth' Merge branch 'tb-power-2' of git://git.linaro.org/people/ljones/linux-3.0-ux500 Merge git://git.kernel.org/.../torvalds/linux Chanwoo Choi (1): charger-manager: Split _probe funtion to make the code more clean Dan Carpenter (2): lp8727_charger: Small cleanup in naming generic-adc-battery: Fix forever loop in gab_remove() Devendra Naga (1): max17040_battery: Use devm_kzalloc Evgeny Romanov (1): ds2782_battery: Add power_supply_changed() calls for proper uevent support Hakan Berg (5): ab8500_btemp: Ignore false btemp low interrupt ab8500_bm: Adds support for Car/Travel Adapters ab8500_btemp: Remove superfluous BTEMP thermal comp ab8500_fg: Added support for BATT_OVV ab8500-fg: Adjust for RF bursts voltage drops Heiko Carstens (1): goldfish_battery: Add missing GENERIC_HARDIRQS dependency Henrik Sölver (1): ab8500-charger: AB workaround for invalid charger Johan Bjornstedt (2): ab8500_charger: Charger current step-up/down ab8500_bm: Skip first CCEOC irq for instant current Jonas Aaberg (5): ab8500_btemp: Detect battery type in workqueue ab8500_fg: Replace msleep() with usleep_range() for greater accuracy ab8500_charger: Handle gpadc errors ab8500-bm: Flush all work queues before suspending ab8500-charger: Do not touch VBUSOVV bits Julia Lawall (1): 88pm860x_battery: Eliminate possible references to released resources Kalle Komierowski (1): ab8500_fg: Don't clear the CCMuxOffset bit Kim, Milo (4): MAINTAINERS: Add LP8727 charger driver entry MAINTAINERS: Add LP8788 MFD driver entry lp8788-charger: Fix a parent device in _probe() lp8788-charger: Fix a parent device in kernel messages Lee Jones (19): ab8500_btemp: Fix crazy tabbing implementation ab8500-bmdata: Re-jiggle bmdevs_of_probe to be more succinct ab8500_bm: Rename battery management platform data to something more logical ab8500_bm: Always send platform specific battery information via pdata ab8500_btemp: Reorder obtainment of platform specific battery management data ab8500_charger: Reorder obtainment of platform specific battery management data ab8500_fg: Reorder obtainment of platform specific battery management data abx500_chargalg: Reorder obtainment of platform specific battery management data ab8500_bm: Make the battery Device Tree node reference less cryptic ab8500_charger: Detect charger removal ab8500_btemp: Allign battery temperature resolution with the framework ab8500_fg: Remove pointless round_jiffies() call ab8500-charger: Kick watchdog ab8500-chargalg: Update
[GIT PULL] battery-2.6.git
Hello Linus, Here is a battery/power_supply queue for v3.9. There are two tags: for-v3.9 and for-v3.9-merged. The second one is exactly the same as the first one, except that in the -merged tag I merged v3.8 back into battery tree to fix some conflicts so that you wouldn't need to do it. Highlights (included in tag message): - Four new drivers: o goldfish_battery: This is Android Emulator battery driver. Originally from Google, but Intel folks reshaped it for mainline; o pm2301_charger: A new driver for ST-Ericsson 2301 Power Management chip, uses AB8500 battery management core; o qnap-poweroff: The driver adds poweroff functionality for QNAP NAS boxes; o restart-poweroff: A generic driver that implements 'power off by restarting'. The actual poweroff functionality is implemented through a bootloader, so Linux' task is just to restart the box. The driver is useful on Buffalo Linkstation LS-XHL and LS-CHLv2 boards. Andrew Lunn worked on submitting the driver (as well as qnap-poweroff above). - A lot of fixes for ab8500 drivers. This is a part of efforts of syncing internal ST-Ericsson development tree with the mainline. Lee Jones @ Linaro worked on compilation and reshaping these series; - New health properties for the power supplies: Watchdog timer expire and Safety timer expire; - As usual, a bunch of fixes/cleanups here and there. Please pull. Thanks! The following changes since commit 19f949f52599ba7c3f67a5897ac6be14bfcb1200: Linux 3.8 (2013-02-18 15:58:34 -0800) are available in the git repository at: git://git.infradead.org/battery-2.6.git tags/for-v3.9-merged for you to fetch changes up to 845e37e009281b63fe15348f37bd7f815ea65da0: Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux (2013-02-18 22:55:13 -0800) Andrew Lunn (3): power/reset: Add a new driver to turn QNAP board power off power/reset: Add a new driver implementing 'power off by restarting' qnap-poweroff: Fix license string Anton Vorontsov (4): Merge branch 'for-anton' of git://git.linaro.org/people/ljones/linux-3.0-ux500 Merge branch 'ab8500-from-Rajanikanth' Merge branch 'tb-power-2' of git://git.linaro.org/people/ljones/linux-3.0-ux500 Merge git://git.kernel.org/.../torvalds/linux Chanwoo Choi (1): charger-manager: Split _probe funtion to make the code more clean Dan Carpenter (2): lp8727_charger: Small cleanup in naming generic-adc-battery: Fix forever loop in gab_remove() Devendra Naga (1): max17040_battery: Use devm_kzalloc Evgeny Romanov (1): ds2782_battery: Add power_supply_changed() calls for proper uevent support Hakan Berg (5): ab8500_btemp: Ignore false btemp low interrupt ab8500_bm: Adds support for Car/Travel Adapters ab8500_btemp: Remove superfluous BTEMP thermal comp ab8500_fg: Added support for BATT_OVV ab8500-fg: Adjust for RF bursts voltage drops Heiko Carstens (1): goldfish_battery: Add missing GENERIC_HARDIRQS dependency Henrik Sölver (1): ab8500-charger: AB workaround for invalid charger Johan Bjornstedt (2): ab8500_charger: Charger current step-up/down ab8500_bm: Skip first CCEOC irq for instant current Jonas Aaberg (5): ab8500_btemp: Detect battery type in workqueue ab8500_fg: Replace msleep() with usleep_range() for greater accuracy ab8500_charger: Handle gpadc errors ab8500-bm: Flush all work queues before suspending ab8500-charger: Do not touch VBUSOVV bits Julia Lawall (1): 88pm860x_battery: Eliminate possible references to released resources Kalle Komierowski (1): ab8500_fg: Don't clear the CCMuxOffset bit Kim, Milo (4): MAINTAINERS: Add LP8727 charger driver entry MAINTAINERS: Add LP8788 MFD driver entry lp8788-charger: Fix a parent device in _probe() lp8788-charger: Fix a parent device in kernel messages Lee Jones (19): ab8500_btemp: Fix crazy tabbing implementation ab8500-bmdata: Re-jiggle bmdevs_of_probe to be more succinct ab8500_bm: Rename battery management platform data to something more logical ab8500_bm: Always send platform specific battery information via pdata ab8500_btemp: Reorder obtainment of platform specific battery management data ab8500_charger: Reorder obtainment of platform specific battery management data ab8500_fg: Reorder obtainment of platform specific battery management data abx500_chargalg: Reorder obtainment of platform specific battery management data ab8500_bm: Make the battery Device Tree node reference less cryptic ab8500_charger: Detect charger removal ab8500_btemp: Allign battery temperature resolution with the framework ab8500_fg: Remove pointless round_jiffies() call ab8500-charger: Kick watchdog ab8500-chargalg: Update
[GIT PULL] battery-2.6.git
Hello Linus, Here are a few updates and new drivers queued for v3.8. All the patches were sitting in the -next tree for awhile, except for the last merge commit -- I made it a few hours ago just to fix some conflicts, so that you won't have to bother. Highlights for this pull: - Two new drivers from Pali Rohár and N900 hackers: rx51_battery and bq2415x_charger. The drivers are a part of a solution to replace the proprietary Nokia BME stack; - Power supply core now registers devices with a thermal cooling subsystem, so we can now automatically throttle charging. Thanks to Ramakrishna Pallala! - Device tree support for ab8500 and max8925_power drivers; - Random fixups and enhancements for a bunch of drivers. Thanks! The following changes since commit 1ebaf4f4e6912199f8a4e30ba3ab55da2b71bcdf: Merge branch 'x86-timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (2012-12-11 20:01:33 -0800) are available in the git repository at: git://git.infradead.org/battery-2.6.git tags/for-v3.8-merged for you to fetch changes up to 76d8a23b127020472207b281427d3e9f4f1227e4: Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux (2012-12-11 22:15:57 -0800) Alan Cox (1): max17042_battery: Fix missing verify_model_lock() return value check Anton Vorontsov (3): bq2415x_charger: Add Kconfig/Makefile entries bq2415x_charger: Fix style issues Merge git://git.kernel.org/.../torvalds/linux Axel Lin (1): generic-adc-battery: Fix checking return value of request_any_context_irq Dan Carpenter (2): generic-adc-battery: Pointer math issue in gab_probe() ds2782_battery: Fix signedness bug in ds278x_read_reg16() Kim, Milo (3): lp8788-charger: Use consumer device name on setting IIO channels lp8788-charger: Fix wrong ADC conversion lp8788-charger: Fix ADC channel names Marcos Paulo de Souza (2): jz4740-battery: Use devm_kzalloc jz4740-battery: Use devm_request_and_ioremap Pali Rohár (3): power_supply: Add new Nokia RX-51 (N900) power supply battery driver power_supply: Add bq2415x charger driver bq27x00_battery: Fixup nominal available capacity reporting Peter Ujfalusi (1): twl4030_charger: Change TWL4030_MODULE_* ids to TWL_MODULE_* Qing Xu (1): max8925_power: Add support for device-tree initialization Rajanikanth H.V (4): ab8500: Add devicetree support for fuelgauge ab8500: Add devicetree support for btemp ab8500: Add devicetree support for charger ab8500: Add devicetree support for chargalg Ramakrishna Pallala (2): power_supply: Add support for CHARGE_CONTROL_* attributes power_supply: Register power supply for thermal cooling device Documentation/devicetree/bindings/mfd/ab8500.txt | 27 +- Documentation/devicetree/bindings/power_supply/ab8500/btemp.txt | 16 + .../devicetree/bindings/power_supply/ab8500/chargalg.txt | 16 + .../devicetree/bindings/power_supply/ab8500/charger.txt | 25 + Documentation/devicetree/bindings/power_supply/ab8500/fg.txt | 58 + Documentation/power/power_supply_class.txt |3 + arch/arm/boot/dts/dbx5x0.dtsi| 28 +- drivers/mfd/ab8500-core.c| 20 + drivers/power/Kconfig| 23 +- drivers/power/Makefile |4 +- drivers/power/ab8500_bmdata.c| 521 + drivers/power/ab8500_btemp.c | 77 +- drivers/power/ab8500_charger.c | 84 +- drivers/power/ab8500_fg.c| 82 +- drivers/power/abx500_chargalg.c | 56 +- drivers/power/bq2415x_charger.c | 1670 drivers/power/bq27x00_battery.c |8 + drivers/power/ds2782_battery.c |4 +- drivers/power/generic-adc-battery.c |5 +- drivers/power/jz4740-battery.c | 45 +- drivers/power/lp8788-charger.c | 75 +- drivers/power/max17042_battery.c |3 +- drivers/power/max8925_power.c| 51 +- drivers/power/power_supply_core.c| 96 ++ drivers/power/power_supply_sysfs.c |2 + drivers/power/rx51_battery.c | 251 + drivers/power/twl4030_charger.c | 12 +- include/linux/mfd/abx500.h | 34 +-
[GIT PULL] battery-2.6.git
Hello Linus, Here are a few updates and new drivers queued for v3.8. All the patches were sitting in the -next tree for awhile, except for the last merge commit -- I made it a few hours ago just to fix some conflicts, so that you won't have to bother. Highlights for this pull: - Two new drivers from Pali Rohár and N900 hackers: rx51_battery and bq2415x_charger. The drivers are a part of a solution to replace the proprietary Nokia BME stack; - Power supply core now registers devices with a thermal cooling subsystem, so we can now automatically throttle charging. Thanks to Ramakrishna Pallala! - Device tree support for ab8500 and max8925_power drivers; - Random fixups and enhancements for a bunch of drivers. Thanks! The following changes since commit 1ebaf4f4e6912199f8a4e30ba3ab55da2b71bcdf: Merge branch 'x86-timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (2012-12-11 20:01:33 -0800) are available in the git repository at: git://git.infradead.org/battery-2.6.git tags/for-v3.8-merged for you to fetch changes up to 76d8a23b127020472207b281427d3e9f4f1227e4: Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux (2012-12-11 22:15:57 -0800) Alan Cox (1): max17042_battery: Fix missing verify_model_lock() return value check Anton Vorontsov (3): bq2415x_charger: Add Kconfig/Makefile entries bq2415x_charger: Fix style issues Merge git://git.kernel.org/.../torvalds/linux Axel Lin (1): generic-adc-battery: Fix checking return value of request_any_context_irq Dan Carpenter (2): generic-adc-battery: Pointer math issue in gab_probe() ds2782_battery: Fix signedness bug in ds278x_read_reg16() Kim, Milo (3): lp8788-charger: Use consumer device name on setting IIO channels lp8788-charger: Fix wrong ADC conversion lp8788-charger: Fix ADC channel names Marcos Paulo de Souza (2): jz4740-battery: Use devm_kzalloc jz4740-battery: Use devm_request_and_ioremap Pali Rohár (3): power_supply: Add new Nokia RX-51 (N900) power supply battery driver power_supply: Add bq2415x charger driver bq27x00_battery: Fixup nominal available capacity reporting Peter Ujfalusi (1): twl4030_charger: Change TWL4030_MODULE_* ids to TWL_MODULE_* Qing Xu (1): max8925_power: Add support for device-tree initialization Rajanikanth H.V (4): ab8500: Add devicetree support for fuelgauge ab8500: Add devicetree support for btemp ab8500: Add devicetree support for charger ab8500: Add devicetree support for chargalg Ramakrishna Pallala (2): power_supply: Add support for CHARGE_CONTROL_* attributes power_supply: Register power supply for thermal cooling device Documentation/devicetree/bindings/mfd/ab8500.txt | 27 +- Documentation/devicetree/bindings/power_supply/ab8500/btemp.txt | 16 + .../devicetree/bindings/power_supply/ab8500/chargalg.txt | 16 + .../devicetree/bindings/power_supply/ab8500/charger.txt | 25 + Documentation/devicetree/bindings/power_supply/ab8500/fg.txt | 58 + Documentation/power/power_supply_class.txt |3 + arch/arm/boot/dts/dbx5x0.dtsi| 28 +- drivers/mfd/ab8500-core.c| 20 + drivers/power/Kconfig| 23 +- drivers/power/Makefile |4 +- drivers/power/ab8500_bmdata.c| 521 + drivers/power/ab8500_btemp.c | 77 +- drivers/power/ab8500_charger.c | 84 +- drivers/power/ab8500_fg.c| 82 +- drivers/power/abx500_chargalg.c | 56 +- drivers/power/bq2415x_charger.c | 1670 drivers/power/bq27x00_battery.c |8 + drivers/power/ds2782_battery.c |4 +- drivers/power/generic-adc-battery.c |5 +- drivers/power/jz4740-battery.c | 45 +- drivers/power/lp8788-charger.c | 75 +- drivers/power/max17042_battery.c |3 +- drivers/power/max8925_power.c| 51 +- drivers/power/power_supply_core.c| 96 ++ drivers/power/power_supply_sysfs.c |2 + drivers/power/rx51_battery.c | 251 + drivers/power/twl4030_charger.c | 12 +- include/linux/mfd/abx500.h | 34 +-
[GIT PULL] battery-2.6.git
Hello Linus, Here are some battery tree updates for 3.7... The following changes since commit 0848c94fb4a5cc213a7fb0fb3a5721ad6e16f096: mfd: core: Push irqdomain mapping out into devices (2012-09-15 23:22:04 +0200) are available in the git repository at: git://git.infradead.org/battery-2.6.git tags/for-v3.7 for you to fetch changes up to 18766f0936d444fd7ff2e0064bd6e69a89d5c6fc: Merge with upstream to accommodate with MFD changes (2012-09-24 19:12:01 -0700) 1. New drivers: - Marvell 88pm860x charger and battery drivers; - Texas Instruments LP8788 charger driver; 2. Two new power supply properties: whether a battery is authentic, and chargers' maximal currents and voltages; 3. A lot of TI LP8727 Charger cleanups; 4. New features for Charger Manager, mainly now we can disable specific regulators; 5. Random fixes and cleanups for other drivers. Anton Vorontsov (5): da9052-battery: Fix da9052_determine_vc_tbl_index's return value da9030_battery: Don't use 0 as NULL charger-manager: Fix struct charger_desc's misleading comment 88pm860x_battery and charger: Fix a few post-merge issues Merge with upstream to accommodate with MFD changes Axel Lin (1): power_supply: Remove broken mark for da9052-battery Chanwoo Choi (5): charger-manager: Disable regulator when charger cable is detached charger-manager: Use replacement variable to check state of battery charger-manager: Check fully charged state of battery periodically charger-manager: Support limit of maximum possible charger-manager: Add support sysfs entry for charger Dan Carpenter (1): da9052-battery: Don't free IRQ that wasn't requested Devendra Naga (3): lp8727_charger: Unregister power supply at error path of lp8727_register_psy ds2781_battery: Convert to module_platform_driver ds2781_battery: Replace call to kzalloc with devm_kzalloc Fengguang Wu (2): lp8727_charger: Use IRQF_ONESHOT twl4030_charger: Use IRQF_ONESHOT Il Han (1): twl4030_charger: It would be better not to use the 0b-prefix Jett.Zhou (1): power_supply: Enable battery-charger for 88pm860x Julia Lawall (5): ab8500_charger: Fix error return code wm97xx_battery: Fix error return code ab8500_btemp: Fix error return code ab8500_fg: Fix error return code bq27x00_battery: Fix error return code Kim, Milo (23): power_supply: Add new lp8788 charger driver lp8727_charger: Use devm_kzalloc() lp8727_charger: Cleanup _probe() and _remove() lp8727_charger: Fix buggy code of NULL pdata lp8727_charger: Add configurable debouce timer lp8727_charger: Remove unnecessary workqueue thread lp8727_charger: Clean up the interrupt handler lp8727_charger: Clear interrrupts at inital time lp8727_charger: Fix code for getting battery temp lp8727_charger: Use the definition rather than enum lp8727_charger: Clean up lp8727 definitions lp8727_charger: Use specific definition lp8727_charger: Clean up lp8727_is_charger_attached() lp8727_charger: Make lp8727_init_device() shorter lp8727_charger: Make lp8727_ctrl_switch() inline lp8727_charger: Make lp8727_charger_get_propery() simpler lp8727_charger: Return if the battery is discharging lp8727_charger: Clean up lp8727_charger_changed() lp8727_charger: Make some cosmetic changes in lp8727_delayed_func() lp8727_charger: Fix a typo - chg_parm to chg_param lp8727_charger: Add description in the private data lp8727_charger: Fix checkpatch warning lp8727_charger: More pure cosmetic improvements Olof Johansson (1): sbs-battery: Probe should try talking to the device Paul Parsons (2): pda_power: Fix ac_draw usage before it being set pda_power: Remove ac_draw_failed goto and label Ramakrishna Pallala (3): power_supply: Add new power supply AUTHENTIC property power_supply: Add new power supply properties CHARGE_CURRENT/VOLTAGE_MAX smb347-charger: Fix battery status reporting logic for charger faults Documentation/power/power_supply_class.txt |7 + drivers/mfd/88pm860x-core.c| 22 +- drivers/power/88pm860x_battery.c | 1041 ++ drivers/power/88pm860x_charger.c | 746 drivers/power/Kconfig | 20 +- drivers/power/Makefile |3 + drivers/power/ab8500_btemp.c |1 + drivers/power/ab8500_charger.c |1 + drivers/power/ab8500_fg.c |1 + drivers/power/bq27x00_battery.c|3 +- drivers/power/charger-manager.c| 434 - drivers/power/da9030_battery.c |4 +- drivers/power/da9052-battery.c
[GIT PULL] battery-2.6.git
Hello Linus, Here are some battery tree updates for 3.7... The following changes since commit 0848c94fb4a5cc213a7fb0fb3a5721ad6e16f096: mfd: core: Push irqdomain mapping out into devices (2012-09-15 23:22:04 +0200) are available in the git repository at: git://git.infradead.org/battery-2.6.git tags/for-v3.7 for you to fetch changes up to 18766f0936d444fd7ff2e0064bd6e69a89d5c6fc: Merge with upstream to accommodate with MFD changes (2012-09-24 19:12:01 -0700) 1. New drivers: - Marvell 88pm860x charger and battery drivers; - Texas Instruments LP8788 charger driver; 2. Two new power supply properties: whether a battery is authentic, and chargers' maximal currents and voltages; 3. A lot of TI LP8727 Charger cleanups; 4. New features for Charger Manager, mainly now we can disable specific regulators; 5. Random fixes and cleanups for other drivers. Anton Vorontsov (5): da9052-battery: Fix da9052_determine_vc_tbl_index's return value da9030_battery: Don't use 0 as NULL charger-manager: Fix struct charger_desc's misleading comment 88pm860x_battery and charger: Fix a few post-merge issues Merge with upstream to accommodate with MFD changes Axel Lin (1): power_supply: Remove broken mark for da9052-battery Chanwoo Choi (5): charger-manager: Disable regulator when charger cable is detached charger-manager: Use replacement variable to check state of battery charger-manager: Check fully charged state of battery periodically charger-manager: Support limit of maximum possible charger-manager: Add support sysfs entry for charger Dan Carpenter (1): da9052-battery: Don't free IRQ that wasn't requested Devendra Naga (3): lp8727_charger: Unregister power supply at error path of lp8727_register_psy ds2781_battery: Convert to module_platform_driver ds2781_battery: Replace call to kzalloc with devm_kzalloc Fengguang Wu (2): lp8727_charger: Use IRQF_ONESHOT twl4030_charger: Use IRQF_ONESHOT Il Han (1): twl4030_charger: It would be better not to use the 0b-prefix Jett.Zhou (1): power_supply: Enable battery-charger for 88pm860x Julia Lawall (5): ab8500_charger: Fix error return code wm97xx_battery: Fix error return code ab8500_btemp: Fix error return code ab8500_fg: Fix error return code bq27x00_battery: Fix error return code Kim, Milo (23): power_supply: Add new lp8788 charger driver lp8727_charger: Use devm_kzalloc() lp8727_charger: Cleanup _probe() and _remove() lp8727_charger: Fix buggy code of NULL pdata lp8727_charger: Add configurable debouce timer lp8727_charger: Remove unnecessary workqueue thread lp8727_charger: Clean up the interrupt handler lp8727_charger: Clear interrrupts at inital time lp8727_charger: Fix code for getting battery temp lp8727_charger: Use the definition rather than enum lp8727_charger: Clean up lp8727 definitions lp8727_charger: Use specific definition lp8727_charger: Clean up lp8727_is_charger_attached() lp8727_charger: Make lp8727_init_device() shorter lp8727_charger: Make lp8727_ctrl_switch() inline lp8727_charger: Make lp8727_charger_get_propery() simpler lp8727_charger: Return if the battery is discharging lp8727_charger: Clean up lp8727_charger_changed() lp8727_charger: Make some cosmetic changes in lp8727_delayed_func() lp8727_charger: Fix a typo - chg_parm to chg_param lp8727_charger: Add description in the private data lp8727_charger: Fix checkpatch warning lp8727_charger: More pure cosmetic improvements Olof Johansson (1): sbs-battery: Probe should try talking to the device Paul Parsons (2): pda_power: Fix ac_draw usage before it being set pda_power: Remove ac_draw_failed goto and label Ramakrishna Pallala (3): power_supply: Add new power supply AUTHENTIC property power_supply: Add new power supply properties CHARGE_CURRENT/VOLTAGE_MAX smb347-charger: Fix battery status reporting logic for charger faults Documentation/power/power_supply_class.txt |7 + drivers/mfd/88pm860x-core.c| 22 +- drivers/power/88pm860x_battery.c | 1041 ++ drivers/power/88pm860x_charger.c | 746 drivers/power/Kconfig | 20 +- drivers/power/Makefile |3 + drivers/power/ab8500_btemp.c |1 + drivers/power/ab8500_charger.c |1 + drivers/power/ab8500_fg.c |1 + drivers/power/bq27x00_battery.c|3 +- drivers/power/charger-manager.c| 434 - drivers/power/da9030_battery.c |4 +- drivers/power/da9052-battery.c
[GIT PULL] battery-2.6.git
Hello Linus,
It's almost a normal pull request: a bunch of small fixes and assorted
enhancements, and as usual my gpg key is not signed, etc.
One thing makes it unusual, though: one of our patches added thermal
support for power supply class, but thermal/ subsystem changed under our
feet. We (well, Stephen, that is) caught the issue and it was decided[1]
that I'd just delay the battery pull request, and then will fix it up by
merging your tree back into mine at the specific commit. And I did
exactly that.
That's not all though: another[2] small fixup for thermal subsystem was
needed to get rid of a warning in power supply subsystem (the warning
was not drivers/power's "fault", the thermal registration function just
needed a proper const annotation, which is also done by a small commit
on top of the merge.
So, to sum this up:
- The 'master' branch of the battery tree was in -next for weeks,
and was never rebased, altered etc;
- for-v3.6 tag contains the 'master' branch + merge + the warning fix.
Thanks!
[1] http://lkml.org/lkml/2012/6/19/23
[2] http://lkml.org/lkml/2012/6/18/28
The following changes since commit c56f5c0342dfee11a1a13d2f5bb7618de5b17590:
Thermal: Make Thermal trip points writeable (2012-07-24 23:17:20 -0400)
are available in the git repository at:
git://git.infradead.org/battery-2.6.git tags/for-v3.6
for you to fetch changes up to 4b1bf5871f7d59de6484cc887e205d6d2f1e6fbd:
thermal: Constify 'type' argument for the registration routine (2012-07-31
05:45:37 -0700)
Anton Vorontsov (3):
ds2781_battery: w1_ds2781_read() should be static
Merge with upstream to accommodate with thermal changes
thermal: Constify 'type' argument for the registration routine
Chanwoo Choi (3):
charger-manager: Use EXTCON Subsystem to detect charger cables for
charging
charger-manager: Set current limit of regulator for over current
protection
charger-manager: Fix build break related to EXTCON
Dmitry Eremin-Solenikov (2):
test_power: Add support for USB AC source
test_power: Add VOLTAGE_NOW and BATTERY_TEMP properties
Jenny TC (1):
power_supply: Register battery as a thermal zone
Kim, Milo (1):
lp8727_charger: Move header file into platform_data directory
Mark Brown (1):
pda_power: Complain if regulator operations fail
NeilBrown (3):
twl4030_charger: Fix some typos
twl4030_charger: Add backup-battery charging
twl4030_charger: Allow charger to control the regulator that feeds it
Nikolaus Voss (1):
sbs-battery: Don't trigger false supply_changed event
Pritesh Raithatha (1):
gpio-charger: Use cansleep version of gpio_set_value
Ramakrishna Pallala (4):
power_supply: Add constant charge_current and charge_voltage properties
smb347-charger: Add constant charge and current properties
max17042_battery: Support CHARGE_COUNTER power supply attribute
power_supply: Add min/max alert properties for CAPACITY, TEMP,
TEMP_AMBIENT
Richard A. Smith (2):
olpc-battery: Add VOLTAGE_MAX_DESIGN property
olpc-battery: update CHARGE_FULL_DESIGN property for BYD LiFe batteries
Saranya Gopal (1):
bq27x00_battery: Add support for BQ27425 chip
Syed Rafiuddin (1):
bq27x00_battery: Add support for power average and health properties
Documentation/power/power_supply_class.txt | 10 ++
drivers/mfd/twl-core.c |9 +-
drivers/power/Kconfig |1 +
drivers/power/bq27x00_battery.c| 155 +---
drivers/power/charger-manager.c| 152 ---
drivers/power/ds2781_battery.c |2 +-
drivers/power/gpio-charger.c |2 +-
drivers/power/lp8727_charger.c |2 +-
drivers/power/max17042_battery.c |8 ++
drivers/power/olpc_battery.c | 62 ++-
drivers/power/pda_power.c |4 +-
drivers/power/power_supply_core.c | 65
drivers/power/power_supply_sysfs.c |8 ++
drivers/power/sbs-battery.c|2 +-
drivers/power/smb347-charger.c | 123 --
drivers/power/test_power.c | 75 ++
drivers/power/twl4030_charger.c| 80 +-
drivers/thermal/thermal_sys.c |2 +-
include/linux/i2c/twl.h|2 +
include/linux/{ => platform_data}/lp8727.h |0
include/linux/power/charger-manager.h | 67 +++-
include/linux/power_supply.h | 13 +++
include/linux/thermal.h|2 +-
23 files changed, 789 insertions(+), 57 deletions(-)
rename include/linux/{ => platform_data}/lp8727.h (100%)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
[GIT PULL] battery-2.6.git
Hello Linus,
It's almost a normal pull request: a bunch of small fixes and assorted
enhancements, and as usual my gpg key is not signed, etc.
One thing makes it unusual, though: one of our patches added thermal
support for power supply class, but thermal/ subsystem changed under our
feet. We (well, Stephen, that is) caught the issue and it was decided[1]
that I'd just delay the battery pull request, and then will fix it up by
merging your tree back into mine at the specific commit. And I did
exactly that.
That's not all though: another[2] small fixup for thermal subsystem was
needed to get rid of a warning in power supply subsystem (the warning
was not drivers/power's fault, the thermal registration function just
needed a proper const annotation, which is also done by a small commit
on top of the merge.
So, to sum this up:
- The 'master' branch of the battery tree was in -next for weeks,
and was never rebased, altered etc;
- for-v3.6 tag contains the 'master' branch + merge + the warning fix.
Thanks!
[1] http://lkml.org/lkml/2012/6/19/23
[2] http://lkml.org/lkml/2012/6/18/28
The following changes since commit c56f5c0342dfee11a1a13d2f5bb7618de5b17590:
Thermal: Make Thermal trip points writeable (2012-07-24 23:17:20 -0400)
are available in the git repository at:
git://git.infradead.org/battery-2.6.git tags/for-v3.6
for you to fetch changes up to 4b1bf5871f7d59de6484cc887e205d6d2f1e6fbd:
thermal: Constify 'type' argument for the registration routine (2012-07-31
05:45:37 -0700)
Anton Vorontsov (3):
ds2781_battery: w1_ds2781_read() should be static
Merge with upstream to accommodate with thermal changes
thermal: Constify 'type' argument for the registration routine
Chanwoo Choi (3):
charger-manager: Use EXTCON Subsystem to detect charger cables for
charging
charger-manager: Set current limit of regulator for over current
protection
charger-manager: Fix build break related to EXTCON
Dmitry Eremin-Solenikov (2):
test_power: Add support for USB AC source
test_power: Add VOLTAGE_NOW and BATTERY_TEMP properties
Jenny TC (1):
power_supply: Register battery as a thermal zone
Kim, Milo (1):
lp8727_charger: Move header file into platform_data directory
Mark Brown (1):
pda_power: Complain if regulator operations fail
NeilBrown (3):
twl4030_charger: Fix some typos
twl4030_charger: Add backup-battery charging
twl4030_charger: Allow charger to control the regulator that feeds it
Nikolaus Voss (1):
sbs-battery: Don't trigger false supply_changed event
Pritesh Raithatha (1):
gpio-charger: Use cansleep version of gpio_set_value
Ramakrishna Pallala (4):
power_supply: Add constant charge_current and charge_voltage properties
smb347-charger: Add constant charge and current properties
max17042_battery: Support CHARGE_COUNTER power supply attribute
power_supply: Add min/max alert properties for CAPACITY, TEMP,
TEMP_AMBIENT
Richard A. Smith (2):
olpc-battery: Add VOLTAGE_MAX_DESIGN property
olpc-battery: update CHARGE_FULL_DESIGN property for BYD LiFe batteries
Saranya Gopal (1):
bq27x00_battery: Add support for BQ27425 chip
Syed Rafiuddin (1):
bq27x00_battery: Add support for power average and health properties
Documentation/power/power_supply_class.txt | 10 ++
drivers/mfd/twl-core.c |9 +-
drivers/power/Kconfig |1 +
drivers/power/bq27x00_battery.c| 155 +---
drivers/power/charger-manager.c| 152 ---
drivers/power/ds2781_battery.c |2 +-
drivers/power/gpio-charger.c |2 +-
drivers/power/lp8727_charger.c |2 +-
drivers/power/max17042_battery.c |8 ++
drivers/power/olpc_battery.c | 62 ++-
drivers/power/pda_power.c |4 +-
drivers/power/power_supply_core.c | 65
drivers/power/power_supply_sysfs.c |8 ++
drivers/power/sbs-battery.c|2 +-
drivers/power/smb347-charger.c | 123 --
drivers/power/test_power.c | 75 ++
drivers/power/twl4030_charger.c| 80 +-
drivers/thermal/thermal_sys.c |2 +-
include/linux/i2c/twl.h|2 +
include/linux/{ = platform_data}/lp8727.h |0
include/linux/power/charger-manager.h | 67 +++-
include/linux/power_supply.h | 13 +++
include/linux/thermal.h|2 +-
23 files changed, 789 insertions(+), 57 deletions(-)
rename include/linux/{ = platform_data}/lp8727.h (100%)
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More
