Merge tag 'for-v3.8-part2' of git://git.infradead.org/battery-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 19 Dec 2012 16:14:08 +0000 (08:14 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 19 Dec 2012 16:14:08 +0000 (08:14 -0800)
Pull battery update, part 2, from Anton Vorontsov:
 "These are left overs that I didn't have time to review/apply before
  the merge window opened.  I didn't want to "spoil" the first pull
  request with these late patches, so they were not included:

   - A small patch for the RX51 OMAP board (Nokia N900 phone), the patch
     creates a battery monitor device instance, so that it can be
     probed.  It was acked by the OMAP maintainer;

   - A couple of late bug fixes for the charger-manager: corrects corner
     cases for the battery full handling."

* tag 'for-v3.8-part2' of git://git.infradead.org/battery-2.6:
  charger-manager: Fix bug when check dropped voltage after fullbatt event
  charger-manager: Fix bug related to checking fully charged state of battery
  ARM: OMAP: rx51: Register platform device for rx51_battery

1  2 
arch/arm/mach-omap2/board-rx51-peripherals.c

index 60529e0b3d67aea6a98da9c6774d81c4ca539e28,1fb96e6f9f5e2d559ad26c518d79c866f443f7ef..cf07e289b4eadb494f942ca966b4c78569102b82
@@@ -31,7 -31,9 +31,7 @@@
  #include <asm/system_info.h>
  
  #include "common.h"
 -#include <plat/dma.h>
 -#include <plat/gpmc.h>
 -#include <plat/omap-pm.h>
 +#include <linux/omap-dma.h>
  #include "gpmc-smc91x.h"
  
  #include "board-rx51.h"
  #endif
  
  #include "mux.h"
 +#include "omap-pm.h"
  #include "hsmmc.h"
  #include "common-board-devices.h"
 +#include "gpmc.h"
 +#include "gpmc-onenand.h"
  
  #define SYSTEM_REV_B_USES_VAUX3       0x1699
  #define SYSTEM_REV_S_USES_VAUX3 0x8
@@@ -256,6 -255,11 +256,11 @@@ static struct spi_board_info rx51_perip
        },
  };
  
+ static struct platform_device rx51_battery_device = {
+       .name   = "rx51-battery",
+       .id     = -1,
+ };
  static void rx51_charger_set_power(bool on)
  {
        gpio_set_value(RX51_USB_TRANSCEIVER_RST_GPIO, on);
@@@ -277,6 -281,7 +282,7 @@@ static void __init rx51_charger_init(vo
        WARN_ON(gpio_request_one(RX51_USB_TRANSCEIVER_RST_GPIO,
                GPIOF_OUT_INIT_HIGH, "isp1704_reset"));
  
+       platform_device_register(&rx51_battery_device);
        platform_device_register(&rx51_charger_device);
  }