Update from 2013.01 to 2013.07

[karo-tx-uboot.git] / board / karo / tx48 / tx48.c

diff --git a/board/karo/tx48/tx48.c b/board/karo/tx48/tx48.c
index 9e59ebf1d22071e922b0814b99c2cf339ac446c9..302a8b6190c687aa437eddd0d47f20e13455f659 100644 (file)
--- a/board/karo/tx48/tx48.c
+++ b/board/karo/tx48/tx48.c
@@ -328,6 +328,7 @@ static u32 prm_rstst __attribute__((section(".data")));
 static const struct pin_mux tx48_pads[] = {
        { OFFSET(i2c0_sda), MODE(7) | RXACTIVE | PULLUDEN | PULLUP_EN, },
        { OFFSET(i2c0_scl), MODE(7) | RXACTIVE | PULLUDEN | PULLUP_EN, },
+       { OFFSET(emu1), MODE(7), }, /* ETH PHY Reset */
 };
 
 static const struct pin_mux tx48_i2c_pads[] = {
@@ -994,7 +995,7 @@ exit:
 }
 
 #ifdef CONFIG_DRIVER_TI_CPSW
-static void tx48_phy_init(char *name, int addr)
+static void tx48_phy_init(void)
 {
        debug("%s: Resetting ethernet PHY\n", __func__);
 
@@ -1043,7 +1044,6 @@ static struct cpsw_platform_data cpsw_data = {
        .hw_stats_reg_ofs       = 0x900,
        .mac_control            = (1 << 5) /* MIIEN */,
        .control                = cpsw_control,
-       .phy_init               = tx48_phy_init,
        .gigabit_en             = 0,
        .host_port_num          = 0,
        .version                = CPSW_CTRL_VERSION_2,
@@ -1053,6 +1053,7 @@ int board_eth_init(bd_t *bis)
 {
        __raw_writel(RMII_MODE_ENABLE, MAC_MII_SEL);
        __raw_writel(0x5D, GMII_SEL);
+       tx48_phy_init();
        return cpsw_register(&cpsw_data);
 }
 #endif /* CONFIG_DRIVER_TI_CPSW */