diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2009-05-06 06:55:50 -0400 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2009-05-07 10:20:52 -0400 |
commit | 4f163eb8811e8ea760d9fe654ecc6f17feecb477 (patch) | |
tree | 5772ca291eabad6335f52dc0a462761a6140e8ca /arch/arm/mach-mx3/mx31lite.c | |
parent | ef754d635820102ec7719486d40ede3c94ba44c8 (diff) |
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) | |||
118 | */ | 118 | */ |
119 | static void __init mxc_board_init(void) | 119 | static void __init mxc_board_init(void) |
120 | { | 120 | { |
121 | int ret; | ||
122 | |||
121 | mxc_iomux_setup_multiple_pins(mx31lite_pins, ARRAY_SIZE(mx31lite_pins), | 123 | mxc_iomux_setup_multiple_pins(mx31lite_pins, ARRAY_SIZE(mx31lite_pins), |
122 | "mx31lite"); | 124 | "mx31lite"); |
123 | 125 | ||
124 | mxc_register_device(&mxc_uart_device0, &uart_pdata); | 126 | mxc_register_device(&mxc_uart_device0, &uart_pdata); |
125 | 127 | ||
126 | /* SMSC9117 IRQ pin */ | 128 | /* SMSC9117 IRQ pin */ |
127 | gpio_direction_input(IOMUX_TO_GPIO(MX31_PIN_SFS6)); | 129 | ret = gpio_request(IOMUX_TO_GPIO(MX31_PIN_SFS6), "sms9117-irq"); |
128 | platform_device_register(&smsc911x_device); | 130 | if (ret) |
131 | pr_warning("could not get LAN irq gpio\n"); | ||
132 | else { | ||
133 | gpio_direction_input(IOMUX_TO_GPIO(MX31_PIN_SFS6)); | ||
134 | platform_device_register(&smsc911x_device); | ||
135 | } | ||
129 | } | 136 | } |
130 | 137 | ||
131 | static void __init mx31lite_timer_init(void) | 138 | static void __init mx31lite_timer_init(void) |