evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ARM: mach-imx/mx27_3ds: Use the standard gpio_to_irq function

Browse source 
Use the standard gpio_to_irq function instead of a dedicated IRQ_GPIOx macro.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Fabio Estevam 2011-06-22 09:25:27 -03:00 • committed by Sascha Hauer
parent 31b738a4f4
commit c084473d7a
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
arch/arm/mach-imx/mach-mx27_3ds.c
View file

@ -47,6 +47,7 @@
#define SPI2_SS0 IMX_GPIO_NR(4, 21) #define SPI2_SS0 IMX_GPIO_NR(4, 21)
#define EXPIO_PARENT_INT gpio_to_irq(IMX_GPIO_NR(3, 28)) #define EXPIO_PARENT_INT gpio_to_irq(IMX_GPIO_NR(3, 28))
#define PMIC_INT IMX_GPIO_NR(3, 14) #define PMIC_INT IMX_GPIO_NR(3, 14)
#define SD1_CD IMX_GPIO_NR(2, 26)
static const int mx27pdk_pins[] __initconst = { static const int mx27pdk_pins[] __initconst = {
/* UART1 */ /* UART1 */
@ -135,13 +136,13 @@ static const struct matrix_keymap_data mx27_3ds_keymap_data __initconst = {
static int mx27_3ds_sdhc1_init(struct device *dev, irq_handler_t detect_irq, static int mx27_3ds_sdhc1_init(struct device *dev, irq_handler_t detect_irq,
void *data) void *data)
{ {
return request_irq(IRQ_GPIOB(26), detect_irq, IRQF_TRIGGER_FALLING | return request_irq(gpio_to_irq(SD1_CD), detect_irq,
IRQF_TRIGGER_RISING, "sdhc1-card-detect", data); IRQF_TRIGGER_FALLING | IRQF_TRIGGER_RISING, "sdhc1-card-detect", data);
} }
static void mx27_3ds_sdhc1_exit(struct device *dev, void *data) static void mx27_3ds_sdhc1_exit(struct device *dev, void *data)
{ {
free_irq(IRQ_GPIOB(26), data); free_irq(gpio_to_irq(SD1_CD), data);
} }
static const struct imxmmc_platform_data sdhc1_pdata __initconst = { static const struct imxmmc_platform_data sdhc1_pdata __initconst = {
@ -275,7 +276,7 @@ static struct spi_board_info mx27_3ds_spi_devs[] __initdata = {
.bus_num = 1, .bus_num = 1,
.chip_select = 0, /* SS0 */ .chip_select = 0, /* SS0 */
.platform_data = &mc13783_pdata, .platform_data = &mc13783_pdata,
.irq = IRQ_GPIOC(14), .irq = gpio_to_irq(PMIC_INT),
.mode = SPI_CS_HIGH, .mode = SPI_CS_HIGH,
}, },
}; };