1. 31 1月, 2012 1 次提交
  2. 19 8月, 2011 1 次提交
    • T
      net: fix IBM EMAC driver after rename. · 3b3bceef
      Tony Breeds 提交于
      In commit 9aa32835 (ehea/ibm*: Move the
      IBM drivers) the IBM_NEW_EMAC* were renames to IBM_EMAC*
      
      The conversion was incomplete so that even if the driver was added to
      the .config it wasn't built, but there were no errors).  In this commit
      we also update the various defconfigs that use EMAC to use the new
      Kconfig symbol, and explicitly add the NET_VENDOR_IBM guard.
      
      We do not explicitly select the Kconfig dependencies, as this would force
      EMAC on.  Doing it in the defconfig allows more flexibility.
      
      Tested on a canyondlands board.
      Signed-off-by: NTony Breeds <tony@bakeyournoodle.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      3b3bceef
  3. 11 8月, 2011 1 次提交
    • J
      ehea/ibm*: Move the IBM drivers · 9aa32835
      Jeff Kirsher 提交于
      Move the IBM drivers into drivers/net/ethernet/ibm/ and make the
      necessary Kconfig and Makefile changes.
      
      - Renamed ibm_new_emac to emac
      - Cleaned up Makefile and Kconfig options which referred to
        IBM_NEW_EMAC to IBM_EMAC
      - ibmlana driver is a National Semiconductor SONIC driver so
        it was not moved
      
      CC: Christoph Raisch <raisch@de.ibm.com>
      CC: Santiago Leon <santil@linux.vnet.ibm.com>
      CC: Benjamin Herrenschmidt <benh@kernel.crashing.org>
      CC: David Gibson <dwg@au1.ibm.com>
      CC: Kyle Lucke <klucke@us.ibm.com>
      CC: Michael Ellerman <michael@ellerman.id.au>
      Signed-off-by: NJeff Kirsher <jeffrey.t.kirsher@intel.com>
      9aa32835
  4. 06 8月, 2010 1 次提交
  5. 08 12月, 2007 2 次提交
  6. 11 10月, 2007 1 次提交
    • D
      Device tree aware EMAC driver · 1d3bb996
      David Gibson 提交于
      Based on BenH's earlier work, this is a new version of the EMAC driver
      for the built-in ethernet found on PowerPC 4xx embedded CPUs.  The
      same ASIC is also found in the Axon bridge chip.  This new version is
      designed to work in the arch/powerpc tree, using the device tree to
      probe the device, rather than the old and ugly arch/ppc OCP layer.
      
      This driver is designed to sit alongside the old driver (that lies in
      drivers/net/ibm_emac and this one in drivers/net/ibm_newemac).  The
      old driver is left in place to support arch/ppc until arch/ppc itself
      reaches its final demise (not too long now, with luck).
      
      This driver still has a number of things that could do with cleaning
      up, but I think they can be fixed up after merging.  Specifically:
      	- Should be adjusted to properly use the dma mapping API.
      Axon needs this.
      	- Probe logic needs reworking, in conjuction with the general
      probing code for of_platform devices.  The dependencies here between
      EMAC, MAL, ZMII etc. make this complicated.  At present, it usually
      works, because we initialize and register the sub-drivers before the
      EMAC driver itself, and (being in driver code) runs after the devices
      themselves have been instantiated from the device tree.
      Signed-off-by: NDavid Gibson <david@gibson.dropbear.id.au>
      Signed-off-by: NJeff Garzik <jeff@garzik.org>
      1d3bb996