diff options
| author | Johan Hovold <johan@kernel.org> | 2014-11-11 14:00:09 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-11-12 13:55:35 -0500 |
| commit | 00aee095000c064cd77556050d08ed3f49f2af59 (patch) | |
| tree | e66784e1847b3ec6617889b914be6ab81ff4ac7b /drivers/net/phy | |
| parent | 5bb8fc0d1073e867f381316cb1c348fa45e2d602 (diff) | |
net: phy: micrel: use BIT macro
Use BIT macro for bitmask definitions.
Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/phy')
| -rw-r--r-- | drivers/net/phy/micrel.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c index 62ca9613a514..d962a2866bba 100644 --- a/drivers/net/phy/micrel.c +++ b/drivers/net/phy/micrel.c | |||
| @@ -30,30 +30,30 @@ | |||
| 30 | 30 | ||
| 31 | /* Operation Mode Strap Override */ | 31 | /* Operation Mode Strap Override */ |
| 32 | #define MII_KSZPHY_OMSO 0x16 | 32 | #define MII_KSZPHY_OMSO 0x16 |
| 33 | #define KSZPHY_OMSO_B_CAST_OFF (1 << 9) | 33 | #define KSZPHY_OMSO_B_CAST_OFF BIT(9) |
| 34 | #define KSZPHY_OMSO_RMII_OVERRIDE (1 << 1) | 34 | #define KSZPHY_OMSO_RMII_OVERRIDE BIT(1) |
| 35 | #define KSZPHY_OMSO_MII_OVERRIDE (1 << 0) | 35 | #define KSZPHY_OMSO_MII_OVERRIDE BIT(0) |
| 36 | 36 | ||
| 37 | /* general Interrupt control/status reg in vendor specific block. */ | 37 | /* general Interrupt control/status reg in vendor specific block. */ |
| 38 | #define MII_KSZPHY_INTCS 0x1B | 38 | #define MII_KSZPHY_INTCS 0x1B |
| 39 | #define KSZPHY_INTCS_JABBER (1 << 15) | 39 | #define KSZPHY_INTCS_JABBER BIT(15) |
| 40 | #define KSZPHY_INTCS_RECEIVE_ERR (1 << 14) | 40 | #define KSZPHY_INTCS_RECEIVE_ERR BIT(14) |
| 41 | #define KSZPHY_INTCS_PAGE_RECEIVE (1 << 13) | 41 | #define KSZPHY_INTCS_PAGE_RECEIVE BIT(13) |
| 42 | #define KSZPHY_INTCS_PARELLEL (1 << 12) | 42 | #define KSZPHY_INTCS_PARELLEL BIT(12) |
| 43 | #define KSZPHY_INTCS_LINK_PARTNER_ACK (1 << 11) | 43 | #define KSZPHY_INTCS_LINK_PARTNER_ACK BIT(11) |
| 44 | #define KSZPHY_INTCS_LINK_DOWN (1 << 10) | 44 | #define KSZPHY_INTCS_LINK_DOWN BIT(10) |
| 45 | #define KSZPHY_INTCS_REMOTE_FAULT (1 << 9) | 45 | #define KSZPHY_INTCS_REMOTE_FAULT BIT(9) |
| 46 | #define KSZPHY_INTCS_LINK_UP (1 << 8) | 46 | #define KSZPHY_INTCS_LINK_UP BIT(8) |
| 47 | #define KSZPHY_INTCS_ALL (KSZPHY_INTCS_LINK_UP |\ | 47 | #define KSZPHY_INTCS_ALL (KSZPHY_INTCS_LINK_UP |\ |
| 48 | KSZPHY_INTCS_LINK_DOWN) | 48 | KSZPHY_INTCS_LINK_DOWN) |
| 49 | 49 | ||
| 50 | /* general PHY control reg in vendor specific block. */ | 50 | /* general PHY control reg in vendor specific block. */ |
| 51 | #define MII_KSZPHY_CTRL 0x1F | 51 | #define MII_KSZPHY_CTRL 0x1F |
| 52 | /* bitmap of PHY register to set interrupt mode */ | 52 | /* bitmap of PHY register to set interrupt mode */ |
| 53 | #define KSZPHY_CTRL_INT_ACTIVE_HIGH (1 << 9) | 53 | #define KSZPHY_CTRL_INT_ACTIVE_HIGH BIT(9) |
| 54 | #define KSZ9021_CTRL_INT_ACTIVE_HIGH (1 << 14) | 54 | #define KSZ9021_CTRL_INT_ACTIVE_HIGH BIT(14) |
| 55 | #define KS8737_CTRL_INT_ACTIVE_HIGH (1 << 14) | 55 | #define KS8737_CTRL_INT_ACTIVE_HIGH BIT(14) |
| 56 | #define KSZ8051_RMII_50MHZ_CLK (1 << 7) | 56 | #define KSZ8051_RMII_50MHZ_CLK BIT(7) |
| 57 | 57 | ||
| 58 | /* Write/read to/from extended registers */ | 58 | /* Write/read to/from extended registers */ |
| 59 | #define MII_KSZPHY_EXTREG 0x0b | 59 | #define MII_KSZPHY_EXTREG 0x0b |
| @@ -400,8 +400,8 @@ static int ksz9031_config_init(struct phy_device *phydev) | |||
| 400 | } | 400 | } |
| 401 | 401 | ||
| 402 | #define KSZ8873MLL_GLOBAL_CONTROL_4 0x06 | 402 | #define KSZ8873MLL_GLOBAL_CONTROL_4 0x06 |
| 403 | #define KSZ8873MLL_GLOBAL_CONTROL_4_DUPLEX (1 << 6) | 403 | #define KSZ8873MLL_GLOBAL_CONTROL_4_DUPLEX BIT(6) |
| 404 | #define KSZ8873MLL_GLOBAL_CONTROL_4_SPEED (1 << 4) | 404 | #define KSZ8873MLL_GLOBAL_CONTROL_4_SPEED BIT(4) |
| 405 | static int ksz8873mll_read_status(struct phy_device *phydev) | 405 | static int ksz8873mll_read_status(struct phy_device *phydev) |
| 406 | { | 406 | { |
| 407 | int regval; | 407 | int regval; |
