As I'm going through Andy's suggestions, I came across a couple more
include changes / misses:
On Tue, Aug 02, 2022 at 10:47:28PM -0700, Colin Foster wrote:
...
> diff --git a/drivers/mfd/ocelot-core.c b/drivers/mfd/ocelot-core.c
...
> +
> +int ocelot_chip_reset(struct device *dev)
#include <linux/device.h>
> +{
> + struct ocelot_ddata *ddata = dev_get_drvdata(dev);
> + int ret, val;
> +
> + /*
> + * Reset the entire chip here to put it into a completely known state.
> + * Other drivers may want to reset their own subsystems. The register
> + * self-clears, so one write is all that is needed and wait for it to
> + * clear.
> + */
> + ret = regmap_write(ddata->gcb_regmap, REG_GCB_SOFT_RST, BIT_SOFT_CHIP_RST);
> + if (ret)
> + return ret;
> +
> + return readx_poll_timeout(ocelot_gcb_chip_rst_status, ddata, val, !val,
> + VSC7512_GCB_RST_SLEEP_US, VSC7512_GCB_RST_TIMEOUT_US);
#include <linux/iopoll.h>
> +}
> +EXPORT_SYMBOL_NS(ocelot_chip_reset, MFD_OCELOT);
#include <linux/export.h>
> +
> +static const struct resource vsc7512_miim0_resources[] = {
> + DEFINE_RES_REG_NAMED(VSC7512_MIIM0_RES_START, VSC7512_MIIM_RES_SIZE, "gcb_miim0"),
> + DEFINE_RES_REG_NAMED(VSC7512_PHY_RES_START, VSC7512_PHY_RES_SIZE, "gcb_phy"),
> +};
#include <linux/ioport.h>
...
> +++ b/drivers/mfd/ocelot-spi.c
...
> +#include <linux/kconfig.h>
Not needed here - handled entirely in drivers/mfd/ocelot.h now.
...
> +
> +static int ocelot_spi_initialize(struct device *dev)
#include <linux/device.h>
> +{
> + struct ocelot_ddata *ddata = dev_get_drvdata(dev);
> + u32 val, check;
#include <linux/types.h>
...
> +
> + if (check != val)
> + return -ENODEV;
#include <linux/errno.h>
> +
> + return 0;
> +}
...
> +
> +struct regmap *ocelot_spi_init_regmap(struct device *dev, const struct resource *res)
> +{
> + struct regmap_config regmap_config;
> +
> + memcpy(®map_config, &ocelot_spi_regmap_config, sizeof(regmap_config));
> +
> + regmap_config.name = res->name;
> + regmap_config.max_register = res->end - res->start;
> + regmap_config.reg_base = res->start;
> +
> + return devm_regmap_init(dev, &ocelot_spi_regmap_bus, dev, ®map_config);
> +}
> +EXPORT_SYMBOL_NS(ocelot_spi_init_regmap, MFD_OCELOT_SPI);
#include <linux/export.h>
...
> +
> + r = ocelot_spi_init_regmap(dev, &vsc7512_dev_cpuorg_resource);
> + if (IS_ERR(r))
> + return PTR_ERR(r);
#include <linux/err.h>
...
> +
> +static const struct spi_device_id ocelot_spi_ids[] = {
#include <linux/mod_devicetable.h>
> + { "vsc7512", 0 },
> + { }
> +};
> +
> +static const struct of_device_id ocelot_spi_of_match[] = {
> + { .compatible = "mscc,vsc7512" },
> + { }
> +};
> +MODULE_DEVICE_TABLE(of, ocelot_spi_of_match);
