colibri_vf: Add pinmux entries for GPIOs

[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..b551d4ed7e34ece6c2c31c741e561d819a8d7bcc 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;
@@ -27,8 +27,6 @@ int checkboard(void)
 #ifdef CONFIG_BFIN_MAC
 static void board_init_enetaddr(uchar *mac_addr)
 {
-       bool valid_mac = false;
-
        /* the MAC is stored in OTP memory page 0xDF */
        uint32_t ret;
        uint64_t otp_mac;
@@ -40,16 +38,9 @@ static void board_init_enetaddr(uchar *mac_addr)
                for (ret = 0; ret < 6; ++ret)
                        mac_addr[ret] = otp_mac_p[5 - ret];
 
-               if (is_valid_ether_addr(mac_addr))
-                       valid_mac = true;
-       }
-
-       if (!valid_mac) {
-               puts("Warning: Generating 'random' MAC address\n");
-               bfin_gen_rand_mac(mac_addr);
+               if (is_valid_ethaddr(mac_addr))
+                       eth_setenv_enetaddr("ethaddr", mac_addr);
        }
-
-       eth_setenv_enetaddr("ethaddr", mac_addr);
 }
 
 int board_eth_init(bd_t *bis)
@@ -75,9 +66,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