| Message ID | 20211218214954.109755-14-colin.foster@in-advantage.com (mailing list archive) |
|---|---|
| State | RFC |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | add support for VSC75XX control over SPI | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Clearly marked for net-next |
| netdev/apply | fail | Patch does not apply to net-next |
On Sat, 18 Dec 2021, Colin Foster wrote: > The ocelot-pinctrl device is able to be utilized by ocelot_mfd. This simply > enables that child driver. > > Signed-off-by: Colin Foster <colin.foster@in-advantage.com> > --- > drivers/mfd/ocelot-core.c | 19 +++++++++++++++++++ > 1 file changed, 19 insertions(+) Squash please. > diff --git a/drivers/mfd/ocelot-core.c b/drivers/mfd/ocelot-core.c > index c67e433f467c..71e062934812 100644 > --- a/drivers/mfd/ocelot-core.c > +++ b/drivers/mfd/ocelot-core.c > @@ -113,7 +113,22 @@ static const struct resource vsc7512_miim1_resources[] = { > }, > }; > > +static const struct resource vsc7512_pinctrl_resources[] = { > + { > + .start = 0x71070034, > + .end = 0x7107009f, > + .name = "gcb_gpio", > + .flags = IORESOURCE_MEM, > + }, > +}; > + > static const struct mfd_cell vsc7512_devs[] = { > + { > + .name = "pinctrl-ocelot", > + .of_compatible = "mscc,ocelot-pinctrl", > + .num_resources = ARRAY_SIZE(vsc7512_pinctrl_resources), > + .resources = vsc7512_pinctrl_resources, > + }, > { > .name = "ocelot-miim1", > .of_compatible = "mscc,ocelot-miim", > @@ -164,6 +179,10 @@ int ocelot_mfd_init(struct ocelot_mfd_config *config) > > ret = mfd_add_devices(dev, PLATFORM_DEVID_NONE, vsc7512_devs, > ARRAY_SIZE(vsc7512_devs), NULL, 0, NULL); > + if (ret) { > + dev_err(dev, "error adding mfd devices\n"); > + return ret; > + } > > dev_info(dev, "ocelot mfd core setup complete\n"); >
diff --git a/drivers/mfd/ocelot-core.c b/drivers/mfd/ocelot-core.c index c67e433f467c..71e062934812 100644 --- a/drivers/mfd/ocelot-core.c +++ b/drivers/mfd/ocelot-core.c @@ -113,7 +113,22 @@ static const struct resource vsc7512_miim1_resources[] = { }, }; +static const struct resource vsc7512_pinctrl_resources[] = { + { + .start = 0x71070034, + .end = 0x7107009f, + .name = "gcb_gpio", + .flags = IORESOURCE_MEM, + }, +}; + static const struct mfd_cell vsc7512_devs[] = { + { + .name = "pinctrl-ocelot", + .of_compatible = "mscc,ocelot-pinctrl", + .num_resources = ARRAY_SIZE(vsc7512_pinctrl_resources), + .resources = vsc7512_pinctrl_resources, + }, { .name = "ocelot-miim1", .of_compatible = "mscc,ocelot-miim", @@ -164,6 +179,10 @@ int ocelot_mfd_init(struct ocelot_mfd_config *config) ret = mfd_add_devices(dev, PLATFORM_DEVID_NONE, vsc7512_devs, ARRAY_SIZE(vsc7512_devs), NULL, 0, NULL); + if (ret) { + dev_err(dev, "error adding mfd devices\n"); + return ret; + } dev_info(dev, "ocelot mfd core setup complete\n");
The ocelot-pinctrl device is able to be utilized by ocelot_mfd. This simply enables that child driver. Signed-off-by: Colin Foster <colin.foster@in-advantage.com> --- drivers/mfd/ocelot-core.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)