Merge git://git.infradead.org/battery-2.6

* git://git.infradead.org/battery-2.6:
  power_supply: Makefile cleanup
  bq27x00_battery: Add missing kfree(di->bus) in bq27x00_battery_remove()
  power_supply: Introduce maximum current property
  power_supply: Add types for USB chargers
  ds2782_battery: Fix units
  power_supply: Add driver for TWL4030/TPS65950 BCI charger
  bq20z75: Add support for more power supply properties
  wm831x_power: Add missing kfree(wm831x_power) in wm831x_power_remove()
  jz4740-battery: Add missing kfree(jz_battery) in jz_battery_remove()
  ds2760_battery: Add missing kfree(di) in ds2760_battery_remove()
  olpc_battery: Fix endian neutral breakage for s16 values
  ds2760_battery: Fix W1 and W1_SLAVE_DS2760 dependency
  pcf50633-charger: Add missing sysfs_remove_group()
  power_supply: Add driver for TI BQ20Z75 gas gauge IC
  wm831x_power: Remove duplicate chg mask
  omap: rx51: Add support for USB chargers
  power_supply: Add isp1704 charger detection driver

diff --combined arch/arm/mach-omap2/board-rx51-peripherals.c
index 41285297eafc53e8dab54efc1a91f704a431c2df,a4b1f8bdff43b8ee6983fc35ec193a7eb01ec608..3fec4d62a91adae012bff4a250a2eb7f2e11a56d
--- 1/arch/arm/mach-omap2/board-rx51-peripherals.c
--- 2/arch/arm/mach-omap2/board-rx51-peripherals.c
+++ b/arch/arm/mach-omap2/board-rx51-peripherals.c
@@@ -14,7 -14,7 +14,7 @@@
  #include <linux/input.h>
  #include <linux/input/matrix_keypad.h>
  #include <linux/spi/spi.h>
 -#include <linux/spi/wl12xx.h>
 +#include <linux/wl12xx.h>
  #include <linux/i2c.h>
  #include <linux/i2c/twl.h>
  #include <linux/clk.h>
@@@ -23,7 -23,6 +23,7 @@@
  #include <linux/gpio.h>
  #include <linux/gpio_keys.h>
  #include <linux/mmc/host.h>
 +#include <sound/tlv320aic3x.h>
  
  #include <plat/mcspi.h>
  #include <plat/board.h>
@@@ -33,8 -32,6 +33,8 @@@
  #include <plat/onenand.h>
  #include <plat/gpmc-smc91x.h>
  
 +#include <mach/board-rx51.h>
 +
  #include <sound/tlv320aic3x.h>
  #include <sound/tpa6130a2-plat.h>
  
@@@ -107,6 -104,10 +107,10 @@@ static struct spi_board_info rx51_perip
        },
  };
  
+ static struct platform_device rx51_charger_device = {
+       .name = "isp1704_charger",
+ };
+ 
  #if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)
  
  #define RX51_GPIO_CAMERA_LENS_COVER   110
@@@ -187,7 -188,7 +191,7 @@@ static void __init rx51_add_gpio_keys(v
  }
  #endif /* CONFIG_KEYBOARD_GPIO || CONFIG_KEYBOARD_GPIO_MODULE */
  
 -static int board_keymap[] = {
 +static uint32_t board_keymap[] = {
        /*
         * Note that KEY(x, 8, KEY_XXX) entries represent "entrire row
         * connected to the ground" matrix state.
@@@ -305,7 -306,7 +309,7 @@@ static struct omap2_hsmmc_info mmc[] __
        {
                .name           = "external",
                .mmc            = 1,
 -              .wires          = 4,
 +              .caps           = MMC_CAP_4_BIT_DATA,
                .cover_only     = true,
                .gpio_cd        = 160,
                .gpio_wp        = -EINVAL,
@@@ -314,8 -315,7 +318,8 @@@
        {
                .name           = "internal",
                .mmc            = 2,
 -              .wires          = 8, /* See also rx51_mmc2_remux */
 +              .caps           = MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA,
 +                                              /* See also rx51_mmc2_remux */
                .gpio_cd        = -EINVAL,
                .gpio_wp        = -EINVAL,
                .nonremovable   = true,
@@@ -693,6 -693,7 +697,6 @@@ static struct twl4030_power_data rx51_t
  };
  
  
 -
  static struct twl4030_platform_data rx51_twldata __initdata = {
        .irq_base               = TWL4030_IRQ_BASE,
        .irq_end                = TWL4030_IRQ_END,
@@@ -713,6 -714,10 +717,6 @@@
        .vio                    = &rx51_vio,
  };
  
 -static struct aic3x_pdata rx51_aic3x_data __initdata = {
 -      .gpio_reset             = 60,
 -};
 -
  static struct tpa6130a2_platform_data rx51_tpa6130a2_data __initdata = {
        .id                     = TPA6130A2,
        .power_gpio             = 98,
@@@ -727,17 -732,6 +731,17 @@@ static struct i2c_board_info __initdat
        },
  };
  
 +/* Audio setup data */
 +static struct aic3x_setup_data rx51_aic34_setup = {
 +      .gpio_func[0] = AIC3X_GPIO1_FUNC_DISABLED,
 +      .gpio_func[1] = AIC3X_GPIO2_FUNC_DIGITAL_MIC_INPUT,
 +};
 +
 +static struct aic3x_pdata rx51_aic3x_data = {
 +      .setup = &rx51_aic34_setup,
 +      .gpio_reset = 60,
 +};
 +
  static struct i2c_board_info __initdata rx51_peripherals_i2c_board_info_2[] = {
        {
                I2C_BOARD_INFO("tlv320aic3x", 0x18),
@@@ -919,5 -913,6 +923,6 @@@ void __init rx51_peripherals_init(void
        spi_register_board_info(rx51_peripherals_spi_board_info,
                                ARRAY_SIZE(rx51_peripherals_spi_board_info));
        omap2_hsmmc_init(mmc);
+       platform_device_register(&rx51_charger_device);
  }