Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3208b0f0 authored by Linus Walleij's avatar Linus Walleij
Browse files

gpio: of: provide optional of_mm_gpiochip_add_data() function 



In the same spirit as we add an optional void *data argument
to the gpiochip_add_data() call, we need this also for
of_mm_gpiochip_add().

Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent b08ea35a

drivers/gpio/gpiolib-of.c

+7 −5
Original line number Diff line number Diff line
@@ -262,9 +262,10 @@ int of_gpio_simple_xlate(struct gpio_chip *gc, 
EXPORT_SYMBOL(of_gpio_simple_xlate);



/**

 * of_mm_gpiochip_add - Add memory mapped GPIO chip (bank)

 * of_mm_gpiochip_add_data - Add memory mapped GPIO chip (bank)

 * @np:		device node of the GPIO chip

 * @mm_gc:	pointer to the of_mm_gpio_chip allocated structure

 * @data:	driver data to store in the struct gpio_chip

 *

 * To use this function you should allocate and fill mm_gc with:

 *
@@ -280,8 +281,9 @@ EXPORT_SYMBOL(of_gpio_simple_xlate); 
 * do all necessary work for you. Then you'll able to use .regs

 * to manage GPIOs from the callbacks.

 */

int of_mm_gpiochip_add(struct device_node *np,

		       struct of_mm_gpio_chip *mm_gc)

int of_mm_gpiochip_add_data(struct device_node *np,

			    struct of_mm_gpio_chip *mm_gc,

			    void *data)

{

	int ret = -ENOMEM;

	struct gpio_chip *gc = &mm_gc->gc;
@@ -301,7 +303,7 @@ int of_mm_gpiochip_add(struct device_node *np, 


	mm_gc->gc.of_node = np;



	ret = gpiochip_add(gc);

	ret = gpiochip_add_data(gc, data);

	if (ret)

		goto err2;
@@ -315,7 +317,7 @@ int of_mm_gpiochip_add(struct device_node *np, 
	       np->full_name, ret);

	return ret;

}

EXPORT_SYMBOL(of_mm_gpiochip_add);

EXPORT_SYMBOL(of_mm_gpiochip_add_data);



/**

 * of_mm_gpiochip_remove - Remove memory mapped GPIO chip (bank)

include/linux/of_gpio.h

+8 −2
Original line number Diff line number Diff line
@@ -51,8 +51,14 @@ static inline struct of_mm_gpio_chip *to_of_mm_gpio_chip(struct gpio_chip *gc) 
extern int of_get_named_gpio_flags(struct device_node *np,

		const char *list_name, int index, enum of_gpio_flags *flags);



extern int of_mm_gpiochip_add(struct device_node *np,

			      struct of_mm_gpio_chip *mm_gc);

extern int of_mm_gpiochip_add_data(struct device_node *np,

				   struct of_mm_gpio_chip *mm_gc,

				   void *data);

static inline int of_mm_gpiochip_add(struct device_node *np,

				     struct of_mm_gpio_chip *mm_gc)

{

	return of_mm_gpiochip_add_data(np, mm_gc, NULL);

}

extern void of_mm_gpiochip_remove(struct of_mm_gpio_chip *mm_gc);



extern int of_gpiochip_add(struct gpio_chip *gc);