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

7 files changed, 27 insertions, 18 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 590304b96b03..246ca6964158 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -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>
diff --git a/drivers/power/axp288_fuel_gauge.c b/drivers/power/axp288_fuel_gauge.c
index ca1cc5a47eb1..bd1dbfee2515 100644
--- a/drivers/power/axp288_fuel_gauge.c
+++ b/drivers/power/axp288_fuel_gauge.c
@@ -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");
diff --git a/drivers/power/bq27x00_battery.c b/drivers/power/bq27x00_battery.c
index a57433de5c24..b6b98378faa3 100644
--- a/drivers/power/bq27x00_battery.c
+++ b/drivers/power/bq27x00_battery.c
@@ -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");
diff --git a/drivers/power/collie_battery.c b/drivers/power/collie_battery.c
index 2da9ed8ccbb5..8a971b3dbe58 100644
--- a/drivers/power/collie_battery.c
+++ b/drivers/power/collie_battery.c
@@ -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);
diff --git a/drivers/power/reset/Kconfig b/drivers/power/reset/Kconfig
index aad9c3318c02..17d93a73c513 100644
--- a/drivers/power/reset/Kconfig
+++ b/drivers/power/reset/Kconfig
@@ -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.
diff --git a/drivers/power/reset/at91-reset.c b/drivers/power/reset/at91-reset.c
index 01c7055c4200..ca461ebc7ae8 100644
--- a/drivers/power/reset/at91-reset.c
+++ b/drivers/power/reset/at91-reset.c
@@ -212,9 +212,9 @@ static int at91_reset_platform_probe(struct platform_device *pdev)
                 res = platform_get_resource(pdev, IORESOURCE_MEM, idx + 1 );
                 at91_ramc_base[idx] = devm_ioremap(&pdev->dev, res->start,
                                                    resource_size(res));
-                if (IS_ERR(at91_ramc_base[idx])) {
+                if (!at91_ramc_base[idx]) {
                         dev_err(&pdev->dev, "Could not map ram controller address\n");
-                        return PTR_ERR(at91_ramc_base[idx]);
+                        return -ENOMEM;
                 }
         }
 
diff --git a/drivers/power/reset/ltc2952-poweroff.c b/drivers/power/reset/ltc2952-poweroff.c
index 7ef193b6f7fe..1e08195551fe 100644
--- a/drivers/power/reset/ltc2952-poweroff.c
+++ b/drivers/power/reset/ltc2952-poweroff.c
@@ -120,18 +120,7 @@ static enum hrtimer_restart ltc2952_poweroff_timer_wde(struct hrtimer *timer)
 
 static void ltc2952_poweroff_start_wde(struct ltc2952_poweroff *data)
 {
-        if (hrtimer_start(&data->timer_wde, data->wde_interval,
-                          HRTIMER_MODE_REL)) {
-                /*
-                 * The device will not toggle the watchdog reset,
-                 * thus shut down is only safe if the PowerPath controller
-                 * has a long enough time-off before triggering a hardware
-                 * power-off.
-                 *
-                 * Only sending a warning as the system will power-off anyway
-                 */
-                dev_err(data->dev, "unable to start the timer\n");
-        }
+        hrtimer_start(&data->timer_wde, data->wde_interval, HRTIMER_MODE_REL);
 }
 
 static enum hrtimer_restart
@@ -165,9 +154,8 @@ static irqreturn_t ltc2952_poweroff_handler(int irq, void *dev_id)
         }
 
         if (gpiod_get_value(data->gpio_trigger)) {
-                if (hrtimer_start(&data->timer_trigger, data->trigger_delay,
-                                  HRTIMER_MODE_REL))
-                        dev_err(data->dev, "unable to start the wait timer\n");
+                hrtimer_start(&data->timer_trigger, data->trigger_delay,
+                              HRTIMER_MODE_REL);
         } else {
                 hrtimer_cancel(&data->timer_trigger);
                 /* omitting return value check, timer should have been valid */