diff options
Diffstat (limited to 'arch/arm/mach-exynos/midas-lcd.c')
| -rw-r--r-- | arch/arm/mach-exynos/midas-lcd.c | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/arch/arm/mach-exynos/midas-lcd.c b/arch/arm/mach-exynos/midas-lcd.c index ad722a6..8612f62 100644 --- a/arch/arm/mach-exynos/midas-lcd.c +++ b/arch/arm/mach-exynos/midas-lcd.c @@ -518,7 +518,7 @@ static struct s3cfb_lcd ea8061 = { .p_width = 74, .p_height = 131, .bpp = 24, - .freq = 60, + .freq = 58, /* minumun value is 0 except for wr_act time. */ .cpu_timing = { @@ -530,7 +530,7 @@ static struct s3cfb_lcd ea8061 = { .timing = { .h_fp = 52, - .h_bp = 96, + .h_bp = 121, .h_sw = 4, .v_fp = 13, .v_fpe = 1, @@ -598,7 +598,7 @@ static struct s3cfb_lcd ea8061 = { .p_width = 64, .p_height = 106, .bpp = 24, - .freq = 60, + .freq = 58, /* minumun value is 0 except for wr_act time. */ .cpu_timing = { @@ -610,7 +610,7 @@ static struct s3cfb_lcd ea8061 = { .timing = { .h_fp = 52, - .h_bp = 96, + .h_bp = 121, .h_sw = 4, .v_fp = 13, .v_fpe = 1, @@ -819,9 +819,11 @@ static void lcd_cfg_gpio(void) s3c_gpio_cfgpin(GPIO_MLCD_RST, S3C_GPIO_OUTPUT); s3c_gpio_setpull(GPIO_MLCD_RST, S3C_GPIO_PULL_NONE); +#if defined(GPIO_LCD_22V_EN_00) /* LCD_EN */ s3c_gpio_cfgpin(GPIO_LCD_22V_EN_00, S3C_GPIO_OUTPUT); s3c_gpio_setpull(GPIO_LCD_22V_EN_00, S3C_GPIO_PULL_NONE); +#endif return; } @@ -899,15 +901,18 @@ static int lcd_power_on(void *ld, int enable) return -EPERM; } +#if defined(GPIO_LCD_22V_EN_00) err = gpio_request(GPIO_LCD_22V_EN_00, "LCD_EN"); if (err) { printk(KERN_ERR "failed to request GPM4[4] for " "LCD_2.2V_EN control\n"); return -EPERM; } - +#endif if (enable) { +#if defined(GPIO_LCD_22V_EN_00) gpio_set_value(GPIO_LCD_22V_EN_00, GPIO_LEVEL_HIGH); +#endif #if defined(CONFIG_MACH_T0) regulator = regulator_get(NULL, "vcc_1.8v_lcd"); @@ -955,16 +960,19 @@ static int lcd_power_on(void *ld, int enable) regulator_force_disable(regulator); regulator_put(regulator); #endif +#if defined(GPIO_LCD_22V_EN_00) gpio_set_value(GPIO_LCD_22V_EN_00, GPIO_LEVEL_LOW); +#endif gpio_set_value(GPIO_MLCD_RST, 0); } out: /* Release GPIO */ gpio_free(GPIO_MLCD_RST); +#if defined(GPIO_LCD_22V_EN_00) gpio_free(GPIO_LCD_22V_EN_00); -return 0; - +#endif + return 0; } #endif |