diff options
| author | Sascha Hauer | 2009-05-06 12:55:50 +0200 |
|---|---|---|
| committer | Sascha Hauer | 2009-05-07 16:20:52 +0200 |
| commit | 4f163eb8811e8ea760d9fe654ecc6f17feecb477 (patch) | |
| tree | 5772ca291eabad6335f52dc0a462761a6140e8ca /arch/arm/mach-mx3/mx31lite.c | |
| parent | mx31: remove gpio_request calls from iomux code (diff) | |
| download | kernel-qcow2-linux-4f163eb8811e8ea760d9fe654ecc6f17feecb477.tar.gz kernel-qcow2-linux-4f163eb8811e8ea760d9fe654ecc6f17feecb477.tar.xz kernel-qcow2-linux-4f163eb8811e8ea760d9fe654ecc6f17feecb477.zip | |
mx31: calls to gpio_request moved into platform code
In order to use the gpiolib, we now have to call gpio_request in
the plaform code since it is not done in iomux code anymore.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-mx3/mx31lite.c')
| -rw-r--r-- | arch/arm/mach-mx3/mx31lite.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/arch/arm/mach-mx3/mx31lite.c b/arch/arm/mach-mx3/mx31lite.c index 74734e50de24..e70922913164 100644 --- a/arch/arm/mach-mx3/mx31lite.c +++ b/arch/arm/mach-mx3/mx31lite.c @@ -118,14 +118,21 @@ void __init mx31lite_map_io(void) */ static void __init mxc_board_init(void) { + int ret; + mxc_iomux_setup_multiple_pins(mx31lite_pins, ARRAY_SIZE(mx31lite_pins), "mx31lite"); mxc_register_device(&mxc_uart_device0, &uart_pdata); /* SMSC9117 IRQ pin */ - gpio_direction_input(IOMUX_TO_GPIO(MX31_PIN_SFS6)); - platform_device_register(&smsc911x_device); + ret = gpio_request(IOMUX_TO_GPIO(MX31_PIN_SFS6), "sms9117-irq"); + if (ret) + pr_warning("could not get LAN irq gpio\n"); + else { + gpio_direction_input(IOMUX_TO_GPIO(MX31_PIN_SFS6)); + platform_device_register(&smsc911x_device); + } } static void __init mx31lite_timer_init(void) |