23 Nov, 2010

1 commit

  • The 88E1149R is 10/100/1000 quad-gigabit Ethernet PHY. The
    .config_aneg function can be shared with 88E1118, but it needs its own
    .config_init.

    Signed-off-by: David Daney
    Cc: Cyril Chemparathy
    Cc: Arnaud Patard
    Cc: Benjamin Herrenschmidt
    Cc: Wolfram Sang
    Signed-off-by: David S. Miller

    David Daney
     

30 Oct, 2010

1 commit


05 Aug, 2010

1 commit

  • * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1443 commits)
    phy/marvell: add 88ec048 support
    igb: Program MDICNFG register prior to PHY init
    e1000e: correct MAC-PHY interconnect register offset for 82579
    hso: Add new product ID
    can: Add driver for esd CAN-USB/2 device
    l2tp: fix export of header file for userspace
    can-raw: Fix skb_orphan_try handling
    Revert "net: remove zap_completion_queue"
    net: cleanup inclusion
    phy/marvell: add 88e1121 interface mode support
    u32: negative offset fix
    net: Fix a typo from "dev" to "ndev"
    igb: Use irq_synchronize per vector when using MSI-X
    ixgbevf: fix null pointer dereference due to filter being set for VLAN 0
    e1000e: Fix irq_synchronize in MSI-X case
    e1000e: register pm_qos request on hardware activation
    ip_fragment: fix subtracting PPPOE_SES_HLEN from mtu twice
    net: Add getsockopt support for TCP thin-streams
    cxgb4: update driver version
    cxgb4: add new PCI IDs
    ...

    Manually fix up conflicts in:
    - drivers/net/e1000e/netdev.c: due to pm_qos registration
    infrastructure changes
    - drivers/net/phy/marvell.c: conflict between adding 88ec048 support
    and cleaning up the IDs
    - drivers/net/wireless/ipw2x00/ipw2100.c: trivial ipw2100_pm_qos_req
    conflict (registration change vs marking it static)

    Linus Torvalds
     

17 Jul, 2010

1 commit

  • This moves the various known Marvell PHY IDs to include/linux/marvell_phy.h
    along with dev_flags definitions for use by the driver.

    I then added a flag that changes the PHY init code to setup the LEDs
    config to the values needed to operate a dns323 rev C1 NAS.

    I moved the existing "resistance" flag to the .h as well, though I've
    been unable to find whoever sets this to convert it to use that constant.

    Signed-off-by: Benjamin Herrenschmidt
    Reviewed-by: Wolfram Sang
    Acked-by: David S. Miller
    Signed-off-by: Nicolas Pitre

    Benjamin Herrenschmidt