| Message ID | 20201023105626.6534-4-o.rempel@pengutronix.de |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | David Miller |
| Headers | show |
| Series | add initial CAN PHY support | expand |
| Context | Check | Description |
|---|---|---|
| jkicinski/cover_letter | success | Link |
| jkicinski/fixes_present | success | Link |
| jkicinski/patch_count | success | Link |
| jkicinski/tree_selection | success | Guessed tree name to be net-next |
| jkicinski/subject_prefix | warning | Target tree name not specified in the subject |
| jkicinski/source_inline | success | Was 0 now: 0 |
| jkicinski/verify_signedoff | success | Link |
| jkicinski/module_param | success | Was 0 now: 0 |
| jkicinski/build_32bit | fail | Errors and warnings before: 662 this patch: 661 |
| jkicinski/kdoc | success | Errors and warnings before: 1 this patch: 1 |
| jkicinski/verify_fixes | success | Link |
| jkicinski/checkpatch | warning | WARNING: Missing commit description - Add an appropriate one |
| jkicinski/build_allmodconfig_warn | fail | Errors and warnings before: 589 this patch: 588 |
| jkicinski/header_inline | success | Link |
| jkicinski/stable | success | Stable not CCed |
On Fri, Oct 23, 2020 at 12:56:23PM +0200, Oleksij Rempel wrote: > Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de> > --- > drivers/net/phy/phy.c | 2 ++ > include/linux/phy.h | 3 +++ > 2 files changed, 5 insertions(+) > > diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c > index 35525a671400..4fb355df3e61 100644 > --- a/drivers/net/phy/phy.c > +++ b/drivers/net/phy/phy.c > @@ -324,6 +324,8 @@ void phy_ethtool_ksettings_get(struct phy_device *phydev, > cmd->base.master_slave_state = phydev->master_slave_state; > if (phydev->interface == PHY_INTERFACE_MODE_MOCA) > cmd->base.port = PORT_BNC; > + else if (phydev->interface == PHY_INTERFACE_MODE_CAN) > + cmd->base.port = PORT_OTHER; > else > cmd->base.port = PORT_MII; There is nothing stopping you from adding CAN specific PORT_ types. Andrew
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index 35525a671400..4fb355df3e61 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -324,6 +324,8 @@ void phy_ethtool_ksettings_get(struct phy_device *phydev, cmd->base.master_slave_state = phydev->master_slave_state; if (phydev->interface == PHY_INTERFACE_MODE_MOCA) cmd->base.port = PORT_BNC; + else if (phydev->interface == PHY_INTERFACE_MODE_CAN) + cmd->base.port = PORT_OTHER; else cmd->base.port = PORT_MII; cmd->base.transceiver = phy_is_internal(phydev) ? diff --git a/include/linux/phy.h b/include/linux/phy.h index 92225fc0d105..c5d8628cecf3 100644 --- a/include/linux/phy.h +++ b/include/linux/phy.h @@ -144,6 +144,7 @@ typedef enum { PHY_INTERFACE_MODE_USXGMII, /* 10GBASE-KR - with Clause 73 AN */ PHY_INTERFACE_MODE_10GKR, + PHY_INTERFACE_MODE_CAN, PHY_INTERFACE_MODE_MAX, } phy_interface_t; @@ -225,6 +226,8 @@ static inline const char *phy_modes(phy_interface_t interface) return "usxgmii"; case PHY_INTERFACE_MODE_10GKR: return "10gbase-kr"; + case PHY_INTERFACE_MODE_CAN: + return "can"; default: return "unknown"; }
Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de> --- drivers/net/phy/phy.c | 2 ++ include/linux/phy.h | 3 +++ 2 files changed, 5 insertions(+)