1 files changed, 5 insertions, 4 deletions

diff --git a/arch/arm/mach-imx/mach-mx27_3ds.c b/arch/arm/mach-imx/mach-mx27_3ds.c
index e7965ec176fc..ccb9c3f7fe20 100644
--- a/arch/arm/mach-imx/mach-mx27_3ds.c
+++ b/arch/arm/mach-imx/mach-mx27_3ds.c
@@ -47,6 +47,7 @@
 #define SPI2_SS0                IMX_GPIO_NR(4, 21)
 #define EXPIO_PARENT_INT        gpio_to_irq(IMX_GPIO_NR(3, 28))
 #define PMIC_INT                IMX_GPIO_NR(3, 14)
+#define SD1_CD                  IMX_GPIO_NR(2, 26)
 
 static const int mx27pdk_pins[] __initconst = {
         /* 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,
                                 void *data)
 {
-        return request_irq(IRQ_GPIOB(26), detect_irq, IRQF_TRIGGER_FALLING |
-                        IRQF_TRIGGER_RISING, "sdhc1-card-detect", data);
+        return request_irq(gpio_to_irq(SD1_CD), detect_irq,
+        IRQF_TRIGGER_FALLING | IRQF_TRIGGER_RISING, "sdhc1-card-detect", 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 = {
@@ -275,7 +276,7 @@ static struct spi_board_info mx27_3ds_spi_devs[] __initdata = {
                 .bus_num        = 1,
                 .chip_select    = 0, /* SS0 */
                 .platform_data  = &mc13783_pdata,
-                .irq = IRQ_GPIOC(14),
+                .irq = gpio_to_irq(PMIC_INT),
                 .mode = SPI_CS_HIGH,
         },
 };