openwrt/upstream - upstream openwrt

	Commit message (Expand)	Author	Age	Files	Lines
*	experimental support for 2.6.27	Gabor Juhos	2008-10-05	60	-4457/+0
*	experimental support for the Motorola MU Gateway	Gabor Juhos	2008-09-23	4	-0/+115
*	add board specific UART registration	Gabor Juhos	2008-09-23	8	-5/+28
*	convert to GPIOLIB	Gabor Juhos	2008-09-12	1	-203/+162
*	minor cleanups	Gabor Juhos	2008-08-25	13	-23/+17
*	load the mac address from flash where it is possible	Gabor Juhos	2008-08-20	17	-33/+181
*	load board's mac address on Compex devices	Gabor Juhos	2008-08-13	2	-1/+26
*	fix gpio number of the reset button Compex WP54 boards	Gabor Juhos	2008-08-13	1	-1/+1
*	split support of Cellvision boards	Gabor Juhos	2008-08-09	6	-60/+119
*	add 2.6.26 specific files	Gabor Juhos	2008-08-07	54	-0/+4134

From 4b629d2e8fd9a762fd3f107c525bf2476ba7fe86 Mon Sep 17 00:00:00 2001 From: John Crispin <blogic@openwrt.org> Date: Tue, 12 Aug 2014 20:49:27 +0200 Subject: [PATCH] GPIO: add named gpio exports Signed-off-by: John Crispin <blogic@openwrt.org> --- drivers/gpio/gpiolib-of.c | 68 +++++++++++++++++++++++++++++++++++++++++ drivers/gpio/gpiolib.c | 11 +++++-- include/asm-generic/gpio.h | 5 +++ include/linux/gpio/consumer.h | 8 +++++ 4 files changed, 90 insertions(+), 2 deletions(-) --- a/drivers/gpio/gpiolib-of.c +++ b/drivers/gpio/gpiolib-of.c @@ -21,6 +21,8 @@ #include <linux/of_gpio.h> #include <linux/pinctrl/pinctrl.h> #include <linux/slab.h> +#include <linux/init.h> +#include <linux/platform_device.h> struct gpio_desc; @@ -296,3 +298,69 @@ void of_gpiochip_remove(struct gpio_chip if (chip->of_node) of_node_put(chip->of_node); } + +static struct of_device_id gpio_export_ids[] = { + { .compatible = "gpio-export" }, + { /* sentinel */ } +}; + +static int __init of_gpio_export_probe(struct platform_device *pdev) +{ + struct device_node *np = pdev->dev.of_node; + struct device_node *cnp; + u32 val; + int nb = 0; + + for_each_child_of_node(np, cnp) { + const char *name = NULL; + int gpio; + bool dmc; + int max_gpio = 1; + int i; + + of_property_read_string(cnp, "gpio-export,name", &name); + + if (!name) + max_gpio = of_gpio_count(cnp); + + for (i = 0; i < max_gpio; i++) { + unsigned flags = 0; + enum of_gpio_flags of_flags; + + gpio = of_get_gpio_flags(cnp, i, &of_flags); + + if (of_flags == OF_GPIO_ACTIVE_LOW) + flags |= GPIOF_ACTIVE_LOW; + + if (!of_property_read_u32(cnp, "gpio-export,output", &val)) + flags |= val ? GPIOF_OUT_INIT_HIGH : GPIOF_OUT_INIT_LOW; + else + flags |= GPIOF_IN; + + if (devm_gpio_request_one(&pdev->dev, gpio, flags, name ? name : of_node_full_name(np))) + continue; + + dmc = of_property_read_bool(cnp, "gpio-export,direction_may_change"); + gpio_export_with_name(gpio, dmc, name); + nb++; + } + } + + dev_info(&pdev->dev, "%d gpio(s) exported\n", nb); + + return 0; +} + +static struct platform_driver gpio_export_driver = { + .driver = { + .name = "gpio-export", + .owner = THIS_MODULE, + .of_match_table = of_match_ptr(gpio_export_ids), + }, +}; + +static int __init of_gpio_export_init(void) +{ + return platform_driver_probe(&gpio_export_driver, of_gpio_export_probe); +} +device_initcall(of_gpio_export_init); --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c @@ -803,7 +803,7 @@ static struct class gpio_class = { * * Returns zero on success, else an error. */ -int gpiod_export(struct gpio_desc *desc, bool direction_may_change) +int _gpiod_export(struct gpio_desc *desc, bool direction_may_change, const char *name) { unsigned long flags; int status; @@ -843,7 +843,8 @@ int gpiod_export(struct gpio_desc *desc, offset = gpio_chip_hwgpio(desc); if (desc->chip->names && desc->chip->names[offset]) ioname = desc->chip->names[offset]; - + if (name) + ioname = name; dev = device_create(&gpio_class, desc->chip->dev, MKDEV(0, 0), desc, ioname ? ioname : "gpio%u", desc_to_gpio(desc)); @@ -880,6 +881,12 @@ fail_unlock: gpiod_dbg(desc, "%s: status %d\n", __func__, status); return status; } +EXPORT_SYMBOL_GPL(_gpiod_export); + +int gpiod_export(struct gpio_desc *desc, bool direction_may_change) +{ + return _gpiod_export(desc, direction_may_change, NULL); +} EXPORT_SYMBOL_GPL(gpiod_export); static int match_export(struct device *dev, const void *data) --- a/include/asm-generic/gpio.h +++ b/include/asm-generic/gpio.h @@ -126,6 +126,11 @@ static inline int gpio_export(unsigned g return gpiod_export(gpio_to_desc(gpio), direction_may_change); } +static inline int gpio_export_with_name(unsigned gpio, bool direction_may_change, const char *name) +{ + return _gpiod_export(gpio_to_desc(gpio), direction_may_change, name); +} + static inline int gpio_export_link(struct device *dev, const char *name, unsigned gpio) { --- a/include/linux/gpio/consumer.h +++ b/include/linux/gpio/consumer.h @@ -219,6 +219,7 @@ static inline struct gpio_chip *gpiod_to #if IS_ENABLED(CONFIG_GPIOLIB) && IS_ENABLED(CONFIG_GPIO_SYSFS) +int _gpiod_export(struct gpio_desc *desc, bool direction_may_change, const char *name); int gpiod_export(struct gpio_desc *desc, bool direction_may_change); int gpiod_export_link(struct device *dev, const char *name, struct gpio_desc *desc); @@ -227,6 +228,13 @@ void gpiod_unexport(struct gpio_desc *de #else /* CONFIG_GPIOLIB && CONFIG_GPIO_SYSFS */ +static inline int _gpiod_export(struct gpio_desc *desc, + bool direction_may_change, + const char *name) +{ + return -ENOSYS; +} + static inline int gpiod_export(struct gpio_desc *desc, bool direction_may_change) {