summaryrefslogtreecommitdiff
path: root/board/omap3/pandora/pandora.c
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2009-07-29 22:36:25 (GMT)
committerWolfgang Denk <wd@denx.de>2009-07-29 22:36:25 (GMT)
commit108f56b056780f0d23f720d98709304f84a0d6c8 (patch)
tree2a2eb0ab998cfdbf6275dcf282ab282056a14f30 /board/omap3/pandora/pandora.c
parent4c2e3da82dc2b7f8b39b7f1d57f570e4bc5caa6d (diff)
parentbb4291e62579dbc611e84eaaf973631e0bf129c7 (diff)
downloadu-boot-108f56b056780f0d23f720d98709304f84a0d6c8.tar.xz
Merge branch 'master' of git://git.denx.de/u-boot-i2c
Diffstat (limited to 'board/omap3/pandora/pandora.c')
-rw-r--r--board/omap3/pandora/pandora.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/board/omap3/pandora/pandora.c b/board/omap3/pandora/pandora.c
index c2f98ea..1538efb 100644
--- a/board/omap3/pandora/pandora.c
+++ b/board/omap3/pandora/pandora.c
@@ -30,6 +30,7 @@
* MA 02111-1307 USA
*/
#include <common.h>
+#include <twl4030.h>
#include <asm/io.h>
#include <asm/arch/mux.h>
#include <asm/arch/sys_proto.h>
@@ -64,7 +65,8 @@ int misc_init_r(void)
gpio_t *gpio5_base = (gpio_t *)OMAP34XX_GPIO5_BASE;
gpio_t *gpio6_base = (gpio_t *)OMAP34XX_GPIO6_BASE;
- power_init_r();
+ twl4030_power_init();
+ twl4030_led_init();
/* Configure GPIOs to output */
writel(~(GPIO14 | GPIO15 | GPIO16 | GPIO23), &gpio1_base->oe);