diff options
Diffstat (limited to 'arch/arm/plat-mxc/3ds_debugboard.c')
-rw-r--r-- | arch/arm/plat-mxc/3ds_debugboard.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/plat-mxc/3ds_debugboard.c b/arch/arm/plat-mxc/3ds_debugboard.c index 5cac2c540f4..3b48a08c165 100644 --- a/arch/arm/plat-mxc/3ds_debugboard.c +++ b/arch/arm/plat-mxc/3ds_debugboard.c | |||
@@ -49,7 +49,6 @@ | |||
49 | #define MCU_BOARD_ID_REG 0x68 | 49 | #define MCU_BOARD_ID_REG 0x68 |
50 | 50 | ||
51 | #define MXC_IRQ_TO_EXPIO(irq) ((irq) - MXC_BOARD_IRQ_START) | 51 | #define MXC_IRQ_TO_EXPIO(irq) ((irq) - MXC_BOARD_IRQ_START) |
52 | #define MXC_IRQ_TO_GPIO(irq) ((irq) - MXC_INTERNAL_IRQS) | ||
53 | 52 | ||
54 | #define MXC_EXP_IO_BASE (MXC_BOARD_IRQ_START) | 53 | #define MXC_EXP_IO_BASE (MXC_BOARD_IRQ_START) |
55 | #define MXC_MAX_EXP_IO_LINES 16 | 54 | #define MXC_MAX_EXP_IO_LINES 16 |
@@ -155,8 +154,9 @@ static struct regulator_consumer_supply dummy_supplies[] = { | |||
155 | REGULATOR_SUPPLY("vddvario", "smsc911x"), | 154 | REGULATOR_SUPPLY("vddvario", "smsc911x"), |
156 | }; | 155 | }; |
157 | 156 | ||
158 | int __init mxc_expio_init(u32 base, u32 p_irq) | 157 | int __init mxc_expio_init(u32 base, u32 intr_gpio) |
159 | { | 158 | { |
159 | u32 p_irq = gpio_to_irq(intr_gpio); | ||
160 | int i; | 160 | int i; |
161 | 161 | ||
162 | brd_io = ioremap(BOARD_IO_ADDR(base), SZ_4K); | 162 | brd_io = ioremap(BOARD_IO_ADDR(base), SZ_4K); |
@@ -178,8 +178,8 @@ int __init mxc_expio_init(u32 base, u32 p_irq) | |||
178 | /* | 178 | /* |
179 | * Configure INT line as GPIO input | 179 | * Configure INT line as GPIO input |
180 | */ | 180 | */ |
181 | gpio_request(MXC_IRQ_TO_GPIO(p_irq), "expio_pirq"); | 181 | gpio_request(intr_gpio, "expio_pirq"); |
182 | gpio_direction_input(MXC_IRQ_TO_GPIO(p_irq)); | 182 | gpio_direction_input(intr_gpio); |
183 | 183 | ||
184 | /* disable the interrupt and clear the status */ | 184 | /* disable the interrupt and clear the status */ |
185 | __raw_writew(0, brd_io + INTR_MASK_REG); | 185 | __raw_writew(0, brd_io + INTR_MASK_REG); |