leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

DM: omap_gpio: Reduce overhead when used with OF_PLATDATA

Browse Source 
Platforms with limited resources in SPL may enable OF_PLATDATA,
this limits some of the library functions and cannot extract data
from the device tree.  This patch adds additional wrappers around
these functions to only allow them when OF_CONTROL is enabled and
OF_PLATDATA is not.

Signed-off-by: Adam Ford <aford173@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Adam Ford 2018-08-20 20:27:48 -05:00 committed by Tom Rini
parent 410c505cc1
commit 99571b41c6
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/gpio/omap_gpio.c
View File

@ -335,6 +335,7 @@ static int omap_gpio_bind(struct udevice *dev)
} }
#endif #endif
#if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)
static const struct udevice_id omap_gpio_ids[] = { static const struct udevice_id omap_gpio_ids[] = {
{ .compatible = "ti,omap3-gpio" }, { .compatible = "ti,omap3-gpio" },
{ .compatible = "ti,omap4-gpio" }, { .compatible = "ti,omap4-gpio" },
@ -342,7 +343,6 @@ static const struct udevice_id omap_gpio_ids[] = {
{ } { }
}; };
#if CONFIG_IS_ENABLED(OF_CONTROL)
static int omap_gpio_ofdata_to_platdata(struct udevice *dev) static int omap_gpio_ofdata_to_platdata(struct udevice *dev)
{ {
struct omap_gpio_platdata *plat = dev_get_platdata(dev); struct omap_gpio_platdata *plat = dev_get_platdata(dev);
@ -361,14 +361,15 @@ U_BOOT_DRIVER(gpio_omap) = {
.name = "gpio_omap", .name = "gpio_omap",
.id = UCLASS_GPIO, .id = UCLASS_GPIO,
#if CONFIG_IS_ENABLED(OF_CONTROL) #if CONFIG_IS_ENABLED(OF_CONTROL)
#if !CONFIG_IS_ENABLED(OF_PLATDATA)
.of_match = omap_gpio_ids,
.ofdata_to_platdata = of_match_ptr(omap_gpio_ofdata_to_platdata), .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), .platdata_auto_alloc_size = sizeof(struct omap_gpio_platdata),
#endif
#else #else
.bind = omap_gpio_bind, .bind = omap_gpio_bind,
#endif #endif
.ops = &gpio_omap_ops, .ops = &gpio_omap_ops,
.of_match = omap_gpio_ids,
.probe = omap_gpio_probe, .probe = omap_gpio_probe,
.priv_auto_alloc_size = sizeof(struct gpio_bank), .priv_auto_alloc_size = sizeof(struct gpio_bank),
.flags = DM_FLAG_PRE_RELOC, .flags = DM_FLAG_PRE_RELOC,