diff options
| author | Vladimir Oltean <vladimir.oltean@nxp.com> | 2019-12-16 15:09:49 +0200 |
|---|---|---|
| committer | Jason Liu <jason.hui.liu@nxp.com> | 2020-02-26 04:17:36 +0800 |
| commit | 9136f2f7cfe2d40c845b2c232dcc66b83d8cd6e9 (patch) | |
| tree | d8d1b1dcb0a731f91bbc47ee97a5de2225eb237f | |
| parent | b6d29fba06a916ef077767375c31a028793fac0b (diff) | |
net: mscc: ocelot: export ANA, DEV and QSYS registers to include/soc/mscc
Since the Felix DSA driver is implementing its own PHYLINK instance due
to SoC differences, it needs access to the few registers that are
common, mainly for flow control.
Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Conflicts:
drivers/net/ethernet/mscc/ocelot_tsn.c
which has been added in downstream patch b5c05e3404a5 ("net: mscc:
ocelot: tsn configuration support") and also needs to be adapted to the
new location of the header files.
(cherry picked from commit 26b394b6295439ce0f6497ce5c3a8db66499a7ea)
| -rw-r--r-- | drivers/net/ethernet/mscc/ocelot.h | 6 | ||||
| -rw-r--r-- | drivers/net/ethernet/mscc/ocelot_tsn.c | 4 | ||||
| -rw-r--r-- | include/soc/mscc/ocelot_ana.h (renamed from drivers/net/ethernet/mscc/ocelot_ana.h) | 0 | ||||
| -rw-r--r-- | include/soc/mscc/ocelot_dev.h (renamed from drivers/net/ethernet/mscc/ocelot_dev.h) | 0 | ||||
| -rw-r--r-- | include/soc/mscc/ocelot_qsys.h (renamed from drivers/net/ethernet/mscc/ocelot_qsys.h) | 0 |
5 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/ethernet/mscc/ocelot.h b/drivers/net/ethernet/mscc/ocelot.h index 4ff5b045c181..90b7601408c1 100644 --- a/drivers/net/ethernet/mscc/ocelot.h +++ b/drivers/net/ethernet/mscc/ocelot.h @@ -18,11 +18,11 @@ #include <linux/ptp_clock_kernel.h> #include <linux/regmap.h> +#include <soc/mscc/ocelot_qsys.h> #include <soc/mscc/ocelot_sys.h> +#include <soc/mscc/ocelot_dev.h> +#include <soc/mscc/ocelot_ana.h> #include <soc/mscc/ocelot.h> -#include "ocelot_ana.h" -#include "ocelot_dev.h" -#include "ocelot_qsys.h" #include "ocelot_rew.h" #include "ocelot_qs.h" #include "ocelot_tc.h" diff --git a/drivers/net/ethernet/mscc/ocelot_tsn.c b/drivers/net/ethernet/mscc/ocelot_tsn.c index bec36c765694..d272736b704e 100644 --- a/drivers/net/ethernet/mscc/ocelot_tsn.c +++ b/drivers/net/ethernet/mscc/ocelot_tsn.c @@ -11,8 +11,8 @@ #include <linux/iopoll.h> #include "ocelot.h" #include <soc/mscc/ocelot_sys.h> -#include "ocelot_ana.h" -#include "ocelot_qsys.h" +#include <soc/mscc/ocelot_ana.h> +#include <soc/mscc/ocelot_qsys.h> #include "ocelot_rew.h" #include "ocelot_dev_gmii.h" #include "ocelot_tsn.h" diff --git a/drivers/net/ethernet/mscc/ocelot_ana.h b/include/soc/mscc/ocelot_ana.h index fd16e1cbabe8..fd16e1cbabe8 100644 --- a/drivers/net/ethernet/mscc/ocelot_ana.h +++ b/include/soc/mscc/ocelot_ana.h diff --git a/drivers/net/ethernet/mscc/ocelot_dev.h b/include/soc/mscc/ocelot_dev.h index 0a50d53bbd3f..0a50d53bbd3f 100644 --- a/drivers/net/ethernet/mscc/ocelot_dev.h +++ b/include/soc/mscc/ocelot_dev.h diff --git a/drivers/net/ethernet/mscc/ocelot_qsys.h b/include/soc/mscc/ocelot_qsys.h index d8c63aa761be..d8c63aa761be 100644 --- a/drivers/net/ethernet/mscc/ocelot_qsys.h +++ b/include/soc/mscc/ocelot_qsys.h |