odroid: adjust get_dfu_alt_*() functions to new declarations

[karo-tx-uboot.git] / board / samsung / odroid / odroid.c

diff --git a/board/samsung/odroid/odroid.c b/board/samsung/odroid/odroid.c
index e3517f2eb24101f8614b53c120d30f37ea5caa06..6f4b8caea545149505ace8d7da6fd22a3f335732 100644 (file)
--- a/board/samsung/odroid/odroid.c
+++ b/board/samsung/odroid/odroid.c
@@ -15,6 +15,7 @@
 #include <power/pmic.h>
 #include <power/max77686_pmic.h>
 #include <errno.h>
+#include <mmc.h>
 #include <usb.h>
 #include <usb/s3c_udc.h>
 #include <samsung/misc.h>
@@ -61,27 +62,29 @@ const char *get_board_type(void)
 #endif
 
 #ifdef CONFIG_SET_DFU_ALT_INFO
-char *get_dfu_alt_system(void)
+char *get_dfu_alt_system(char *interface, char *devstr)
 {
        return getenv("dfu_alt_system");
 }
 
-char *get_dfu_alt_boot(void)
+char *get_dfu_alt_boot(char *interface, char *devstr)
 {
+       struct mmc *mmc;
        char *alt_boot;
+       int dev_num;
+
+       dev_num = simple_strtoul(devstr, NULL, 10);
+
+       mmc = find_mmc_device(dev_num);
+       if (!mmc)
+               return NULL;
+
+       if (mmc_init(mmc))
+               return NULL;
+
+       alt_boot = IS_SD(mmc) ? CONFIG_DFU_ALT_BOOT_SD :
+                               CONFIG_DFU_ALT_BOOT_EMMC;
 
-       switch (get_boot_mode()) {
-       case BOOT_MODE_SD:
-               alt_boot = CONFIG_DFU_ALT_BOOT_SD;
-               break;
-       case BOOT_MODE_EMMC:
-       case BOOT_MODE_EMMC_SD:
-               alt_boot = CONFIG_DFU_ALT_BOOT_EMMC;
-               break;
-       default:
-               alt_boot = NULL;
-               break;
-       }
        return alt_boot;
 }
 #endif
@@ -248,12 +251,12 @@ static void board_clock_init(void)
         * MOUTc2c = 800 Mhz
         * MOUTpwi = 108 MHz
         *
-        * sclk_g2d_acp = MOUTg2d / (ratio + 1) = 400 (1)
+        * sclk_g2d_acp = MOUTg2d / (ratio + 1) = 200 (3)
         * sclk_c2c = MOUTc2c / (ratio + 1) = 400 (1)
         * aclk_c2c = sclk_c2c / (ratio + 1) = 200 (1)
         * sclk_pwi = MOUTpwi / (ratio + 1) = 18 (5)
         */
-       set = G2D_ACP_RATIO(1) | C2C_RATIO(1) | PWI_RATIO(5) |
+       set = G2D_ACP_RATIO(3) | C2C_RATIO(1) | PWI_RATIO(5) |
              C2C_ACLK_RATIO(1) | DVSEM_RATIO(1) | DPM_RATIO(1);
 
        clrsetbits_le32(&clk->div_dmc1, clr, set);
@@ -503,11 +506,3 @@ int board_usb_init(int index, enum usb_init_type init)
        return s3c_udc_probe(&s5pc210_otg_data);
 }
 #endif
-
-void reset_misc(void)
-{
-       /* Reset eMMC*/
-       gpio_set_value(EXYNOS4X12_GPIO_K12, 0);
-       mdelay(10);
-       gpio_set_value(EXYNOS4X12_GPIO_K12, 1);
-}