Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 43c6759e authored by Javier Martinez Canillas's avatar Javier Martinez Canillas Committed by David S. Miller
Browse files

net: phy: smsc: Move SMSC PHY constants to <linux/smscphy.h> 



SMSC generation 4 LAN chips integrate an IEEE 802.3 ethernet physical layer.
The ethernet driver for this family of devices needs to access the SMSC PHY
registers and bit-fields.

So, this patch moves these constants to a place where it can be used for both
the PHY and LAN drivers.

Signed-off-by: default avatarJavier Martinez Canillas <javier@dowhile0.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 57adc1fc

drivers/net/ethernet/smsc/smsc911x.h

+4 −0
Original line number Diff line number Diff line
@@ -401,4 +401,8 @@ 
#include <asm/smsc911x.h>

#endif



#ifdef CONFIG_SMSC_PHY

#include <linux/smscphy.h>

#endif



#endif				/* __SMSC911X_H__ */

drivers/net/phy/smsc.c

+1 −20
Original line number Diff line number Diff line
@@ -22,26 +22,7 @@ 
#include <linux/ethtool.h>

#include <linux/phy.h>

#include <linux/netdevice.h>



#define MII_LAN83C185_ISF 29 /* Interrupt Source Flags */

#define MII_LAN83C185_IM  30 /* Interrupt Mask */

#define MII_LAN83C185_CTRL_STATUS 17 /* Mode/Status Register */



#define MII_LAN83C185_ISF_INT1 (1<<1) /* Auto-Negotiation Page Received */

#define MII_LAN83C185_ISF_INT2 (1<<2) /* Parallel Detection Fault */

#define MII_LAN83C185_ISF_INT3 (1<<3) /* Auto-Negotiation LP Ack */

#define MII_LAN83C185_ISF_INT4 (1<<4) /* Link Down */

#define MII_LAN83C185_ISF_INT5 (1<<5) /* Remote Fault Detected */

#define MII_LAN83C185_ISF_INT6 (1<<6) /* Auto-Negotiation complete */

#define MII_LAN83C185_ISF_INT7 (1<<7) /* ENERGYON */



#define MII_LAN83C185_ISF_INT_ALL (0x0e)



#define MII_LAN83C185_ISF_INT_PHYLIB_EVENTS \

	(MII_LAN83C185_ISF_INT6 | MII_LAN83C185_ISF_INT4 | \

	 MII_LAN83C185_ISF_INT7)



#define MII_LAN83C185_EDPWRDOWN	(1 << 13) /* EDPWRDOWN */

#include <linux/smscphy.h>



static int smsc_phy_config_intr(struct phy_device *phydev)

{

include/linux/smscphy.h

0 → 100644
+25 −0
Original line number Diff line number Diff line 
#ifndef __LINUX_SMSCPHY_H__

#define __LINUX_SMSCPHY_H__



#define MII_LAN83C185_ISF 29 /* Interrupt Source Flags */

#define MII_LAN83C185_IM  30 /* Interrupt Mask */

#define MII_LAN83C185_CTRL_STATUS 17 /* Mode/Status Register */



#define MII_LAN83C185_ISF_INT1 (1<<1) /* Auto-Negotiation Page Received */

#define MII_LAN83C185_ISF_INT2 (1<<2) /* Parallel Detection Fault */

#define MII_LAN83C185_ISF_INT3 (1<<3) /* Auto-Negotiation LP Ack */

#define MII_LAN83C185_ISF_INT4 (1<<4) /* Link Down */

#define MII_LAN83C185_ISF_INT5 (1<<5) /* Remote Fault Detected */

#define MII_LAN83C185_ISF_INT6 (1<<6) /* Auto-Negotiation complete */

#define MII_LAN83C185_ISF_INT7 (1<<7) /* ENERGYON */



#define MII_LAN83C185_ISF_INT_ALL (0x0e)



#define MII_LAN83C185_ISF_INT_PHYLIB_EVENTS \

	(MII_LAN83C185_ISF_INT6 | MII_LAN83C185_ISF_INT4 | \

	 MII_LAN83C185_ISF_INT7)



#define MII_LAN83C185_EDPWRDOWN (1 << 13) /* EDPWRDOWN */

#define MII_LAN83C185_ENERGYON  (1 << 1)  /* ENERGYON */



#endif /* __LINUX_SMSCPHY_H__ */