1 files changed, 114 insertions, 4 deletions

diff --git a/arch/arm/mach-pxa/z2.c b/arch/arm/mach-pxa/z2.c
index d303c6929d32..f0d02288b4ca 100644
--- a/arch/arm/mach-pxa/z2.c
+++ b/arch/arm/mach-pxa/z2.c
@@ -17,6 +17,7 @@
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
 #include <linux/pwm_backlight.h>
+#include <linux/z2_battery.h>
 #include <linux/dma-mapping.h>
 #include <linux/spi/spi.h>
 #include <linux/spi/libertas_spi.h>
@@ -26,6 +27,7 @@
 #include <linux/gpio.h>
 #include <linux/gpio_keys.h>
 #include <linux/delay.h>
+#include <linux/regulator/machine.h>
 
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
@@ -162,7 +164,7 @@ static struct mtd_partition z2_flash_parts[] = {
         }, {
                 .name   = "U-Boot Environment",
                 .offset = 0x40000,
-                .size   = 0x60000,
+                .size   = 0x20000,
         }, {
                 .name   = "Flash",
                 .offset = 0x60000,
@@ -452,6 +454,42 @@ static inline void z2_keys_init(void) {}
 #endif
 
 /******************************************************************************
+ * Battery
+ ******************************************************************************/
+#if defined(CONFIG_I2C_PXA) || defined(CONFIG_I2C_PXA_MODULE)
+static struct z2_battery_info batt_chip_info = {
+        .batt_I2C_bus   = 0,
+        .batt_I2C_addr  = 0x55,
+        .batt_I2C_reg   = 2,
+        .charge_gpio    = GPIO0_ZIPITZ2_AC_DETECT,
+        .min_voltage    = 2400000,
+        .max_voltage    = 3700000,
+        .batt_div       = 69,
+        .batt_mult      = 1000000,
+        .batt_tech      = POWER_SUPPLY_TECHNOLOGY_LION,
+        .batt_name      = "Z2",
+};
+
+static struct i2c_board_info __initdata z2_i2c_board_info[] = {
+        {
+                I2C_BOARD_INFO("aer915", 0x55),
+                .platform_data  = &batt_chip_info,
+        }, {
+                I2C_BOARD_INFO("wm8750", 0x1b),
+        },
+
+};
+
+static void __init z2_i2c_init(void)
+{
+        pxa_set_i2c_info(NULL);
+        i2c_register_board_info(0, ARRAY_AND_SIZE(z2_i2c_board_info));
+}
+#else
+static inline void z2_i2c_init(void) {}
+#endif
+
+/******************************************************************************
  * SSP Devices - WiFi and LCD control
  ******************************************************************************/
 #if defined(CONFIG_SPI_PXA2XX) || defined(CONFIG_SPI_PXA2XX_MODULE)
@@ -573,23 +611,95 @@ static inline void z2_spi_init(void) {}
 #endif
 
 /******************************************************************************
+ * Core power regulator
+ ******************************************************************************/
+#if defined(CONFIG_REGULATOR_TPS65023) || \
+        defined(CONFIG_REGULATOR_TPS65023_MODULE)
+static struct regulator_consumer_supply z2_tps65021_consumers[] = {
+        {
+                .supply = "vcc_core",
+        }
+};
+
+static struct regulator_init_data z2_tps65021_info[] = {
+        {
+                .constraints = {
+                        .name           = "vcc_core range",
+                        .min_uV         = 800000,
+                        .max_uV         = 1600000,
+                        .always_on      = 1,
+                        .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE,
+                },
+                .consumer_supplies      = z2_tps65021_consumers,
+                .num_consumer_supplies  = ARRAY_SIZE(z2_tps65021_consumers),
+        }, {
+                .constraints = {
+                        .name           = "DCDC2",
+                        .min_uV         = 3300000,
+                        .max_uV         = 3300000,
+                        .always_on      = 1,
+                },
+        }, {
+                .constraints = {
+                        .name           = "DCDC3",
+                        .min_uV         = 1800000,
+                        .max_uV         = 1800000,
+                        .always_on      = 1,
+                },
+        }, {
+                .constraints = {
+                        .name           = "LDO1",
+                        .min_uV         = 1000000,
+                        .max_uV         = 3150000,
+                        .always_on      = 1,
+                },
+        }, {
+                .constraints = {
+                        .name           = "LDO2",
+                        .min_uV         = 1050000,
+                        .max_uV         = 3300000,
+                        .always_on      = 1,
+                },
+        }
+};
+
+static struct i2c_board_info __initdata z2_pi2c_board_info[] = {
+        {
+                I2C_BOARD_INFO("tps65021", 0x48),
+                .platform_data  = &z2_tps65021_info,
+        },
+};
+
+static void __init z2_pmic_init(void)
+{
+        pxa27x_set_i2c_power_info(NULL);
+        i2c_register_board_info(1, ARRAY_AND_SIZE(z2_pi2c_board_info));
+}
+#else
+static inline void z2_pmic_init(void) {}
+#endif
+
+/******************************************************************************
  * Machine init
  ******************************************************************************/
 static void __init z2_init(void)
 {
         pxa2xx_mfp_config(ARRAY_AND_SIZE(z2_pin_config));
 
+        pxa_set_ffuart_info(NULL);
+        pxa_set_btuart_info(NULL);
+        pxa_set_stuart_info(NULL);
+
         z2_lcd_init();
         z2_mmc_init();
         z2_mkp_init();
-
-        pxa_set_i2c_info(NULL);
-
+        z2_i2c_init();
         z2_spi_init();
         z2_nor_init();
         z2_pwm_init();
         z2_leds_init();
         z2_keys_init();
+        z2_pmic_init();
 }
 
 MACHINE_START(ZIPIT2, "Zipit Z2")