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

Commit c001fb72 authored by Randy Dunlap's avatar Randy Dunlap Committed by Grant Likely
Browse files

gpio: add GPIOF_ values regardless on kconfig settings 



Make GPIOF_ defined values available even when GPIOLIB nor GENERIC_GPIO
is enabled by moving them to <linux/gpio.h>.

Fixes these build errors in linux-next:
sound/soc/codecs/ak4641.c:524: error: 'GPIOF_OUT_INIT_LOW' undeclared (first use in this function)
sound/soc/codecs/wm8915.c:2921: error: 'GPIOF_OUT_INIT_LOW' undeclared (first use in this function)

Signed-off-by: default avatarRandy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
parent 158f1e95

include/asm-generic/gpio.h

+0 −10
Original line number Diff line number Diff line
@@ -170,16 +170,6 @@ extern int __gpio_cansleep(unsigned gpio); 


extern int __gpio_to_irq(unsigned gpio);



#define GPIOF_DIR_OUT	(0 << 0)

#define GPIOF_DIR_IN	(1 << 0)



#define GPIOF_INIT_LOW	(0 << 1)

#define GPIOF_INIT_HIGH	(1 << 1)



#define GPIOF_IN		(GPIOF_DIR_IN)

#define GPIOF_OUT_INIT_LOW	(GPIOF_DIR_OUT | GPIOF_INIT_LOW)

#define GPIOF_OUT_INIT_HIGH	(GPIOF_DIR_OUT | GPIOF_INIT_HIGH)



/**

 * struct gpio - a structure describing a GPIO with configuration

 * @gpio:	the GPIO number

include/linux/gpio.h

+11 −0
Original line number Diff line number Diff line
@@ -3,6 +3,17 @@ 


/* see Documentation/gpio.txt */



/* make these flag values available regardless of GPIO kconfig options */

#define GPIOF_DIR_OUT	(0 << 0)

#define GPIOF_DIR_IN	(1 << 0)



#define GPIOF_INIT_LOW	(0 << 1)

#define GPIOF_INIT_HIGH	(1 << 1)



#define GPIOF_IN		(GPIOF_DIR_IN)

#define GPIOF_OUT_INIT_LOW	(GPIOF_DIR_OUT | GPIOF_INIT_LOW)

#define GPIOF_OUT_INIT_HIGH	(GPIOF_DIR_OUT | GPIOF_INIT_HIGH)



#ifdef CONFIG_GENERIC_GPIO

#include <asm/gpio.h>