Merge branch 'karo-tx-uboot' into kc-merge

[karo-tx-uboot.git] / board / bf527-ezkit / bf527-ezkit.c

diff --git a/board/bf527-ezkit/bf527-ezkit.c b/board/bf527-ezkit/bf527-ezkit.c
index a911880ee3d9507feab190ae44a3ff735785de6e..88e18690e031aec12ef451a0f352972113844e12 100644 (file)
--- a/board/bf527-ezkit/bf527-ezkit.c
+++ b/board/bf527-ezkit/bf527-ezkit.c
@@ -12,7 +12,7 @@
 #include <net.h>
 #include <netdev.h>
 #include <asm/blackfin.h>
-#include <asm/net.h>
+#include <asm/gpio.h>
 #include <asm/mach-common/bits/otp.h>
 
 DECLARE_GLOBAL_DATA_PTR;
@@ -46,7 +46,7 @@ static void board_init_enetaddr(uchar *mac_addr)
 
        if (!valid_mac) {
                puts("Warning: Generating 'random' MAC address\n");
-               bfin_gen_rand_mac(mac_addr);
+               eth_random_addr(mac_addr);
        }
 
        eth_setenv_enetaddr("ethaddr", mac_addr);
@@ -75,9 +75,7 @@ void board_musb_init(void)
        /*
         * BF527 EZ-KITs require PG13 to be high for HOST mode
         */
-       bfin_write_PORTG_FER(bfin_read_PORTG_FER() & ~PG13);
-       bfin_write_PORTGIO_DIR(bfin_read_PORTGIO_DIR() | PG13);
-       bfin_write_PORTGIO_SET(PG13);
-       SSYNC();
+       gpio_request(GPIO_PG13, "musb-vbus");
+       gpio_direction_output(GPIO_PG13, 1);
 }
 #endif