mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-26 06:04:14 +08:00
6ba74014c1
* 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)
22 lines
668 B
C
22 lines
668 B
C
#ifndef _MARVELL_PHY_H
|
|
#define _MARVELL_PHY_H
|
|
|
|
/* Mask used for ID comparisons */
|
|
#define MARVELL_PHY_ID_MASK 0xfffffff0
|
|
|
|
/* Known PHY IDs */
|
|
#define MARVELL_PHY_ID_88E1101 0x01410c60
|
|
#define MARVELL_PHY_ID_88E1112 0x01410c90
|
|
#define MARVELL_PHY_ID_88E1111 0x01410cc0
|
|
#define MARVELL_PHY_ID_88E1118 0x01410e10
|
|
#define MARVELL_PHY_ID_88E1121R 0x01410cb0
|
|
#define MARVELL_PHY_ID_88E1145 0x01410cd0
|
|
#define MARVELL_PHY_ID_88E1240 0x01410e30
|
|
#define MARVELL_PHY_ID_88EC048 0x01410e90
|
|
|
|
/* struct phy_device dev_flags definitions */
|
|
#define MARVELL_PHY_M1145_FLAGS_RESISTANCE 0x00000001
|
|
#define MARVELL_PHY_M1118_DNS323_LEDS 0x00000002
|
|
|
|
#endif /* _MARVELL_PHY_H */
|