Merge git://git.denx.de/u-boot-mpc85xx

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

diff --git a/board/pandora/pandora.c b/board/pandora/pandora.c
index 9ff5dd76641b15fd1a1f127f39846001673a5d59..59b5a7e2cd01c34afe4524ef4d8e31f4c1f49f68 100644 (file)
--- a/board/pandora/pandora.c
+++ b/board/pandora/pandora.c
@@ -11,23 +11,7 @@
  * (C) Copyright 2004-2008
  * Texas Instruments, <www.ti.com>
  *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 #include <common.h>
 #include <twl4030.h>
@@ -114,8 +98,9 @@ int misc_init_r(void)
 
        /* Enable battery backup capacitor (3.2V, 0.5mA charge current) */
        twl4030_i2c_write_u8(TWL4030_CHIP_PM_RECEIVER,
+               TWL4030_PM_RECEIVER_BB_CFG,
                TWL4030_BB_CFG_BBCHEN | TWL4030_BB_CFG_BBSEL_3200MV |
-               TWL4030_BB_CFG_BBISEL_500UA, TWL4030_PM_RECEIVER_BB_CFG);
+               TWL4030_BB_CFG_BBISEL_500UA);
 
        dieid_num_r();
 
@@ -141,4 +126,9 @@ int board_mmc_init(bd_t *bis)
 {
        return omap_mmc_init(0, 0, 0, -1, -1);
 }
+
+void board_mmc_power_init(void)
+{
+       twl4030_power_mmc_init(0);
+}
 #endif