diff options
| -rw-r--r-- | arch/arm/mach-pxa/raumfeld.c | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/arch/arm/mach-pxa/raumfeld.c b/arch/arm/mach-pxa/raumfeld.c index 8e5b3d8a86be..9caa5e5c8d94 100644 --- a/arch/arm/mach-pxa/raumfeld.c +++ b/arch/arm/mach-pxa/raumfeld.c | |||
| @@ -573,10 +573,10 @@ static struct pxafb_mode_info sharp_lq043t3dx02_mode = { | |||
| 573 | .xres = 480, | 573 | .xres = 480, |
| 574 | .yres = 272, | 574 | .yres = 272, |
| 575 | .bpp = 16, | 575 | .bpp = 16, |
| 576 | .hsync_len = 4, | 576 | .hsync_len = 41, |
| 577 | .left_margin = 2, | 577 | .left_margin = 2, |
| 578 | .right_margin = 1, | 578 | .right_margin = 1, |
| 579 | .vsync_len = 1, | 579 | .vsync_len = 10, |
| 580 | .upper_margin = 3, | 580 | .upper_margin = 3, |
| 581 | .lower_margin = 1, | 581 | .lower_margin = 1, |
| 582 | .sync = 0, | 582 | .sync = 0, |
| @@ -596,30 +596,31 @@ static void __init raumfeld_lcd_init(void) | |||
| 596 | { | 596 | { |
| 597 | int ret; | 597 | int ret; |
| 598 | 598 | ||
| 599 | pxa_set_fb_info(NULL, &raumfeld_sharp_lcd_info); | ||
| 600 | |||
| 601 | /* Hardware revision 2 has the backlight regulator controlled | ||
| 602 | * by an LT3593, earlier and later devices use PWM for that. */ | ||
| 603 | if ((system_rev & 0xff) == 2) { | ||
| 604 | platform_device_register(&raumfeld_lt3593_device); | ||
| 605 | } else { | ||
| 606 | mfp_cfg_t raumfeld_pwm_pin_config = GPIO17_PWM0_OUT; | ||
| 607 | pxa3xx_mfp_config(&raumfeld_pwm_pin_config, 1); | ||
| 608 | platform_device_register(&raumfeld_pwm_backlight_device); | ||
| 609 | } | ||
| 610 | |||
| 611 | ret = gpio_request(GPIO_TFT_VA_EN, "display VA enable"); | 599 | ret = gpio_request(GPIO_TFT_VA_EN, "display VA enable"); |
| 612 | if (ret < 0) | 600 | if (ret < 0) |
| 613 | pr_warning("Unable to request GPIO_TFT_VA_EN\n"); | 601 | pr_warning("Unable to request GPIO_TFT_VA_EN\n"); |
| 614 | else | 602 | else |
| 615 | gpio_direction_output(GPIO_TFT_VA_EN, 1); | 603 | gpio_direction_output(GPIO_TFT_VA_EN, 1); |
| 616 | 604 | ||
| 605 | msleep(100); | ||
| 606 | |||
| 617 | ret = gpio_request(GPIO_DISPLAY_ENABLE, "display enable"); | 607 | ret = gpio_request(GPIO_DISPLAY_ENABLE, "display enable"); |
| 618 | if (ret < 0) | 608 | if (ret < 0) |
| 619 | pr_warning("Unable to request GPIO_DISPLAY_ENABLE\n"); | 609 | pr_warning("Unable to request GPIO_DISPLAY_ENABLE\n"); |
| 620 | else | 610 | else |
| 621 | gpio_direction_output(GPIO_DISPLAY_ENABLE, 1); | 611 | gpio_direction_output(GPIO_DISPLAY_ENABLE, 1); |
| 622 | 612 | ||
| 613 | /* Hardware revision 2 has the backlight regulator controlled | ||
| 614 | * by an LT3593, earlier and later devices use PWM for that. */ | ||
| 615 | if ((system_rev & 0xff) == 2) { | ||
| 616 | platform_device_register(&raumfeld_lt3593_device); | ||
| 617 | } else { | ||
| 618 | mfp_cfg_t raumfeld_pwm_pin_config = GPIO17_PWM0_OUT; | ||
| 619 | pxa3xx_mfp_config(&raumfeld_pwm_pin_config, 1); | ||
| 620 | platform_device_register(&raumfeld_pwm_backlight_device); | ||
| 621 | } | ||
| 622 | |||
| 623 | pxa_set_fb_info(NULL, &raumfeld_sharp_lcd_info); | ||
| 623 | platform_device_register(&pxa3xx_device_gcu); | 624 | platform_device_register(&pxa3xx_device_gcu); |
| 624 | } | 625 | } |
| 625 | 626 | ||
