Commit 8858ccc8 authored by Hubert Feurstein's avatar Hubert Feurstein Committed by David S. Miller
Browse files

net: dsa: mv88e6xxx: order ptp structs numerically ascending 



As it is done for all the other structs within this driver.

Signed-off-by: default avatarHubert Feurstein <h.feurstein@gmail.com>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 121b8fe2

drivers/net/dsa/mv88e6xxx/ptp.c

+16 −16
Original line number Diff line number Diff line
@@ -310,6 +310,22 @@ static int mv88e6352_ptp_verify(struct ptp_clock_info *ptp, unsigned int pin, 
	return 0;

}



const struct mv88e6xxx_ptp_ops mv88e6165_ptp_ops = {

	.clock_read = mv88e6165_ptp_clock_read,

	.global_enable = mv88e6165_global_enable,

	.global_disable = mv88e6165_global_disable,

	.arr0_sts_reg = MV88E6165_PORT_PTP_ARR0_STS,

	.arr1_sts_reg = MV88E6165_PORT_PTP_ARR1_STS,

	.dep_sts_reg = MV88E6165_PORT_PTP_DEP_STS,

	.rx_filters = (1 << HWTSTAMP_FILTER_NONE) |

		(1 << HWTSTAMP_FILTER_PTP_V2_L2_EVENT) |

		(1 << HWTSTAMP_FILTER_PTP_V2_L2_SYNC) |

		(1 << HWTSTAMP_FILTER_PTP_V2_L2_DELAY_REQ) |

		(1 << HWTSTAMP_FILTER_PTP_V2_EVENT) |

		(1 << HWTSTAMP_FILTER_PTP_V2_SYNC) |

		(1 << HWTSTAMP_FILTER_PTP_V2_DELAY_REQ),

};



const struct mv88e6xxx_ptp_ops mv88e6352_ptp_ops = {

	.clock_read = mv88e6352_ptp_clock_read,

	.ptp_enable = mv88e6352_ptp_enable,
@@ -333,22 +349,6 @@ const struct mv88e6xxx_ptp_ops mv88e6352_ptp_ops = { 
		(1 << HWTSTAMP_FILTER_PTP_V2_DELAY_REQ),

};



const struct mv88e6xxx_ptp_ops mv88e6165_ptp_ops = {

	.clock_read = mv88e6165_ptp_clock_read,

	.global_enable = mv88e6165_global_enable,

	.global_disable = mv88e6165_global_disable,

	.arr0_sts_reg = MV88E6165_PORT_PTP_ARR0_STS,

	.arr1_sts_reg = MV88E6165_PORT_PTP_ARR1_STS,

	.dep_sts_reg = MV88E6165_PORT_PTP_DEP_STS,

	.rx_filters = (1 << HWTSTAMP_FILTER_NONE) |

		(1 << HWTSTAMP_FILTER_PTP_V2_L2_EVENT) |

		(1 << HWTSTAMP_FILTER_PTP_V2_L2_SYNC) |

		(1 << HWTSTAMP_FILTER_PTP_V2_L2_DELAY_REQ) |

		(1 << HWTSTAMP_FILTER_PTP_V2_EVENT) |

		(1 << HWTSTAMP_FILTER_PTP_V2_SYNC) |

		(1 << HWTSTAMP_FILTER_PTP_V2_DELAY_REQ),

};



static u64 mv88e6xxx_ptp_clock_read(const struct cyclecounter *cc)

{

	struct mv88e6xxx_chip *chip = cc_to_chip(cc);

drivers/net/dsa/mv88e6xxx/ptp.h

+2 −2
Original line number Diff line number Diff line
@@ -148,8 +148,8 @@ void mv88e6xxx_ptp_free(struct mv88e6xxx_chip *chip); 
#define ptp_to_chip(ptp) container_of(ptp, struct mv88e6xxx_chip,	\

				      ptp_clock_info)



extern const struct mv88e6xxx_ptp_ops mv88e6352_ptp_ops;

extern const struct mv88e6xxx_ptp_ops mv88e6165_ptp_ops;

extern const struct mv88e6xxx_ptp_ops mv88e6352_ptp_ops;



#else /* !CONFIG_NET_DSA_MV88E6XXX_PTP */
@@ -167,8 +167,8 @@ static inline void mv88e6xxx_ptp_free(struct mv88e6xxx_chip *chip) 
{

}



static const struct mv88e6xxx_ptp_ops mv88e6352_ptp_ops = {};

static const struct mv88e6xxx_ptp_ops mv88e6165_ptp_ops = {};

static const struct mv88e6xxx_ptp_ops mv88e6352_ptp_ops = {};



#endif /* CONFIG_NET_DSA_MV88E6XXX_PTP */