Skip to contentSkip to conversation

DM: omap_gpio: Reduce overhead when used with OF_PLATDATA

PATCH In review Adam Ford 3 participants 3 messages Aug 21, 2018 – Sep 18, 2018 GPIO

lore
Share & tools
lore

Adam Ford

author
#0 lore raw

PATCH 1/1 DM: omap_gpio: Reduce overhead when used with OF_PLATDATA

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.

drivers/gpio/omap_gpio.c +4 -3
index 651f6994e4..fcf25fc5a4 100644
@@ -337,6 +337,7 @@ static int omap_gpio_bind(struct udevice *dev)
 }
 #endif
 
+#if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)
 static const struct udevice_id omap_gpio_ids[] = {
 	{ .compatible = "ti,omap3-gpio" },
 	{ .compatible = "ti,omap4-gpio" },
@@ -344,7 +345,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)
 {
 	struct omap_gpio_platdata *plat = dev_get_platdata(dev);
@@ -363,14 +363,15 @@ U_BOOT_DRIVER(gpio_omap) = {
 	.name	= "gpio_omap",
 	.id	= UCLASS_GPIO,
 #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),
-	.bind	= dm_scan_fdt_dev,
 	.platdata_auto_alloc_size = sizeof(struct omap_gpio_platdata),
+#endif
 #else
 	.bind   = omap_gpio_bind,
 #endif
 	.ops	= &gpio_omap_ops,
-	.of_match = omap_gpio_ids,
 	.probe	= omap_gpio_probe,
 	.priv_auto_alloc_size = sizeof(struct gpio_bank),
 	.flags = DM_FLAG_PRE_RELOC,
Signature · 1 line
2.17.1
#1 lore raw

PATCH 1/1 DM: omap_gpio: Reduce overhead when used with OF_PLATDATA

Quoted 8 lines · Adam Ford

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.

#2 lore raw
In reply to Adam Ford

drivers/gpio/omap_gpio.c

Quoted 11 lines · Adam Ford

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.

drivers/gpio/omap_gpio.c +0 -0
index 651f6994e4..fcf25fc5a4 100644

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180918/7e21bc43/attachment.sig>