diff options
| author | Adam Ford <aford173@gmail.com> | 2018-06-10 09:29:51 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-07-10 16:55:58 -0400 |
| commit | 6696de885eaf1fa6c2104ce70216abbc87d4fd43 (patch) | |
| tree | 9db935ac5658f81fde6397fc868be9a95d270805 /drivers/gpio | |
| parent | 7346c1e192d63cd35f99c7e845e53c5d4d0bdc24 (diff) | |
| download | u-boot-6696de885eaf1fa6c2104ce70216abbc87d4fd43.zip u-boot-6696de885eaf1fa6c2104ce70216abbc87d4fd43.tar.gz u-boot-6696de885eaf1fa6c2104ce70216abbc87d4fd43.tar.bz2 | |
gpio: omap_gpio: Convert to auto-alloc feature when DT is supported
The omap_gpio driver has a TODO that says when every board is converted
to DM and DT, the omap_gpio_bind can stop using calloc and switch
to auto-alloc.
This patch converts this driver to auto-calloc when DT is enabled.
Signed-off-by: Adam Ford <aford173@gmail.com>
Diffstat (limited to 'drivers/gpio')
| -rw-r--r-- | drivers/gpio/omap_gpio.c | 25 |
1 files changed, 24 insertions, 1 deletions
diff --git a/drivers/gpio/omap_gpio.c b/drivers/gpio/omap_gpio.c index 79a975c..651f699 100644 --- a/drivers/gpio/omap_gpio.c +++ b/drivers/gpio/omap_gpio.c @@ -302,6 +302,7 @@ static int omap_gpio_probe(struct udevice *dev) return 0; } +#if !CONFIG_IS_ENABLED(OF_CONTROL) static int omap_gpio_bind(struct udevice *dev) { struct omap_gpio_platdata *plat = dev_get_platdata(dev); @@ -334,6 +335,7 @@ static int omap_gpio_bind(struct udevice *dev) return 0; } +#endif static const struct udevice_id omap_gpio_ids[] = { { .compatible = "ti,omap3-gpio" }, @@ -342,12 +344,33 @@ static const struct udevice_id omap_gpio_ids[] = { { } }; +#if CONFIG_IS_ENABLED(OF_CONTROL) +static int omap_gpio_ofdata_to_platdata(struct udevice *dev) +{ + struct omap_gpio_platdata *plat = dev_get_platdata(dev); + fdt_addr_t addr; + + addr = devfdt_get_addr(dev); + if (addr == FDT_ADDR_T_NONE) + return -EINVAL; + + plat->base = addr; + return 0; +} +#endif + U_BOOT_DRIVER(gpio_omap) = { .name = "gpio_omap", .id = UCLASS_GPIO, +#if CONFIG_IS_ENABLED(OF_CONTROL) + .ofdata_to_platdata = of_match_ptr(omap_gpio_ofdata_to_platdata), + .bind = dm_scan_fdt_dev, + .platdata_auto_alloc_size = sizeof(struct omap_gpio_platdata), +#else + .bind = omap_gpio_bind, +#endif .ops = &gpio_omap_ops, .of_match = omap_gpio_ids, - .bind = omap_gpio_bind, .probe = omap_gpio_probe, .priv_auto_alloc_size = sizeof(struct gpio_bank), .flags = DM_FLAG_PRE_RELOC, |