Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'

[u-boot] / board / logicpd / zoom2 / zoom2.c

diff --git a/board/logicpd/zoom2/zoom2.c b/board/logicpd/zoom2/zoom2.c
index 800113a976892df680c2a9dc6f0c882f23a77d52..ad6ae3669685f7a9652e810fdd6e04ca569c23d9 100644 (file)
--- a/board/logicpd/zoom2/zoom2.c
+++ b/board/logicpd/zoom2/zoom2.c
@@ -36,7 +36,7 @@
 #include <twl4030.h>
 #include <asm/io.h>
 #include <asm/arch/mmc_host_def.h>
-#include <asm/arch/gpio.h>
+#include <asm/gpio.h>
 #include <asm/arch/mem.h>
 #include <asm/arch/mux.h>
 #include <asm/arch/sys_proto.h>
@@ -90,12 +90,11 @@ void zoom2_identify(void)
         * and they are not commonly used.  They are mentioned here
         * only for completeness.
         */
-       if (!omap_request_gpio(94)) {
+       if (!gpio_request(94, "")) {
                unsigned int val;
 
-               omap_set_gpio_direction(94, 1);
-               val = omap_get_gpio_datain(94);
-               omap_free_gpio(94);
+               gpio_direction_input(94);
+               val = gpio_get_value(94);
 
                if (val)
                        revision = ZOOM2_REVISION_BETA;
@@ -184,8 +183,7 @@ void set_muxconf_regs (void)
 #ifdef CONFIG_GENERIC_MMC
 int board_mmc_init(bd_t *bis)
 {
-       omap_mmc_init(0);
-       return 0;
+       return omap_mmc_init(0, 0, 0, -1, -1);
 }
 #endif