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

[platform/kernel/u-boot.git] / board / ti / dra7xx / evm.c

diff --git a/board/ti/dra7xx/evm.c b/board/ti/dra7xx/evm.c
index eaf123c..eebec88 100644 (file)
--- a/board/ti/dra7xx/evm.c
+++ b/board/ti/dra7xx/evm.c
@@ -57,16 +57,12 @@ int board_init(void)
 int board_late_init(void)
 {
 #ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
-       u32 id[4];
-
        if (omap_revision() == DRA722_ES1_0)
                setenv("board_name", "dra72x");
        else
                setenv("board_name", "dra7xx");
 
-       id[0] = readl((*ctrl)->control_std_fuse_die_id_0);
-       id[1] = readl((*ctrl)->control_std_fuse_die_id_1);
-       usb_set_serial_num_from_die_id(id);
+       omap_die_id_serial();
 #endif
        return 0;
 }
@@ -163,6 +159,7 @@ static struct ti_usb_phy_device usb_phy2_device = {
 
 int board_usb_init(int index, enum usb_init_type init)
 {
+       enable_usb_clocks(index);
        switch (index) {
        case 0:
                if (init == USB_INIT_DEVICE) {
@@ -209,6 +206,7 @@ int board_usb_cleanup(int index, enum usb_init_type init)
        default:
                printf("Invalid Controller Index\n");
        }
+       disable_usb_clocks(index);
        return 0;
 }