Messages in this thread | | | Date | Fri, 29 Jan 2016 11:15:14 +0000 | From | Lee Jones <> | Subject | Re: [PATCH] mfd: syscon: set regmap max_register in of_syscon_register |
| |
On Fri, 29 Jan 2016, Philipp Zabel wrote:
> Determine the regmap max_register configuration from the io resource size > and the reg-io-width device tree property. > > Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> > --- > drivers/mfd/syscon.c | 9 ++++++++- > 1 file changed, 8 insertions(+), 1 deletion(-)
Applied, thanks.
> diff --git a/drivers/mfd/syscon.c b/drivers/mfd/syscon.c > index b730071..2f2225e 100644 > --- a/drivers/mfd/syscon.c > +++ b/drivers/mfd/syscon.c > @@ -50,6 +50,7 @@ static struct syscon *of_syscon_register(struct device_node *np) > u32 reg_io_width; > int ret; > struct regmap_config syscon_config = syscon_regmap_config; > + struct resource res; > > if (!of_device_is_compatible(np, "syscon")) > return ERR_PTR(-EINVAL); > @@ -58,7 +59,12 @@ static struct syscon *of_syscon_register(struct device_node *np) > if (!syscon) > return ERR_PTR(-ENOMEM); > > - base = of_iomap(np, 0); > + if (of_address_to_resource(np, 0, &res)) { > + ret = -ENOMEM; > + goto err_map; > + } > + > + base = ioremap(res.start, resource_size(&res)); > if (!base) { > ret = -ENOMEM; > goto err_map; > @@ -81,6 +87,7 @@ static struct syscon *of_syscon_register(struct device_node *np) > > syscon_config.reg_stride = reg_io_width; > syscon_config.val_bits = reg_io_width * 8; > + syscon_config.max_register = resource_size(&res) - reg_io_width; > > regmap = regmap_init_mmio(NULL, base, &syscon_config); > if (IS_ERR(regmap)) {
-- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog
| |