1. 29 2月, 2016 24 次提交
  2. 27 2月, 2016 7 次提交
    • T
      Merge git://git.denx.de/u-boot-usb · 50dc8677
      Tom Rini 提交于
      50dc8677
    • T
      Merge git://git.denx.de/u-boot-dm · d5c6144f
      Tom Rini 提交于
      d5c6144f
    • T
      Merge branch 'master' of git://git.denx.de/u-boot-net · 38e65aeb
      Tom Rini 提交于
      38e65aeb
    • A
      net: bootp: Add environment variable for timeout period · 50768f5b
      Alexandre Messier 提交于
      There is currently one config option (CONFIG_NET_RETRY_COUNT) that
      is available to tune the retries of the network stack.
      Unfortunately, it is global to all protocols, and the value is
      interpreted differently in all of them.
      
      Add a new environment variable that directly sets the retry period for
      BOOTP timeouts. If this new value is not set, the period is still derived
      from the default number of retries, or from CONFIG_NET_RETRY_COUNT if
      defined. When both the new variable is set and CONFIG_NET_RETRY_COUNT
      is defined, the variable has precedence.
      Signed-off-by: NAlexandre Messier <amessier@tycoint.com>
      50768f5b
    • A
      net: phy: atheros: Fix problem with phy_reset() clearing BMCR · 903d384d
      Alison Wang 提交于
      In commit <a058052c> [net: phy: do not read configuration register on
      reset], phy_reset() will clear the BMCR register. Bit 12(AUTO_NEGOTIATION)
      is cleared too. It causes auto-negotiation timeout error on Atheros's
      PHY AR8033.
      
      To fix this problem, genphy_config_aneg() and genphy_restart_aneg()
      needs to be called in ar8035_config() to enable and restart
      auto-negotiation.
      Signed-off-by: NAlison Wang <alison.wang@nxp.com>
      Acked-by: NStefan Agner <stefan@agner.ch>
      Acked-by: NJoe Hershberger <joe.hershberger@ni.com>
      903d384d
    • Y
      powerpc/t208xqds: fix esdhc peripheral clock support · cf23b4da
      Yangbo Lu 提交于
      The patch that enabled eSDHC peripheral clock support had an
      obvious error as below. This patch is used to fix it.
      
      +#define define CONFIG_FSL_ESDHC_USE_PERIPHERAL_CLK
      
      Fixes: 3285e6cb ("powerpc/t2080qds: enable eSDHC peripheral clock support")
      Signed-off-by: NYangbo Lu <yangbo.lu@nxp.com>
      Reviewed-by: NYork Sun <york.sun@nxp.com>
      cf23b4da
    • M
      usb: ehci: Fix warning on aarch64 · abd702f4
      Marek Vasut 提交于
      Fix the following warning on aarch64 introduced by using p2v/v2p
      functions in the code:
      
      In file included from ./arch/arm/include/asm/byteorder.h:29:0,
                       from include/compiler.h:125,
                       from include/image.h:19,
                       from include/common.h:88,
                       from drivers/usb/host/ehci-hcd.c:10:
      drivers/usb/host/ehci-hcd.c: In function ‘ehci_td_buffer’:
      drivers/usb/host/ehci-hcd.c:250:49: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
         td->qt_buffer[idx] = cpu_to_hc32(virt_to_phys((void *)addr));
                                                       ^
      include/linux/byteorder/little_endian.h:34:51: note: in definition of macro ‘__cpu_to_le32’
       #define __cpu_to_le32(x) ((__force __le32)(__u32)(x))
                                                         ^
      drivers/usb/host/ehci-hcd.c:250:24: note: in expansion of macro ‘cpu_to_hc32’
         td->qt_buffer[idx] = cpu_to_hc32(virt_to_phys((void *)addr));
      Signed-off-by: NMarek Vasut <marex@denx.de>
      Cc: Stephen Warren <swarren@wwwdotorg.org>
      Cc: Tom Rini <trini@konsulko.com>
      abd702f4
  3. 26 2月, 2016 9 次提交