aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-shmobile/board-ap4evb.c41
1 files changed, 35 insertions, 6 deletions
diff --git a/arch/arm/mach-shmobile/board-ap4evb.c b/arch/arm/mach-shmobile/board-ap4evb.c
index 4e883e0fb01b..005337904ad5 100644
--- a/arch/arm/mach-shmobile/board-ap4evb.c
+++ b/arch/arm/mach-shmobile/board-ap4evb.c
@@ -599,18 +599,18 @@ static struct platform_device fsi_device = {
599 }, 599 },
600}; 600};
601 601
602/*
603 * If left and right margins are not multiples of 8,
604 * LDHAJR will be adjusted accordingly by the LCDC
605 * driver. Until we start using EDID, these values
606 * might have to be adjusted for different monitors.
607 */
602const static struct fb_videomode ap4evb_hdmi_modes[] = { 608const static struct fb_videomode ap4evb_hdmi_modes[] = {
603 { 609 {
604 .name = "HDMI 720p", 610 .name = "HDMI 720p",
605 .xres = 1280, 611 .xres = 1280,
606 .yres = 720, 612 .yres = 720,
607 613
608 /*
609 * If left and right margins are not multiples of 8,
610 * LDHAJR will be adjusted accordingly by the LCDC
611 * driver. Until we start using EDID, these values
612 * might have to be adjusted for different monitors.
613 */
614 .left_margin = 200, 614 .left_margin = 200,
615 .right_margin = 88, 615 .right_margin = 88,
616 .hsync_len = 48, 616 .hsync_len = 48,
@@ -621,6 +621,35 @@ const static struct fb_videomode ap4evb_hdmi_modes[] = {
621 621
622 .pixclock = 13468, 622 .pixclock = 13468,
623 .sync = FB_SYNC_VERT_HIGH_ACT | FB_SYNC_HOR_HIGH_ACT, 623 .sync = FB_SYNC_VERT_HIGH_ACT | FB_SYNC_HOR_HIGH_ACT,
624 }, {
625 .name = "1280x1024",
626 .xres = 1280,
627 .yres = 1024,
628
629 .left_margin = 144,
630 .right_margin = 48,
631 .hsync_len = 64,
632
633 .upper_margin = 35,
634 .lower_margin = 5,
635 .vsync_len = 3,
636
637 .pixclock = 9800,
638 .sync = FB_SYNC_VERT_HIGH_ACT | FB_SYNC_HOR_HIGH_ACT,
639 }, {
640 .name = "HDMI 480p",
641 .xres = 720,
642 .yres = 480,
643
644 .left_margin = 36,
645 .right_margin = 18,
646 .hsync_len = 68,
647
648 .upper_margin = 36,
649 .lower_margin = 3,
650 .vsync_len = 6,
651 .pixclock = 37037,
652 .sync = FB_SYNC_VERT_HIGH_ACT | FB_SYNC_HOR_HIGH_ACT,
624 }, 653 },
625}; 654};
626 655