]> git.sur5r.net Git - u-boot/commitdiff
Merge branch 'master' of git://git.denx.de/u-boot-avr32
authorWolfgang Denk <wd@denx.de>
Thu, 7 Jun 2012 21:41:03 +0000 (23:41 +0200)
committerWolfgang Denk <wd@denx.de>
Thu, 7 Jun 2012 21:41:03 +0000 (23:41 +0200)
* 'master' of git://git.denx.de/u-boot-avr32:
  avr32:board.c: fix compile warning
  avr32:grasshopper: fix PHY initialisation

Signed-off-by: Wolfgang Denk <wd@denx.de>
arch/avr32/lib/board.c
board/in-circuit/grasshopper/grasshopper.c

index b390a6c8f8bbaf08f187e3bd0fe9892ee6b4d683..d7a64b48727aedaf5879ace43dd1faf9f3b759e0 100644 (file)
@@ -254,7 +254,6 @@ void board_init_r(gd_t *new_gd, ulong dest_addr)
 #ifndef CONFIG_ENV_IS_NOWHERE
        extern char * env_name_spec;
 #endif
-       char *s;
        bd_t *bd;
 
        gd = new_gd;
index 475a759b7a51031b953128310d72a5078b557b60..222fe43958346afa7d8db2656eb1fbed78e17841 100644 (file)
@@ -72,6 +72,13 @@ int board_early_init_f(void)
        portmux_enable_usart0(PORTMUX_DRIVE_MIN);
        portmux_enable_usart1(PORTMUX_DRIVE_MIN);
 #if defined(CONFIG_MACB)
+       /* set PHY reset and pwrdown to low */
+       portmux_select_gpio(PORTMUX_PORT_B, (1 << 29) | (1 << 30),
+               PORTMUX_DIR_OUTPUT | PORTMUX_INIT_LOW);
+       udelay(100);
+       /* release PHYs reset */
+       gpio_set_value(GPIO_PIN_PB(29), 1);
+
        portmux_enable_macb0(PORTMUX_MACB_MII, PORTMUX_DRIVE_LOW);
 #endif