1. 24 9月, 2011 1 次提交
    • S
      net/fec: fec_reset_phy() does not need to always succeed · a9b2c8ef
      Shawn Guo 提交于
      FEC can work without a phy reset on some platforms, which means not
      very platform necessarily have a phy-reset gpio encoded in device tree.
      Even on the platforms that have the gpio, FEC can work without
      resetting phy for some cases, e.g. boot loader has done that.
      
      So it makes more sense to have the phy-reset-gpio request failure as
      a debug message rather than a warning, and get fec_reset_phy() return
      void since the caller does not check the return anyway.
      Signed-off-by: NShawn Guo <shawn.guo@linaro.org>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      a9b2c8ef
  2. 18 8月, 2011 1 次提交
  3. 12 8月, 2011 1 次提交
    • J
      freescale: Move the Freescale drivers · ec21e2ec
      Jeff Kirsher 提交于
      Move the Freescale drivers into drivers/net/ethernet/freescale/ and
      make the necessary Kconfig and Makefile changes.
      
      CC: Sandeep Gopalpet <sandeep.kumar@freescale.com>
      CC: Andy Fleming <afleming@freescale.com>
      CC: Shlomi Gridish <gridish@freescale.com>
      CC: Li Yang <leoli@freescale.com>
      CC: Pantelis Antoniou <pantelis.antoniou@gmail.com>
      CC: Vitaly Bordug <vbordug@ru.mvista.com>
      CC: Dan Malek <dmalek@jlc.net>
      CC: Sylvain Munaut <tnt@246tNt.com>
      Signed-off-by: NJeff Kirsher <jeffrey.t.kirsher@intel.com>
      ec21e2ec
  4. 27 7月, 2011 2 次提交
  5. 09 7月, 2011 1 次提交
  6. 20 6月, 2011 1 次提交
  7. 14 6月, 2011 1 次提交
  8. 01 3月, 2011 1 次提交
  9. 18 2月, 2011 1 次提交
  10. 15 2月, 2011 14 次提交
  11. 10 1月, 2011 5 次提交
    • S
      net/fec: add dual fec support for mx28 · b5680e0b
      Shawn Guo 提交于
      This patch is to add mx28 dual fec support. Here are some key notes
      for mx28 fec controller.
      
       - The mx28 fec controller naming ENET-MAC is a different IP from FEC
         used on other i.mx variants.  But they are basically compatible
         on software interface, so it's possible to share the same driver.
       - ENET-MAC design on mx28 made an improper assumption that it runs
         on a big-endian system. As the result, driver has to swap every
         frame going to and coming from the controller.
       - The external phys can only be configured by fec0, which means fec1
         can not work independently and both phys need to be configured by
         mii_bus attached on fec0.
       - ENET-MAC reset will get mac address registers reset too.
       - ENET-MAC MII/RMII mode and 10M/100M speed are configured
         differently FEC.
       - ETHER_EN bit must be set to get ENET-MAC interrupt work.
      Signed-off-by: NShawn Guo <shawn.guo@freescale.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      b5680e0b
    • S
      net/fec: improve pm for better suspend/resume · bcc67771
      Shawn Guo 提交于
      The following commit made a fix to use fec_enet_open/fec_enet_close
      over fec_enet_init/fec_stop for suspend/resume, because fec_enet_init
      does not allow to have a working network interface at resume.
      
        e3fe8558
        net/fec: fix pm to survive to suspend/resume
      
      This fix works for i.mx/mxc fec controller, but fails on mx28 fec
      which gets a different interrupt logic design. On i.mx fec, interrupt
      can be triggered even bit ETHER_EN of ECR register is not set. But
      on mx28 fec, ETHER_EN must be set to get interrupt work. Meanwhile,
      MII interrupt is mandatory to resume the driver, because MDIO
      read/write changed to interrupt mode by commit below.
      
        97b72e43
        fec: use interrupt for MDIO completion indication
      
      fec_restart/fec_stop comes out as the solution working for both
      cases.
      Signed-off-by: NShawn Guo <shawn.guo@freescale.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      bcc67771
    • S
      net/fec: add mac field into platform data and consolidate fec_get_mac · 49da97dc
      Shawn Guo 提交于
      Add mac field into fec_platform_data and consolidate function
      fec_get_mac to get mac address in following order.
      
       1) module parameter via kernel command line fec.macaddr=0x00,0x04,...
       2) from flash in case of CONFIG_M5272 or fec_platform_data mac
          field for others, which typically have mac stored in fuse
       3) fec mac address registers set by bootloader
      Signed-off-by: NShawn Guo <shawn.guo@freescale.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      49da97dc
    • S
      net/fec: remove the use of "index" which is legacy · 8649a230
      Shawn Guo 提交于
      The "index" becomes legacy since fep->pdev->id starts working
      to identify the instance.
      
      Moreover, the call of fec_enet_init(ndev, 0) always passes 0
      to fep->index. This makes the following code in fec_get_mac buggy.
      
      	/* Adjust MAC if using default MAC address */
      	if (iap == fec_mac_default)
      		dev->dev_addr[ETH_ALEN-1] = fec_mac_default[ETH_ALEN-1] + fep->index;
      
      It may be the time to remove "index" and use fep->pdev->id instead.
      Signed-off-by: NShawn Guo <shawn.guo@freescale.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      8649a230
    • S
      net/fec: fix MMFR_OP type in fec_enet_mdio_write · 862f0982
      Shawn Guo 提交于
      FEC_MMFR_OP_WRITE should be used than FEC_MMFR_OP_READ in
      a mdio write operation.
      
      It's probably a typo introduced by commit:
      
      e6b043d5
      netdev/fec.c: add phylib supporting to enable carrier detection (v2)
      Signed-off-by: NShawn Guo <shawn.guo@freescale.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      862f0982
  12. 14 10月, 2010 1 次提交
    • G
      net: allow FEC driver to use fixed PHY support · 6fcc040f
      Greg Ungerer 提交于
      At least one board using the FEC driver does not have a conventional
      PHY attached to it, it is directly connected to a somewhat simple
      ethernet switch (the board is the SnapGear/LITE, and the attached
      4-port ethernet switch is a RealTek RTL8305). This switch does not
      present the usual register interface of a PHY, it presents nothing.
      So a PHY scan will find nothing - it finds ID's of 0 for each PHY
      on the attached MII bus.
      
      After the FEC driver was changed to use phylib for supporting PHYs
      it no longer works on this particular board/switch setup.
      
      Add code support to use a fixed phy if no PHY is found on the MII bus.
      This is based on the way the cpmac.c driver solved this same problem.
      Signed-off-by: NGreg Ungerer <gerg@uclinux.org>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      6fcc040f
  13. 11 10月, 2010 1 次提交
  14. 23 7月, 2010 1 次提交
  15. 19 7月, 2010 1 次提交
  16. 13 7月, 2010 1 次提交
  17. 26 6月, 2010 1 次提交
    • E
      net/fec: clean suspend/resume · 87cad5c3
      Eric Benard 提交于
      Commit 59d4289b converted fec to dev_pm_ops but
      didn't update the suspend/resume functions thus leading to the following warning :
      "initialization from incompatible pointer type" when CONFIG_PM is set.
      
      This patch also fixe a few indentation and style around CONFIG_PM area.
      Signed-off-by: NEric Bénard <eric@eukrea.com>
      Cc: netdev@vger.kernel.org
      Cc: davem@davemloft.net
      Cc: amit.kucheria@canonical.com
      Cc: s.hauer@pengutronix.de
      Cc: linux-arm-kernel@lists.infradead.org
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      87cad5c3
  18. 05 6月, 2010 1 次提交
  19. 03 6月, 2010 2 次提交
  20. 02 6月, 2010 1 次提交
    • E
      net/fec: fix pm to survive to suspend/resume · e3fe8558
      Eric Bénard 提交于
      * in the actual driver, calling fec_stop and fec_enet_init doesn't
      allow to have a working network interface at resume (where a
      ifconfig down and up is required to recover the interface)
      * by using fec_enet_close and fec_enet_open, this patch solves this
      problem and handle the case where the link changed between suspend
      and resume
      * this patch also disable clock at suspend and reenable it at resume
      Signed-off-by: NEric Bénard <eric@eukrea.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      e3fe8558
  21. 28 5月, 2010 1 次提交