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

Commit 7f4f69f9 authored by Joachim Eastwood's avatar Joachim Eastwood Committed by Mike Frysinger
Browse files

Blackfin: GPIO: implement to_irq handler 



This makes it possible to support IRQs coming from off-chip GPIO
controllers.

Signed-off-by: default avatarJoachim Eastwood <joachim.eastwood@jotron.com>
Signed-off-by: default avatarMike Frysinger <vapier@gentoo.org>
parent f8e6dbff

arch/blackfin/include/asm/gpio.h

+13 −4
Original line number Diff line number Diff line
@@ -70,6 +70,8 @@ 


#ifndef __ASSEMBLY__



#include <linux/compiler.h>



/***********************************************************

*

* FUNCTIONS: Blackfin General Purpose Ports Access Functions
@@ -223,6 +225,9 @@ int bfin_gpio_direction_output(unsigned gpio, int value); 
int bfin_gpio_get_value(unsigned gpio);

void bfin_gpio_set_value(unsigned gpio, int value);



#include <asm/irq.h>

#include <asm/errno.h>



#ifdef CONFIG_GPIOLIB

#include <asm-generic/gpio.h>		/* cansleep wrappers */
@@ -247,6 +252,11 @@ static inline int gpio_cansleep(unsigned int gpio) 
	return __gpio_cansleep(gpio);

}



static inline int gpio_to_irq(unsigned gpio)

{

	return __gpio_to_irq(gpio);

}



#else /* !CONFIG_GPIOLIB */



static inline int gpio_request(unsigned gpio, const char *label)
@@ -279,10 +289,6 @@ static inline void gpio_set_value(unsigned gpio, int value) 
	return bfin_gpio_set_value(gpio, value);

}



#include <asm-generic/gpio.h>		/* cansleep wrappers */

#endif	/* !CONFIG_GPIOLIB */

#include <asm/irq.h>



static inline int gpio_to_irq(unsigned gpio)

{

	if (likely(gpio < MAX_BLACKFIN_GPIOS))
@@ -291,6 +297,9 @@ static inline int gpio_to_irq(unsigned gpio) 
	return -EINVAL;

}



#include <asm-generic/gpio.h>		/* cansleep wrappers */

#endif	/* !CONFIG_GPIOLIB */



static inline int irq_to_gpio(unsigned irq)

{

	return (irq - GPIO_IRQ_BASE);

arch/blackfin/kernel/bfin_gpio.c

+6 −0
Original line number Diff line number Diff line
@@ -1319,6 +1319,11 @@ void bfin_gpiolib_gpio_free(struct gpio_chip *chip, unsigned gpio) 
	return bfin_gpio_free(gpio);

}



int bfin_gpiolib_gpio_to_irq(struct gpio_chip *chip, unsigned gpio)

{

	return gpio + GPIO_IRQ_BASE;

}



static struct gpio_chip bfin_chip = {

	.label			= "BFIN-GPIO",

	.direction_input	= bfin_gpiolib_direction_input,
@@ -1327,6 +1332,7 @@ static struct gpio_chip bfin_chip = { 
	.set			= bfin_gpiolib_set_value,

	.request		= bfin_gpiolib_gpio_request,

	.free			= bfin_gpiolib_gpio_free,

	.to_irq			= bfin_gpiolib_gpio_to_irq,

	.base			= 0,

	.ngpio			= MAX_BLACKFIN_GPIOS,

};