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

Commit 7e6c53aa authored by Shawn Guo's avatar Shawn Guo Committed by Sascha Hauer
Browse files

gpio/mxs: move irq_to_gpio() into gpio-mxs driver 



As irq_to_gpio() is only being used by gpio-mxs driver, it should be
moved from mach/gpio.h into gpio-mxs.c.

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

arch/arm/mach-mxs/include/mach/gpio.h

+0 −2
Original line number Diff line number Diff line
@@ -30,6 +30,4 @@ 
#define gpio_cansleep		__gpio_cansleep

#define gpio_to_irq		__gpio_to_irq



#define irq_to_gpio(irq)	((irq) - MXS_GPIO_IRQ_START)



#endif /* __MACH_MXS_GPIO_H__ */

arch/arm/mach-mxs/include/mach/mxs.h

+2 −0
Original line number Diff line number Diff line
@@ -86,6 +86,8 @@ 
	.type = _type,							\

}



#define MXS_GPIO_NR(bank, nr)	((bank) * 32 + (nr))



#define MXS_SET_ADDR		0x4

#define MXS_CLR_ADDR		0x8

#define MXS_TOG_ADDR		0xc

drivers/gpio/gpio-mxs.c

+2 −0
Original line number Diff line number Diff line
@@ -49,6 +49,8 @@ 
#define GPIO_INT_LEV_MASK	(1 << 0)

#define GPIO_INT_POL_MASK	(1 << 1)



#define irq_to_gpio(irq)	((irq) - MXS_GPIO_IRQ_START)



struct mxs_gpio_port {

	void __iomem *base;

	int id;