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

Commit 1dfa86bb authored by Shawn Guo's avatar Shawn Guo Committed by Sascha Hauer
Browse files

arm/mxc: move IMX_GPIO_NR into mach/hardware.h 



The patch moves IMX_GPIO_NR into mach/hardware.h, so that we only
use standard gpiolib helpers in mach/gpio.h.

Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
Signed-off-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
parent a4395612

arch/arm/plat-mxc/include/mach/gpio.h

+0 −5
Original line number Diff line number Diff line
@@ -23,11 +23,6 @@ 
#include <mach/hardware.h>

#include <asm-generic/gpio.h>





/* There's a off-by-one betweem the gpio bank number and the gpiochip */

/* range e.g. GPIO_1_5 is gpio 5 under linux */

#define IMX_GPIO_NR(bank, nr)		(((bank) - 1) * 32 + (nr))



/* use gpiolib dispatchers */

#define gpio_get_value		__gpio_get_value

#define gpio_set_value		__gpio_set_value

arch/arm/plat-mxc/include/mach/hardware.h

+4 −0
Original line number Diff line number Diff line
@@ -116,6 +116,10 @@ 
	.type = _type,							\

}



/* There's a off-by-one betweem the gpio bank number and the gpiochip */

/* range e.g. GPIO_1_5 is gpio 5 under linux */

#define IMX_GPIO_NR(bank, nr)		(((bank) - 1) * 32 + (nr))



#define IMX_GPIO_TO_IRQ(gpio)	(MXC_GPIO_IRQ_START + (gpio))



#endif /* __ASM_ARCH_MXC_HARDWARE_H__ */