diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-pxa/zylonite_pxa300.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-pxa/zylonite_pxa320.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/zylonite_pxa300.c b/arch/arm/mach-pxa/zylonite_pxa300.c index cefd1c0a854..84095440a87 100644 --- a/arch/arm/mach-pxa/zylonite_pxa300.c +++ b/arch/arm/mach-pxa/zylonite_pxa300.c | |||
@@ -197,10 +197,12 @@ static void __init zylonite_detect_lcd_panel(void) | |||
197 | for (i = 0; i < NUM_LCD_DETECT_PINS; i++) { | 197 | for (i = 0; i < NUM_LCD_DETECT_PINS; i++) { |
198 | id = id << 1; | 198 | id = id << 1; |
199 | gpio = mfp_to_gpio(lcd_detect_pins[i]); | 199 | gpio = mfp_to_gpio(lcd_detect_pins[i]); |
200 | gpio_request(gpio, "LCD_ID_PINS"); | ||
200 | gpio_direction_input(gpio); | 201 | gpio_direction_input(gpio); |
201 | 202 | ||
202 | if (gpio_get_value(gpio)) | 203 | if (gpio_get_value(gpio)) |
203 | id = id | 0x1; | 204 | id = id | 0x1; |
205 | gpio_free(gpio); | ||
204 | } | 206 | } |
205 | 207 | ||
206 | /* lcd id, flush out bit 1 */ | 208 | /* lcd id, flush out bit 1 */ |
diff --git a/arch/arm/mach-pxa/zylonite_pxa320.c b/arch/arm/mach-pxa/zylonite_pxa320.c index cc5a2283360..60d08f23f5e 100644 --- a/arch/arm/mach-pxa/zylonite_pxa320.c +++ b/arch/arm/mach-pxa/zylonite_pxa320.c | |||
@@ -176,10 +176,12 @@ static void __init zylonite_detect_lcd_panel(void) | |||
176 | for (i = 0; i < NUM_LCD_DETECT_PINS; i++) { | 176 | for (i = 0; i < NUM_LCD_DETECT_PINS; i++) { |
177 | id = id << 1; | 177 | id = id << 1; |
178 | gpio = mfp_to_gpio(lcd_detect_pins[i]); | 178 | gpio = mfp_to_gpio(lcd_detect_pins[i]); |
179 | gpio_request(gpio, "LCD_ID_PINS"); | ||
179 | gpio_direction_input(gpio); | 180 | gpio_direction_input(gpio); |
180 | 181 | ||
181 | if (gpio_get_value(gpio)) | 182 | if (gpio_get_value(gpio)) |
182 | id = id | 0x1; | 183 | id = id | 0x1; |
184 | gpio_free(gpio); | ||
183 | } | 185 | } |
184 | 186 | ||
185 | /* lcd id, flush out bit 1 */ | 187 | /* lcd id, flush out bit 1 */ |