ARM:OMAP+:MMC: Add parameters to MMC init

[u-boot] / board / ti / beagle / beagle.c

diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c
index 8b07eef551ff52ec713e3f804310304b1d35b2bc..9edd3c5c4f6b5eb4196572ec1ba164b5bb96d918 100644 (file)
--- a/board/ti/beagle/beagle.c
+++ b/board/ti/beagle/beagle.c
@@ -477,7 +477,7 @@ void set_muxconf_regs(void)
 #if defined(CONFIG_GENERIC_MMC) && !defined(CONFIG_SPL_BUILD)
 int board_mmc_init(bd_t *bis)
 {
-       omap_mmc_init(0);
+       omap_mmc_init(0, 0, 0);
        return 0;
 }
 #endif
@@ -507,58 +507,3 @@ int ehci_hcd_stop(void)
 }
 
 #endif /* CONFIG_USB_EHCI */
-
-#ifndef CONFIG_SPL_BUILD
-/*
- * This command returns the status of the user button on beagle xM
- * Input - none
- * Returns -   1 if button is held down
- *             0 if button is not held down
- */
-int do_userbutton(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
-{
-       int     button = 0;
-       int     gpio;
-
-       /*
-        * pass address parameter as argv[0] (aka command name),
-        * and all remaining args
-        */
-       switch (get_board_revision()) {
-       case REVISION_AXBX:
-       case REVISION_CX:
-       case REVISION_C4:
-               gpio = 7;
-               break;
-       case REVISION_XM_A:
-       case REVISION_XM_B:
-       case REVISION_XM_C:
-       default:
-               gpio = 4;
-               break;
-       }
-       gpio_request(gpio, "");
-       gpio_direction_input(gpio);
-       printf("The user button is currently ");
-       if (gpio_get_value(gpio))
-       {
-               button = 1;
-               printf("PRESSED.\n");
-       }
-       else
-       {
-               button = 0;
-               printf("NOT pressed.\n");
-       }
-
-       return !button;
-}
-
-/* -------------------------------------------------------------------- */
-
-U_BOOT_CMD(
-       userbutton, CONFIG_SYS_MAXARGS, 1,      do_userbutton,
-       "Return the status of the BeagleBoard USER button",
-       ""
-);
-#endif