summaryrefslogtreecommitdiff
path: root/include/soc
diff options
context:
space:
mode:
authorVladimir Oltean <vladimir.oltean@nxp.com>2020-01-06 14:30:41 +0200
committerJason Liu <jason.hui.liu@nxp.com>2020-02-26 04:17:33 +0800
commite1a7c3a765ae03b4253c1b6285af2fd6fb9efd90 (patch)
tree32d537f23c14df9c2543a97cf1f449b50e29620a /include/soc
parenta14c11801d759a8f714c3c4482e89799e1634615 (diff)
Revert "net: mscc: ocelot: introduce more focused PCS ops for PHYLINK"
This reverts commit 423c8b04007c85907f8f514de459ebc8541f0a54. Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com> (cherry picked from commit 0b21bb2374f393db12851e974b681fbc572d862c)
Diffstat (limited to 'include/soc')
-rw-r--r--include/soc/mscc/ocelot.h12
1 files changed, 3 insertions, 9 deletions
diff --git a/include/soc/mscc/ocelot.h b/include/soc/mscc/ocelot.h
index 308293ec538a..75d80df851e7 100644
--- a/include/soc/mscc/ocelot.h
+++ b/include/soc/mscc/ocelot.h
@@ -412,15 +412,7 @@ enum {
struct ocelot;
struct ocelot_ops {
- void (*pcs_init)(struct ocelot *ocelot, int port,
- unsigned int link_an_mode,
- const struct phylink_link_state *state);
- void (*pcs_an_restart)(struct ocelot *ocelot, int port);
- void (*pcs_link_state)(struct ocelot *ocelot, int port,
- struct phylink_link_state *state);
- void (*pcs_validate)(struct ocelot *ocelot, int port,
- unsigned long *supported,
- struct phylink_link_state *state);
+ void (*pcs_init)(struct ocelot *ocelot, int port);
int (*reset)(struct ocelot *ocelot);
};
@@ -487,6 +479,8 @@ struct ocelot {
struct mutex ptp_lock;
/* Protects the PTP clock */
spinlock_t ptp_clock_lock;
+
+ void (*port_pcs_init)(struct ocelot_port *port);
};
#define ocelot_read_ix(ocelot, reg, gi, ri) __ocelot_read_ix(ocelot, reg, reg##_GSZ * (gi) + reg##_RSZ * (ri))