Merge branch 'master' of git://git.denx.de/u-boot-i2c

[karo-tx-uboot.git] / board / pandora / pandora.c

diff --git a/board/pandora/pandora.c b/board/pandora/pandora.c
index e84c9461538b3a87ac1f13a47588b42bcf13cb6c..355e9eaa8fc7d4a730930897825322ea47b3e881 100644 (file)
--- a/board/pandora/pandora.c
+++ b/board/pandora/pandora.c
@@ -37,6 +37,10 @@
 #include <asm/mach-types.h>
 #include "pandora.h"
 
+#define TWL4030_BB_CFG_BBCHEN          (1 << 4)
+#define TWL4030_BB_CFG_BBSEL_3200MV    (3 << 2)
+#define TWL4030_BB_CFG_BBISEL_500UA    2
+
 /*
  * Routine: board_init
  * Description: Early hardware init.
@@ -65,7 +69,6 @@ int misc_init_r(void)
        struct gpio *gpio5_base = (struct gpio *)OMAP34XX_GPIO5_BASE;
        struct gpio *gpio6_base = (struct gpio *)OMAP34XX_GPIO6_BASE;
 
-       twl4030_power_init();
        twl4030_led_init(TWL4030_LED_LEDEN_LEDBON);
 
        /* Configure GPIOs to output */
@@ -79,6 +82,11 @@ int misc_init_r(void)
        writel(GPIO28, &gpio5_base->setdataout);
        writel(GPIO4, &gpio6_base->setdataout);
 
+       /* Enable battery backup capacitor (3.2V, 0.5mA charge current) */
+       twl4030_i2c_write_u8(TWL4030_CHIP_PM_RECEIVER,
+               TWL4030_BB_CFG_BBCHEN | TWL4030_BB_CFG_BBSEL_3200MV |
+               TWL4030_BB_CFG_BBISEL_500UA, TWL4030_PM_RECEIVER_BB_CFG);
+
        dieid_num_r();
 
        return 0;