Commit 8f66c64b authored by Vladimir Oltean's avatar Vladimir Oltean Committed by Jakub Kicinski

net: dsa: felix: remove felix_info :: init_regmap

It turns out that the idea of having a customizable implementation of a
regmap creation from a resource is not exactly useful. The idea was for
the new MFD-based VSC7512 driver to use something that creates a SPI
regmap from a resource. But there are problems in actually getting those
resources (it involves getting them from MFD).

To avoid all that, we'll be getting resources by name, so this custom
init_regmap() method won't be needed. Remove it.
Signed-off-by: default avatarVladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 1382ba68
...@@ -1360,7 +1360,7 @@ static int felix_init_structs(struct felix *felix, int num_phys_ports) ...@@ -1360,7 +1360,7 @@ static int felix_init_structs(struct felix *felix, int num_phys_ports)
res.start += felix->switch_base; res.start += felix->switch_base;
res.end += felix->switch_base; res.end += felix->switch_base;
target = felix->info->init_regmap(ocelot, &res); target = ocelot_regmap_init(ocelot, &res);
if (IS_ERR(target)) { if (IS_ERR(target)) {
dev_err(ocelot->dev, dev_err(ocelot->dev,
"Failed to map device memory space\n"); "Failed to map device memory space\n");
...@@ -1397,7 +1397,7 @@ static int felix_init_structs(struct felix *felix, int num_phys_ports) ...@@ -1397,7 +1397,7 @@ static int felix_init_structs(struct felix *felix, int num_phys_ports)
res.start += felix->switch_base; res.start += felix->switch_base;
res.end += felix->switch_base; res.end += felix->switch_base;
target = felix->info->init_regmap(ocelot, &res); target = ocelot_regmap_init(ocelot, &res);
if (IS_ERR(target)) { if (IS_ERR(target)) {
dev_err(ocelot->dev, dev_err(ocelot->dev,
"Failed to map memory space for port %d\n", "Failed to map memory space for port %d\n",
......
...@@ -55,8 +55,6 @@ struct felix_info { ...@@ -55,8 +55,6 @@ struct felix_info {
void (*tas_guard_bands_update)(struct ocelot *ocelot, int port); void (*tas_guard_bands_update)(struct ocelot *ocelot, int port);
void (*port_sched_speed_set)(struct ocelot *ocelot, int port, void (*port_sched_speed_set)(struct ocelot *ocelot, int port,
u32 speed); u32 speed);
struct regmap *(*init_regmap)(struct ocelot *ocelot,
struct resource *res);
}; };
/* Methods for initializing the hardware resources specific to a tagging /* Methods for initializing the hardware resources specific to a tagging
......
...@@ -2617,7 +2617,6 @@ static const struct felix_info felix_info_vsc9959 = { ...@@ -2617,7 +2617,6 @@ static const struct felix_info felix_info_vsc9959 = {
.port_setup_tc = vsc9959_port_setup_tc, .port_setup_tc = vsc9959_port_setup_tc,
.port_sched_speed_set = vsc9959_sched_speed_set, .port_sched_speed_set = vsc9959_sched_speed_set,
.tas_guard_bands_update = vsc9959_tas_guard_bands_update, .tas_guard_bands_update = vsc9959_tas_guard_bands_update,
.init_regmap = ocelot_regmap_init,
}; };
static irqreturn_t felix_irq_handler(int irq, void *data) static irqreturn_t felix_irq_handler(int irq, void *data)
......
...@@ -1078,7 +1078,6 @@ static const struct felix_info seville_info_vsc9953 = { ...@@ -1078,7 +1078,6 @@ static const struct felix_info seville_info_vsc9953 = {
.mdio_bus_free = vsc9953_mdio_bus_free, .mdio_bus_free = vsc9953_mdio_bus_free,
.phylink_validate = vsc9953_phylink_validate, .phylink_validate = vsc9953_phylink_validate,
.port_modes = vsc9953_port_modes, .port_modes = vsc9953_port_modes,
.init_regmap = ocelot_regmap_init,
}; };
static int seville_probe(struct platform_device *pdev) static int seville_probe(struct platform_device *pdev)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment