net: mscc: ocelot: expose vsc7514_regmap definition

The VSC7514 target regmap is identical for ones shared with similar
hardware, specifically the VSC7512. Share this resource, and change the
name to match the pattern of other exported resources.

Signed-off-by: Colin Foster <colin.foster@in-advantage.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Reviewed-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Tested-by: Vladimir Oltean <vladimir.oltean@nxp.com> # regression
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/mscc/ocelot_vsc7514.c b/drivers/net/ethernet/mscc/ocelot_vsc7514.c
index 1e94108ab8bcca8f7c59f4b6735e936426efff06..7388c3b0535c65d39f20c9005acd770607ee41e9 100644 (file)
--- a/drivers/net/ethernet/mscc/ocelot_vsc7514.c
+++ b/drivers/net/ethernet/mscc/ocelot_vsc7514.c
@@ -26,19 +26,6 @@
 #define VSC7514_VCAP_POLICER_BASE                      128
 #define VSC7514_VCAP_POLICER_MAX                       191
 
-static const u32 *ocelot_regmap[TARGET_MAX] = {
-       [ANA] = vsc7514_ana_regmap,
-       [QS] = vsc7514_qs_regmap,
-       [QSYS] = vsc7514_qsys_regmap,
-       [REW] = vsc7514_rew_regmap,
-       [SYS] = vsc7514_sys_regmap,
-       [S0] = vsc7514_vcap_regmap,
-       [S1] = vsc7514_vcap_regmap,
-       [S2] = vsc7514_vcap_regmap,
-       [PTP] = vsc7514_ptp_regmap,
-       [DEV_GMII] = vsc7514_dev_gmii_regmap,
-};
-
 static void ocelot_pll5_init(struct ocelot *ocelot)
 {
        /* Configure PLL5. This will need a proper CCF driver
@@ -72,7 +59,7 @@ static int ocelot_chip_init(struct ocelot *ocelot, const struct ocelot_ops *ops)
 {
        int ret;
 
-       ocelot->map = ocelot_regmap;
+       ocelot->map = vsc7514_regmap;
        ocelot->num_mact_rows = 1024;
        ocelot->ops = ops;
 

diff --git a/drivers/net/ethernet/mscc/vsc7514_regs.c b/drivers/net/ethernet/mscc/vsc7514_regs.c
index c3ad01722829433ded8ecad27618596898230f95..da0c0dcc8f815027118a4fc8235b56a6e876f106 100644 (file)
--- a/drivers/net/ethernet/mscc/vsc7514_regs.c
+++ b/drivers/net/ethernet/mscc/vsc7514_regs.c
@@ -429,6 +429,20 @@ const u32 vsc7514_dev_gmii_regmap[] = {
 };
 EXPORT_SYMBOL(vsc7514_dev_gmii_regmap);
 
+const u32 *vsc7514_regmap[TARGET_MAX] = {
+       [ANA] = vsc7514_ana_regmap,
+       [QS] = vsc7514_qs_regmap,
+       [QSYS] = vsc7514_qsys_regmap,
+       [REW] = vsc7514_rew_regmap,
+       [SYS] = vsc7514_sys_regmap,
+       [S0] = vsc7514_vcap_regmap,
+       [S1] = vsc7514_vcap_regmap,
+       [S2] = vsc7514_vcap_regmap,
+       [PTP] = vsc7514_ptp_regmap,
+       [DEV_GMII] = vsc7514_dev_gmii_regmap,
+};
+EXPORT_SYMBOL(vsc7514_regmap);
+
 const struct vcap_field vsc7514_vcap_es0_keys[] = {
        [VCAP_ES0_EGR_PORT]                     = { 0,   4 },
        [VCAP_ES0_IGR_PORT]                     = { 4,   4 },

diff --git a/include/soc/mscc/vsc7514_regs.h b/include/soc/mscc/vsc7514_regs.h
index 8cfbc7ec07f8aef54148f772974bb7e8798ad0f1..dfb91629c8bdccc759e55b74377c50387485a4db 100644 (file)
--- a/include/soc/mscc/vsc7514_regs.h
+++ b/include/soc/mscc/vsc7514_regs.h
@@ -23,6 +23,8 @@ extern const u32 vsc7514_vcap_regmap[];
 extern const u32 vsc7514_ptp_regmap[];
 extern const u32 vsc7514_dev_gmii_regmap[];
 
+extern const u32 *vsc7514_regmap[TARGET_MAX];
+
 extern const struct vcap_field vsc7514_vcap_es0_keys[];
 extern const struct vcap_field vsc7514_vcap_es0_actions[];
 extern const struct vcap_field vsc7514_vcap_is1_keys[];