summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPedro Perez de Heredia <pedro.perez@digi.com>2012-02-09 03:43:00 +0100
committerPedro Perez de Heredia <pedro.perez@digi.com>2012-02-09 03:43:00 +0100
commit50ff0f6ec254eb44859934ea3ca515b6268d155d (patch)
tree9e4e1196a7bf6e1a82d130cd588be6cf6f389fc4
parentab7c180c4a482d731f9f049467c1457677e01ab1 (diff)
Revert "ccxmx53: set video DSE to high for highres"
This reverts commit 9521e4b256644b5bf430ea9c1df3f1dd71618685. Which was commited again by mistake Signed-off-by: Pedro Perez de Heredia <pedro.perez@digi.com>
-rw-r--r--arch/arm/mach-mx5/devices_ccwmx53.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mach-mx5/devices_ccwmx53.c b/arch/arm/mach-mx5/devices_ccwmx53.c
index f6680489101d..0c7089e57d04 100644
--- a/arch/arm/mach-mx5/devices_ccwmx53.c
+++ b/arch/arm/mach-mx5/devices_ccwmx53.c
@@ -538,7 +538,7 @@ static void mxc_videomode_to_var(struct ad9389_dev *ad9389, struct fb_var_screen
if (fbvmode && fbvmode->xres <= 1366)
gpio_video_active(0, PAD_CTL_DSE_LOW);
else
- gpio_video_active(0, PAD_CTL_DSE_HIGH);
+ gpio_video_active(0, PAD_CTL_DSE_MED);
fb_dump_var(str, var);
}
@@ -681,7 +681,7 @@ static int ccwmx53_hdmi_hw_init(struct ad9389_dev *ad9389)
gpio_request(AD9389_GPIO_IRQ, "ad9389_irq");
gpio_direction_input(AD9389_GPIO_IRQ);
}
- gpio_video_active(pdata->dispif, PAD_CTL_DSE_HIGH);
+ gpio_video_active(pdata->dispif, PAD_CTL_DSE_MED);
return 0;
}
@@ -733,7 +733,6 @@ int __init ccwmx5x_init_fb(void)
#if !defined(CONFIG_CCXMX5X_DISP1)
if (i == 1) continue;
#endif
-
/* Set default pixel format, maybe overwritten later */
mx53_fb_data[i].interface_pix_fmt = i ? DISP1_PIX_FMT : DISP0_PIX_FMT;