u-boot/drivers/net
Tom Rini 76b40ab41e Merge u-boot/master into u-boot-ti/master
In master we had already taken a patch to fix the davinci GPIO code for
CONFIG_SOC_DM646X and in u-boot-ti we have additional patches to support
DA830 (which is CONFIG_SOC_DA8XX && !CONFIG_SOC_DA850).  Resolve these
conflicts manually and comment the #else/#endif lines for clarity.

Conflicts:
	arch/arm/include/asm/arch-davinci/gpio.h
	drivers/gpio/da8xx_gpio.c

Signed-off-by: Tom Rini <trini@ti.com>
2013-03-11 12:16:13 -04:00
..
fm net: Use new numeric setenv functions 2013-02-28 19:09:23 -08:00
npe dm: net: Move IXP NPE to drivers/net/ 2012-09-24 13:17:24 -05:00
phy phy: add phy_find_by_mask/phy_connect_dev 2013-01-28 06:57:50 +01:00
4xx_enet.c drivers/net/4xx_enet.c: Fix build warning 2012-05-22 10:18:14 -05:00
8390.h drivers/net : move net drivers to drivers/net 2007-11-25 18:35:17 +01:00
altera_tse.c net: Fix remaining API interface breakage 2012-05-23 14:19:21 -05:00
altera_tse.h miiphy: convert to linux/mii.h 2011-01-09 18:06:50 +01:00
armada100_fec.c dm: net: Fixup the armada100 FEC driver 2012-09-24 13:55:20 -05:00
armada100_fec.h net: Adds Fast Ethernet Controller driver for Armada100 2011-09-30 22:00:53 +02:00
at91_emac.c drivers/net/at91_emac.c: Fix compile warning 2012-05-22 10:18:15 -05:00
ax88180.c net: Fix remaining API interface breakage 2012-05-23 14:19:21 -05:00
ax88180.h AX88180: use standard I/O accessors 2010-07-12 00:14:29 -07:00
ax88796.c net: ne2000: Divided a function of NE2000 driver 2008-10-13 22:28:32 -07:00
ax88796.h NE2000: Fix regresssion introduced by e710185aae on non AX88796 2008-04-28 22:26:36 -07:00
bfin_mac.c Blackfin: bfin_mac: drop volatile markings on packet buffers 2012-07-19 00:09:32 -04:00
bfin_mac.h net: Fix remaining API interface breakage 2012-05-23 14:19:21 -05:00
calxedaxgmac.c drivers/net/calxedaxgmac.c: Fix compile warning 2012-05-22 10:18:15 -05:00
cpsw.c am335x: cpsw: optimize cpsw_send to increase network performance 2013-03-11 11:06:09 -04:00
cs8900.c drivers/net/cs8900.c: Fix compile warning 2012-05-22 10:18:15 -05:00
cs8900.h Convert CS8900 Ethernet driver to CONFIG_NET_MULTI API 2009-08-25 13:35:54 -07:00
davinci_emac.c da850/omap-l138: davinci_emac: Suppress auto negotiation if needed 2012-10-01 10:02:13 -07:00
davinci_emac.h davinci_emac: fix for running with dcache enabled 2011-12-06 23:59:35 +01:00
dc2114x.c drivers/net/dc2114x.c: Fix compile warning 2012-05-22 10:18:15 -05:00
designware.c net/designware: Consecutive writes to the same register to be avoided 2012-07-11 13:15:31 -05:00
designware.h net: Multiple updates/enhancements to designware.c 2012-07-07 14:07:42 +02:00
dm9000x.c drivers/net/dm9000x.c: Fix compile warning 2012-05-22 10:18:15 -05:00
dm9000x.h dm9000 remove dead external phy support, gpio fix 2008-08-26 23:08:19 -07:00
dnet.c drivers/net/dnet.c: Fix compile warning 2012-05-22 10:18:15 -05:00
dnet.h dnet: driver for Dave DNET ethernet controller 2009-02-10 00:16:27 +01:00
e1000.c e1000e : Correct Rx Threshold granularity 2012-12-15 12:28:21 -06:00
e1000.h e1000e : Correct Rx Threshold granularity 2012-12-15 12:28:21 -06:00
e1000_spi.c drivers/net/e1000_spi.c: Fix build warnings 2011-12-20 23:13:49 +01:00
eepro100.c drivers/net/eepro100.c: Fix compile warning 2012-05-22 10:18:16 -05:00
enc28j60.c drivers/net/enc28j60.c: Fix compile warning 2012-05-22 10:18:16 -05:00
enc28j60.h NET: add ENC28J60 driver using SPI framework 2010-10-11 22:47:48 -07:00
ep93xx_eth.c net: Fix remaining API interface breakage 2012-05-23 14:19:21 -05:00
ep93xx_eth.h Add EP93xx ethernet driver 2010-01-31 22:37:12 -08:00
ethoc.c net: Fix remaining API interface breakage 2012-05-23 14:19:21 -05:00
fec_mxc.c net: fec_mxc: get phydev before fec_probe 2013-01-28 06:57:51 +01:00
fec_mxc.h net: fec_mxc: get phydev before fec_probe 2013-01-28 06:57:51 +01:00
fsl_mcdmafec.c net: Fix remaining API interface breakage 2012-05-23 14:19:21 -05:00
fsl_mdio.c tsec: Convert tsec to use PHY Lib 2011-04-20 15:09:34 -05:00
ftgmac100.c net: Fix remaining API interface breakage 2012-05-23 14:19:21 -05:00
ftgmac100.h ftgmac100: support of gigabit eth ftgmac100 2011-01-09 22:16:51 +01:00
ftmac100.c drivers/net/ftmac100.c: Fix compile warning 2012-05-22 10:18:16 -05:00
ftmac100.h arm: A320: driver for FTMAC100 ethernet controller 2009-08-10 14:53:52 -07:00
greth.c dm: sparc: net: Fixup greth compile warnings 2012-09-18 12:01:50 -07:00
greth.h SPARC/LEON3: Added GRETH Ethernet 10/100/1000 driver. 2008-03-30 00:33:28 -04:00
inca-ip_sw.c net: Fix remaining API interface breakage 2012-05-23 14:19:21 -05:00
ks8695eth.c drivers/net/ks8695eth.c: Fix compile warning 2012-05-22 10:18:16 -05:00
lan91c96.c drivers/net/lan91c96.c: Fix compile warning 2012-05-22 10:18:16 -05:00
lan91c96.h PXA: Rename CONFIG_PXA2[57]X to CONFIG_CPU_PXA2[57]X 2011-12-06 23:59:32 +01:00
macb.c include/linux/byteorder: import latest endian definitions from linux 2012-11-04 11:00:34 -07:00
macb.h AT91CAP9 support : MACB changes 2008-02-14 09:37:58 +00:00
Makefile arm: Remove support for NETARM 2012-10-26 22:38:00 +02:00
mcffec.c net: Fix remaining API interface breakage 2012-05-23 14:19:21 -05:00
mcfmii.c m68k: net: Fix unused variable in mcfmii.c 2012-10-19 23:47:41 +08:00
mpc5xxx_fec.c ppc: Move mpc5xxx clocks to arch_global_data 2013-02-04 09:05:43 -05:00
mpc5xxx_fec.h Move MPC5xxx_FEC driver to drivers/net 2008-08-29 13:58:07 -06:00
mpc512x_fec.c ppc: Move mpc512x clocks to arch_global_data 2013-02-04 09:05:43 -05:00
mpc512x_fec.h MPC512x: remove include/mpc512x.h 2009-06-12 20:47:16 +02:00
mvgbe.c net: Fix remaining API interface breakage 2012-05-23 14:19:21 -05:00
mvgbe.h mvgbe: enable configurability of PORT_SERIAL_CONTROL_VALUE 2011-05-31 19:46:14 +02:00
natsemi.c drivers/net/natsemi.c: Fix compile warning 2012-05-22 13:41:47 -05:00
ne2000.c consolidate mdelay by providing a common function for all users 2011-10-22 01:16:08 +02:00
ne2000.h NE2000: Fix regresssion introduced by e710185aae on non AX88796 2008-04-28 22:26:36 -07:00
ne2000_base.c net: Fix remaining API interface breakage 2012-05-23 14:19:21 -05:00
ne2000_base.h net: ne2000: Divided a function of NE2000 driver 2008-10-13 22:28:32 -07:00
netconsole.c net: Filter incoming netconsole packets by IP 2012-09-24 13:55:44 -05:00
nicext.h Big white-space cleanup. 2008-05-21 00:14:08 +02:00
ns8382x.c drivers/net/ns8382x.c: Fix compile warning 2012-05-22 13:41:47 -05:00
pcnet.c drivers/net/pcnet.c: Fix compile warning 2012-05-22 23:17:52 -05:00
plb2800_eth.c net: Fix remaining API interface breakage 2012-05-23 14:19:21 -05:00
rtl8139.c drivers/net/rtl8139.c: Fix compile warning 2012-05-22 13:41:47 -05:00
rtl8169.c drivers/net/rtl8169.c: Fix compile warning 2012-05-22 23:17:52 -05:00
sh_eth.c net: sh_eth: add support for SH7752 2012-12-15 12:28:24 -06:00
sh_eth.h net: sh_eth: add support for SH7752 2012-12-15 12:28:24 -06:00
smc911x.c drivers/net/smc911x.c: Fix GCC 4.6 warning 2012-05-22 10:18:13 -05:00
smc911x.h Improve Power Management in SMC911X driver. 2011-11-22 08:39:27 +01:00
smc91111.c include/linux/byteorder: import latest endian definitions from linux 2012-11-04 11:00:34 -07:00
smc91111.h PXA: Rename CONFIG_PXA2[57]X to CONFIG_CPU_PXA2[57]X 2011-12-06 23:59:32 +01:00
tsec.c net: abort network initialization if the PHY driver fails 2012-07-11 13:15:30 -05:00
tsi108_eth.c drivers/net/tsi108_eth.c: Fix compile warning 2012-05-22 13:41:47 -05:00
uli526x.c drivers/net/uli526x.c: Fix compile warning 2012-05-22 13:41:47 -05:00
vsc7385.c drivers/net/: sparse fixes 2012-11-04 11:00:36 -07:00
xilinx_axi_emac.c net: abort network initialization if the PHY driver fails 2012-07-11 13:15:30 -05:00
xilinx_emaclite.c net: emaclite: Support OF initialization 2012-09-24 13:17:25 -05:00
xilinx_ll_temac.c net: abort network initialization if the PHY driver fails 2012-07-11 13:15:30 -05:00
xilinx_ll_temac.h net: ll_temac: Add LL TEMAC driver to u-boot 2012-04-04 09:36:19 -05:00
xilinx_ll_temac_fifo.c drivers/net/xilinx_ll_temac.c: Fix compile warning 2012-05-22 23:17:52 -05:00
xilinx_ll_temac_fifo.h drivers/net/xilinx_ll_temac.c: Fix compile warning 2012-05-22 23:17:52 -05:00
xilinx_ll_temac_mdio.c net: ll_temac: Add LL TEMAC driver to u-boot 2012-04-04 09:36:19 -05:00
xilinx_ll_temac_mdio.h net: ll_temac: Add LL TEMAC driver to u-boot 2012-04-04 09:36:19 -05:00
xilinx_ll_temac_sdma.c drivers/net/xilinx_ll_temac.c: Fix compile warning 2012-05-22 23:17:52 -05:00
xilinx_ll_temac_sdma.h drivers/net/xilinx_ll_temac.c: Fix compile warning 2012-05-22 23:17:52 -05:00
zynq_gem.c net: Add driver for Zynq Gem IP 2012-09-26 12:36:32 -05:00