Commit 29872216 authored by Christian Eggers's avatar Christian Eggers Committed by Jakub Kicinski

net: phy: mscc: use new PTP_MSGTYPE_* defines

Use recently introduced PTP_MSGTYPE_SYNC and PTP_MSGTYPE_DELAY_REQ
defines instead of a driver internal enumeration.
Signed-off-by: default avatarChristian Eggers <ceggers@arri.de>
Reviewed-by: default avatarAntoine Tenart <atenart@kernel.org>
Acked-by: default avatarRichard Cochran <richardcochran@gmail.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 37e9d055
...@@ -506,9 +506,9 @@ static int vsc85xx_ptp_cmp_init(struct phy_device *phydev, enum ts_blk blk) ...@@ -506,9 +506,9 @@ static int vsc85xx_ptp_cmp_init(struct phy_device *phydev, enum ts_blk blk)
{ {
struct vsc8531_private *vsc8531 = phydev->priv; struct vsc8531_private *vsc8531 = phydev->priv;
bool base = phydev->mdio.addr == vsc8531->ts_base_addr; bool base = phydev->mdio.addr == vsc8531->ts_base_addr;
enum vsc85xx_ptp_msg_type msgs[] = { u8 msgs[] = {
PTP_MSG_TYPE_SYNC, PTP_MSGTYPE_SYNC,
PTP_MSG_TYPE_DELAY_REQ PTP_MSGTYPE_DELAY_REQ
}; };
u32 val; u32 val;
u8 i; u8 i;
...@@ -847,9 +847,9 @@ static int vsc85xx_ts_ptp_action_flow(struct phy_device *phydev, enum ts_blk blk ...@@ -847,9 +847,9 @@ static int vsc85xx_ts_ptp_action_flow(struct phy_device *phydev, enum ts_blk blk
static int vsc85xx_ptp_conf(struct phy_device *phydev, enum ts_blk blk, static int vsc85xx_ptp_conf(struct phy_device *phydev, enum ts_blk blk,
bool one_step, bool enable) bool one_step, bool enable)
{ {
enum vsc85xx_ptp_msg_type msgs[] = { u8 msgs[] = {
PTP_MSG_TYPE_SYNC, PTP_MSGTYPE_SYNC,
PTP_MSG_TYPE_DELAY_REQ PTP_MSGTYPE_DELAY_REQ
}; };
u32 val; u32 val;
u8 i; u8 i;
...@@ -858,7 +858,7 @@ static int vsc85xx_ptp_conf(struct phy_device *phydev, enum ts_blk blk, ...@@ -858,7 +858,7 @@ static int vsc85xx_ptp_conf(struct phy_device *phydev, enum ts_blk blk,
if (blk == INGRESS) if (blk == INGRESS)
vsc85xx_ts_ptp_action_flow(phydev, blk, msgs[i], vsc85xx_ts_ptp_action_flow(phydev, blk, msgs[i],
PTP_WRITE_NS); PTP_WRITE_NS);
else if (msgs[i] == PTP_MSG_TYPE_SYNC && one_step) else if (msgs[i] == PTP_MSGTYPE_SYNC && one_step)
/* no need to know Sync t when sending in one_step */ /* no need to know Sync t when sending in one_step */
vsc85xx_ts_ptp_action_flow(phydev, blk, msgs[i], vsc85xx_ts_ptp_action_flow(phydev, blk, msgs[i],
PTP_WRITE_1588); PTP_WRITE_1588);
......
...@@ -436,11 +436,6 @@ enum ptp_cmd { ...@@ -436,11 +436,6 @@ enum ptp_cmd {
PTP_SAVE_IN_TS_FIFO = 11, /* invalid when writing in reg */ PTP_SAVE_IN_TS_FIFO = 11, /* invalid when writing in reg */
}; };
enum vsc85xx_ptp_msg_type {
PTP_MSG_TYPE_SYNC,
PTP_MSG_TYPE_DELAY_REQ,
};
struct vsc85xx_ptphdr { struct vsc85xx_ptphdr {
u8 tsmt; /* transportSpecific | messageType */ u8 tsmt; /* transportSpecific | messageType */
u8 ver; /* reserved0 | versionPTP */ u8 ver; /* reserved0 | versionPTP */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment