summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Bénard <eric@eukrea.com>2011-02-25 13:49:57 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2011-03-25 13:33:51 +0100
commitda8db3aab55142ad39061e6b0db1e7b065eac61a (patch)
tree815f3689b62b3d6676c3ed53ba38d161850db15c
parent5bb2c828420992357cfe66ceb6f4c3d4121ae1ce (diff)
downloadop-kernel-dev-da8db3aab55142ad39061e6b0db1e7b065eac61a.zip
op-kernel-dev-da8db3aab55142ad39061e6b0db1e7b065eac61a.tar.gz
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.c3
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 8076147..3f67eb6 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[] = {
#define GPIO_LED1 IMX_GPIO_NR(3, 29)
#define GPIO_SWITCH1 IMX_GPIO_NR(3, 25)
-#define GPIO_LCDPWR (4)
+#define GPIO_LCDPWR IMX_GPIO_NR(1, 4)
static void eukrea_mbimxsd_lcd_power_set(struct plat_lcd_data *pd,
unsigned int power)
@@ -301,7 +301,6 @@ void __init eukrea_mbimxsd35_baseboard_init(void)
gpio_request(GPIO_LCDPWR, "LCDPWR");
gpio_direction_output(GPIO_LCDPWR, 1);
- gpio_free(GPIO_LCDPWR);
i2c_register_board_info(0, eukrea_mbimxsd_i2c_devices,
ARRAY_SIZE(eukrea_mbimxsd_i2c_devices));
OpenPOWER on IntegriCloud