net: dsa: sja1105: Move PTP data to its own private structure
This is a non-functional change with 2 goals (both for the case when CONFIG_NET_DSA_SJA1105_PTP is not enabled): - Reduce the size of the sja1105_private structure. - Make the PTP code more self-contained. Leaving priv->ptp_data.lock to be initialized in sja1105_main.c is not a leftover: it will be used in a future patch "net: dsa: sja1105: Restore PTP time after switch reset". Signed-off-by: Vladimir Oltean <olteanv@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:

committed by
David S. Miller

parent
61c7712627
commit
a9d6ed7a8b
@@ -21,6 +21,7 @@
|
||||
#define SJA1105_AGEING_TIME_MS(ms) ((ms) / 10)
|
||||
|
||||
#include "sja1105_tas.h"
|
||||
#include "sja1105_ptp.h"
|
||||
|
||||
/* Keeps the different addresses between E/T and P/Q/R/S */
|
||||
struct sja1105_regs {
|
||||
@@ -91,26 +92,16 @@ struct sja1105_private {
|
||||
struct spi_device *spidev;
|
||||
struct dsa_switch *ds;
|
||||
struct sja1105_port ports[SJA1105_NUM_PORTS];
|
||||
struct ptp_clock_info ptp_caps;
|
||||
struct ptp_clock *clock;
|
||||
/* The cycle counter translates the PTP timestamps (based on
|
||||
* a free-running counter) into a software time domain.
|
||||
*/
|
||||
struct cyclecounter tstamp_cc;
|
||||
struct timecounter tstamp_tc;
|
||||
struct delayed_work refresh_work;
|
||||
/* Serializes all operations on the cycle counter */
|
||||
struct mutex ptp_lock;
|
||||
/* Serializes transmission of management frames so that
|
||||
* the switch doesn't confuse them with one another.
|
||||
*/
|
||||
struct mutex mgmt_lock;
|
||||
struct sja1105_tagger_data tagger_data;
|
||||
struct sja1105_ptp_data ptp_data;
|
||||
struct sja1105_tas_data tas_data;
|
||||
};
|
||||
|
||||
#include "sja1105_dynamic_config.h"
|
||||
#include "sja1105_ptp.h"
|
||||
|
||||
struct sja1105_spi_message {
|
||||
u64 access;
|
||||
|
Reference in New Issue
Block a user