Update from 2013.01 to 2013.07

Conflicts:
	board/karo/tx48/tx48.c
	drivers/net/phy/phy.c
	drivers/net/phy/smsc.c

diff --cc board/karo/tx48/tx48.c
index f7c583e71b6b8f6976cee03617b008836f70cfee,9e59ebf1d22071e922b0814b99c2cf339ac446c9..302a8b6190c687aa437eddd0d47f20e13455f659
--- 1/board/karo/tx48/tx48.c
--- 2/board/karo/tx48/tx48.c
+++ b/board/karo/tx48/tx48.c
@@@ -330,9 -326,13 +326,14 @@@ static u32 prm_rstst __attribute__((sec
   * Basic board specific setup
   */
  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[] = {
        { OFFSET(i2c0_sda), MODE(0) | RXACTIVE | PULLUDEN | PULLUP_EN, },
        { OFFSET(i2c0_scl), MODE(0) | RXACTIVE | PULLUDEN | PULLUP_EN, },
-       { OFFSET(emu1), MODE(7), }, /* ETH PHY Reset */
  };
  
  static const struct gpio tx48_gpios[] = {
@@@ -767,30 -1051,8 +1051,9 @@@ static struct cpsw_platform_data cpsw_d
  
  int board_eth_init(bd_t *bis)
  {
-       uint8_t mac_addr[ETH_ALEN];
-       uint32_t mac_hi, mac_lo;
- 
-       /* try reading mac address from efuse */
-       mac_lo = __raw_readl(MAC_ID0_LO);
-       mac_hi = __raw_readl(MAC_ID0_HI);
- 
-       mac_addr[0] = mac_hi & 0xFF;
-       mac_addr[1] = (mac_hi & 0xFF00) >> 8;
-       mac_addr[2] = (mac_hi & 0xFF0000) >> 16;
-       mac_addr[3] = (mac_hi & 0xFF000000) >> 24;
-       mac_addr[4] = mac_lo & 0xFF;
-       mac_addr[5] = (mac_lo & 0xFF00) >> 8;
- 
-       if (is_valid_ether_addr(mac_addr)) {
-               debug("MAC addr set to: %pM\n", mac_addr);
-               eth_setenv_enetaddr("ethaddr", mac_addr);
-       } else {
-               printf("ERROR: Did not find a valid mac address in e-fuse\n");
-       }
- 
        __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 */

diff --cc drivers/net/phy/phy.c
Simple merge

diff --cc drivers/net/phy/smsc.c
Simple merge