diff options
Diffstat (limited to 'arch/arm/mach-omap1/board-ams-delta.c')
-rw-r--r-- | arch/arm/mach-omap1/board-ams-delta.c | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/arch/arm/mach-omap1/board-ams-delta.c b/arch/arm/mach-omap1/board-ams-delta.c index 7fc11c34b696..fdd1dd53fa9c 100644 --- a/arch/arm/mach-omap1/board-ams-delta.c +++ b/arch/arm/mach-omap1/board-ams-delta.c | |||
@@ -33,6 +33,8 @@ | |||
33 | #include <plat/board.h> | 33 | #include <plat/board.h> |
34 | #include <plat/common.h> | 34 | #include <plat/common.h> |
35 | 35 | ||
36 | #include <mach/ams-delta-fiq.h> | ||
37 | |||
36 | static u8 ams_delta_latch1_reg; | 38 | static u8 ams_delta_latch1_reg; |
37 | static u16 ams_delta_latch2_reg; | 39 | static u16 ams_delta_latch2_reg; |
38 | 40 | ||
@@ -236,6 +238,10 @@ static void __init ams_delta_init(void) | |||
236 | omap_usb_init(&ams_delta_usb_config); | 238 | omap_usb_init(&ams_delta_usb_config); |
237 | platform_add_devices(ams_delta_devices, ARRAY_SIZE(ams_delta_devices)); | 239 | platform_add_devices(ams_delta_devices, ARRAY_SIZE(ams_delta_devices)); |
238 | 240 | ||
241 | #ifdef CONFIG_AMS_DELTA_FIQ | ||
242 | ams_delta_init_fiq(); | ||
243 | #endif | ||
244 | |||
239 | omap_writew(omap_readw(ARM_RSTCT1) | 0x0004, ARM_RSTCT1); | 245 | omap_writew(omap_readw(ARM_RSTCT1) | 0x0004, ARM_RSTCT1); |
240 | } | 246 | } |
241 | 247 | ||
@@ -263,8 +269,18 @@ static struct platform_device ams_delta_modem_device = { | |||
263 | 269 | ||
264 | static int __init ams_delta_modem_init(void) | 270 | static int __init ams_delta_modem_init(void) |
265 | { | 271 | { |
272 | int err; | ||
273 | |||
266 | omap_cfg_reg(M14_1510_GPIO2); | 274 | omap_cfg_reg(M14_1510_GPIO2); |
267 | ams_delta_modem_ports[0].irq = gpio_to_irq(2); | 275 | ams_delta_modem_ports[0].irq = |
276 | gpio_to_irq(AMS_DELTA_GPIO_PIN_MODEM_IRQ); | ||
277 | |||
278 | err = gpio_request(AMS_DELTA_GPIO_PIN_MODEM_IRQ, "modem"); | ||
279 | if (err) { | ||
280 | pr_err("Couldn't request gpio pin for modem\n"); | ||
281 | return err; | ||
282 | } | ||
283 | gpio_direction_input(AMS_DELTA_GPIO_PIN_MODEM_IRQ); | ||
268 | 284 | ||
269 | ams_delta_latch2_write( | 285 | ams_delta_latch2_write( |
270 | AMS_DELTA_LATCH2_MODEM_NRESET | AMS_DELTA_LATCH2_MODEM_CODEC, | 286 | AMS_DELTA_LATCH2_MODEM_NRESET | AMS_DELTA_LATCH2_MODEM_CODEC, |