Commit a22a0fdb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-v3.12' of git://git.infradead.org/battery-2.6 

Pull battery/power supply driver updates from Anton Vorontsov:
 "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)"

* tag 'for-v3.12' of git://git.infradead.org/battery-2.6:
  rx51_battery: Fix channel number when reading adc value
  power: Add twl4030_madc battery driver.
  bq24190_charger: Workaround SS definition problem on i386 builds
  power_supply: Prevent suspend until power supply events are processed
  vexpress-poweroff: Should depend on the required infrastructure
  twl4030-charger: Fix compiler warning with regulator_enable()
  rx51_battery: Replace hardcoded channels values.
  bq24190_charger: Add support for TI BQ24190 Battery Charger
  ab8500-charger: We print an unintended error message
  max8925_power: Fix missing of_node_put
  power_supply: Replace strict_strtol() with kstrtol()
  power: Add APM X-Gene system reboot driver
  power_supply: tosa_battery: Get rid of irq_to_gpio usage
  power supply: collie_battery: Convert to use dev_pm_ops
  power_supply: Make goldfish_battery depend on GOLDFISH || COMPILE_TEST
  power: reset: Add msm restart support
  MAINTAINERS: drivers/power: add entry for SmartReflex AVS drivers
parents bf83e614 db15e631

Documentation/devicetree/bindings/power_supply/msm-poweroff.txt

0 → 100644
+17 −0
Original line number Diff line number Diff line 
MSM Restart Driver



A power supply hold (ps-hold) bit is set to power the msm chipsets.

Clearing that bit allows us to restart/poweroff. The difference

between poweroff and restart is determined by unique power manager IC

settings.



Required Properties:

-compatible: "qcom,pshold"

-reg: Specifies the physical address of the ps-hold register



Example:



	restart@fc4ab000 {

		compatible = "qcom,pshold";

		reg = <0xfc4ab000 0x4>;

	};

MAINTAINERS

+8 −0
Original line number Diff line number Diff line
@@ -7624,6 +7624,14 @@ S: Maintained 
F:	Documentation/security/Smack.txt

F:	security/smack/



SMARTREFLEX DRIVERS FOR ADAPTIVE VOLTAGE SCALING (AVS)

M:	Kevin Hilman <khilman@kernel.org>

M:	Nishanth Menon <nm@ti.com>

S:	Maintained

F:	drivers/power/avs/smartreflex.c

F:	include/linux/power/smartreflex.h

L:	linux-pm@vger.kernel.org



SMC91x ETHERNET DRIVER

M:	Nicolas Pitre <nico@fluxnic.net>

S:	Odd Fixes

drivers/power/Kconfig

+14 −1
Original line number Diff line number Diff line
@@ -216,6 +216,13 @@ config BATTERY_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
@@ -334,6 +341,12 @@ config CHARGER_BQ2415X 
	  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 && GPIOLIB

	help

	  Say Y to enable support for the TI BQ24190 battery charger.



config CHARGER_SMB347

	tristate "Summit Microelectronics SMB347 Battery Charger"

	depends on I2C
@@ -357,7 +370,7 @@ config AB8500_BM 


config BATTERY_GOLDFISH

	tristate "Goldfish battery driver"

	depends on GENERIC_HARDIRQS

	depends on GENERIC_HARDIRQS && (GOLDFISH || COMPILE_TEST)

	help

	  Say Y to enable support for the battery and AC power in the

	  Goldfish emulator.

drivers/power/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ obj-$(CONFIG_BATTERY_MAX17040) += max17040_battery.o 
obj-$(CONFIG_BATTERY_MAX17042)	+= max17042_battery.o

obj-$(CONFIG_BATTERY_Z2)	+= z2_battery.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
@@ -50,6 +51,7 @@ obj-$(CONFIG_CHARGER_MANAGER) += charger-manager.o 
obj-$(CONFIG_CHARGER_MAX8997)	+= max8997_charger.o

obj-$(CONFIG_CHARGER_MAX8998)	+= max8998_charger.o

obj-$(CONFIG_CHARGER_BQ2415X)	+= bq2415x_charger.o

obj-$(CONFIG_CHARGER_BQ24190)	+= bq24190_charger.o

obj-$(CONFIG_POWER_AVS)		+= avs/

obj-$(CONFIG_CHARGER_SMB347)	+= smb347-charger.o

obj-$(CONFIG_CHARGER_TPS65090)	+= tps65090-charger.o

drivers/power/ab8500_charger.c

+1 −0
Original line number Diff line number Diff line
@@ -774,6 +774,7 @@ static int ab8500_charger_max_usb_curr(struct ab8500_charger *di, 
		di->max_usb_in_curr.usb_type_max = USB_CH_IP_CUR_LVL_0P5;

		dev_dbg(di->dev, "USB Type - 0x%02x MaxCurr: %d", link_status,

				di->max_usb_in_curr.usb_type_max);

		break;

	case USB_STAT_NOT_VALID_LINK:

		dev_err(di->dev, "USB Type invalid - try charging anyway\n");

		di->max_usb_in_curr.usb_type_max = USB_CH_IP_CUR_LVL_0P5;

CRA Git | Maintained and supported by SUSTech CRA and CCSE