diff options
author | Eric Bénard <eric@eukrea.com> | 2011-02-25 07:49:57 -0500 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-03-25 08:33:51 -0400 |
commit | da8db3aab55142ad39061e6b0db1e7b065eac61a (patch) | |
tree | 815f3689b62b3d6676c3ed53ba38d161850db15c | |
parent | 5bb2c828420992357cfe66ceb6f4c3d4121ae1ce (diff) |
mx3/eukrea_mbimxsd-baseboard: fix gpio request
without this patch, we get :
------------[ cut here ]------------
WARNING: at drivers/gpio/gpiolib.c:99 gpio_ensure_requested+0x4c/0x104()
autorequest GPIO-4
.../...
[<c01bcfb0>] (platform_lcd_set_power+0x34/0x40) from [<c033954c>] (platform_lcd_probe+0xb8/0xd8)
Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r-- | arch/arm/mach-mx3/eukrea_mbimxsd-baseboard.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-mx3/eukrea_mbimxsd-baseboard.c b/arch/arm/mach-mx3/eukrea_mbimxsd-baseboard.c index 80761474c0f8..3f67eb6056cf 100644 --- a/arch/arm/mach-mx3/eukrea_mbimxsd-baseboard.c +++ b/arch/arm/mach-mx3/eukrea_mbimxsd-baseboard.c | |||
@@ -167,7 +167,7 @@ static iomux_v3_cfg_t eukrea_mbimxsd_pads[] = { | |||
167 | 167 | ||
168 | #define GPIO_LED1 IMX_GPIO_NR(3, 29) | 168 | #define GPIO_LED1 IMX_GPIO_NR(3, 29) |
169 | #define GPIO_SWITCH1 IMX_GPIO_NR(3, 25) | 169 | #define GPIO_SWITCH1 IMX_GPIO_NR(3, 25) |
170 | #define GPIO_LCDPWR (4) | 170 | #define GPIO_LCDPWR IMX_GPIO_NR(1, 4) |
171 | 171 | ||
172 | static void eukrea_mbimxsd_lcd_power_set(struct plat_lcd_data *pd, | 172 | static void eukrea_mbimxsd_lcd_power_set(struct plat_lcd_data *pd, |
173 | unsigned int power) | 173 | unsigned int power) |
@@ -301,7 +301,6 @@ void __init eukrea_mbimxsd35_baseboard_init(void) | |||
301 | 301 | ||
302 | gpio_request(GPIO_LCDPWR, "LCDPWR"); | 302 | gpio_request(GPIO_LCDPWR, "LCDPWR"); |
303 | gpio_direction_output(GPIO_LCDPWR, 1); | 303 | gpio_direction_output(GPIO_LCDPWR, 1); |
304 | gpio_free(GPIO_LCDPWR); | ||
305 | 304 | ||
306 | i2c_register_board_info(0, eukrea_mbimxsd_i2c_devices, | 305 | i2c_register_board_info(0, eukrea_mbimxsd_i2c_devices, |
307 | ARRAY_SIZE(eukrea_mbimxsd_i2c_devices)); | 306 | ARRAY_SIZE(eukrea_mbimxsd_i2c_devices)); |