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

Merge tag 'for-v4.1-rc' of git://git.infradead.org/battery-2.6 

Pull power supply and reset fixes from Sebastian Reichel:
 "misc fixes"

* tag 'for-v4.1-rc' of git://git.infradead.org/battery-2.6:
  power: bq27x00_battery: Add missing MODULE_ALIAS
  power: reset: Add MFD_SYSCON depends for brcmstb
  power: reset: ltc2952: Remove bogus hrtimer_start() return value checks
  power_supply: fix oops in collie_battery driver
  power/reset: at91: fix return value check in at91_reset_platform_probe()
  MAINTAINERS: Add me as maintainer of Nokia N900 power supply drivers
  axp288_fuel_gauge: Add original author details
parents 4cfceaf0 8ebb7e9c

MAINTAINERS

+11 −0
Original line number Diff line number Diff line
@@ -6959,6 +6959,17 @@ T: git git://git.rocketboards.org/linux-socfpga-next.git 
S:	Maintained

F:	arch/nios2/



NOKIA N900 POWER SUPPLY DRIVERS

M:	Pali Rohár <pali.rohar@gmail.com>

S:	Maintained

F:	include/linux/power/bq2415x_charger.h

F:	include/linux/power/bq27x00_battery.h

F:	include/linux/power/isp1704_charger.h

F:	drivers/power/bq2415x_charger.c

F:	drivers/power/bq27x00_battery.c

F:	drivers/power/isp1704_charger.c

F:	drivers/power/rx51_battery.c



NTB DRIVER

M:	Jon Mason <jdmason@kudzu.us>

M:	Dave Jiang <dave.jiang@intel.com>

drivers/power/axp288_fuel_gauge.c

+1 −0
Original line number Diff line number Diff line
@@ -1149,6 +1149,7 @@ static struct platform_driver axp288_fuel_gauge_driver = { 


module_platform_driver(axp288_fuel_gauge_driver);



MODULE_AUTHOR("Ramakrishna Pallala <ramakrishna.pallala@intel.com>");

MODULE_AUTHOR("Todd Brandt <todd.e.brandt@linux.intel.com>");

MODULE_DESCRIPTION("Xpower AXP288 Fuel Gauge Driver");

MODULE_LICENSE("GPL");

drivers/power/bq27x00_battery.c

+8 −0
Original line number Diff line number Diff line
@@ -1109,6 +1109,14 @@ static void __exit bq27x00_battery_exit(void) 
}

module_exit(bq27x00_battery_exit);



#ifdef CONFIG_BATTERY_BQ27X00_PLATFORM

MODULE_ALIAS("platform:bq27000-battery");

#endif



#ifdef CONFIG_BATTERY_BQ27X00_I2C

MODULE_ALIAS("i2c:bq27000-battery");

#endif



MODULE_AUTHOR("Rodolfo Giometti <giometti@linux.it>");

MODULE_DESCRIPTION("BQ27x00 battery monitor driver");

MODULE_LICENSE("GPL");

drivers/power/collie_battery.c

+1 −1
Original line number Diff line number Diff line
@@ -347,7 +347,7 @@ static int collie_bat_probe(struct ucb1x00_dev *dev) 
		goto err_psy_reg_main;

	}



	psy_main_cfg.drv_data = &collie_bat_bu;

	psy_bu_cfg.drv_data = &collie_bat_bu;

	collie_bat_bu.psy = power_supply_register(&dev->ucb->dev,

						  &collie_bat_bu_desc,

						  &psy_bu_cfg);

drivers/power/reset/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ config POWER_RESET_AXXIA 
config POWER_RESET_BRCMSTB

	bool "Broadcom STB reset driver"

	depends on ARM || MIPS || COMPILE_TEST

	depends on MFD_SYSCON

	default ARCH_BRCMSTB

	help

	  This driver provides restart support for Broadcom STB boards.

CRA Git | Maintained and supported by SUSTech CRA and CCSE