Merge branch 'master' of git://git.denx.de/u-boot-arm

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

diff --git a/board/samsung/trats2/trats2.c b/board/samsung/trats2/trats2.c
index 2a6c9f91701cbd899195af2a46b8900200c87e4e..47095252a7522e82256f832ce35267001808436f 100644 (file)
--- a/board/samsung/trats2/trats2.c
+++ b/board/samsung/trats2/trats2.c
@@ -150,9 +150,22 @@ static int pmic_init_max77686(void);
 
 int exynos_init(void)
 {
+       struct exynos4_power *pwr =
+               (struct exynos4_power *)samsung_get_base_power();
+
        check_hw_revision();
        printf("HW Revision:\t0x%04x\n", board_rev);
 
+       /*
+        * First bootloader on the TRATS2 platform uses
+        * INFORM4 and INFORM5 registers for recovery
+        *
+        * To indicate correct boot chain - those two
+        * registers must be cleared out
+        */
+       writel(0, &pwr->inform4);
+       writel(0, &pwr->inform5);
+
        return 0;
 }
 
@@ -299,8 +312,7 @@ int board_usb_init(int index, enum usb_init_type init)
        return s3c_udc_probe(&s5pc210_otg_data);
 }
 
-#ifdef CONFIG_USB_CABLE_CHECK
-int usb_cable_connected(void)
+int g_dnl_board_usb_cable_connected(void)
 {
        struct pmic *muic = pmic_get("MAX77693_MUIC");
        if (!muic)
@@ -309,7 +321,6 @@ int usb_cable_connected(void)
        return !!muic->chrg->chrg_type(muic);
 }
 #endif
-#endif
 
 static int pmic_init_max77686(void)
 {