u-boot.git/drivers/net, branch v2013.07-rc1

Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'

2013-06-08T12:35:10Z

Conflicts: drivers/serial/Makefile

net: fec_mxc: Add support for Vybrid VF610

2013-06-03T08:56:53Z

This patch adds FEC support for Vybrid VF610 platform. In function fec_open(), RCR register is only set as RGMII mode. But RCR register should be set as RMII mode for VF610 platform. This configuration is already done in fec_reg_setup(), so this piece of code could just leave untouched the FEC_RCNTRL_RGMII / FEC_RCNTRL_RMII / FEC_RCNTRL_MII_MODE bits. Signed-off-by: Alison Wang Reviewed-by: Benoit Thebaudeau Reviewed-by: Benoît Thébaudeau

Merge branch 'u-boot/master' into 'u-boot-arm/master'

2013-05-30T12:45:06Z

Conflicts: common/cmd_fpga.c drivers/usb/host/ohci-at91.c

Enable XAUI interface for B4860QDS

2013-05-24T21:54:12Z

- Added SERDES2 PRTCLs = 0x98, 0x9E - Default Phy Addresses for Teranetics PHY on XAUI card The PHY addresses of Teranetics PHY on XAUI riser card are assigned based on the slot it is in. Switches SW4[2:4] and SW6[2:4] on AMC2PEX-2S On B4860QDS, AMC2PEX card decide the PHY addresses on slot1 and slot2 - Configure MDIO for 10Gig Mac Signed-off-by: Suresh Gupta Signed-off-by: Andy Fleming

net/phy: fix select line for TN80xx

2013-05-24T21:54:09Z

TN80xx has same PHY ID as TN2020, but it needs different setting to register 30.93 which used to select line, so we read register 30.32 which has bit 15:12 to indicate PHY hardware version, for TN20xx we will get 3 or 2, for TN80xx we will get 5 or 4. Signed-off-by: Shaohui Xie Signed-off-by: Andy Fleming

Merge branch 'master' of git://www.denx.de/git/u-boot-mpc85xx

2013-05-15T12:41:04Z

smc911x: fix the timeout detection

2013-05-15T12:41:03Z

If timeout is occurred at the while loop above, the value of 'timeout' is -1, not 0. Signed-off-by: Masahiro Yamada

net/phy: add VSC8574 support

2013-05-14T21:13:25Z

The VSC8574 is a quad-port Gigabit Ethernet transceiver with four SerDes interfaces for quad-port dual media capability. This driver supports SGMII and QSGMII MAC mode. For now SGMII mode is tested. Signed-off-by: Roy Zang Signed-off-by: Shaohui Xie Signed-off-by: Andy Fleming

net/fm: fixup ethernet for mEMAC

2013-05-14T21:13:24Z

- set proper compatible property name for mEMAC. - fixed ft_fixup_port for dual-role mEMAC, which will lead to MAC node disabled incorrectly. Signed-off-by: Shengzhou Liu Signed-off-by: Andy Fleming

powerpc/mpc85xx: Add T4160 SoC

2013-05-14T21:00:29Z

T4160 SoC is low power version of T4240. The T4160 combines eight dual threaded Power Architecture e6500 cores and two memory complexes (CoreNet platform cache and DDR3 memory controller) with the same high-performance datapath acceleration, networking, and peripheral bus interfaces. Signed-off-by: York Sun Signed-off-by: Andy Fleming