diff options
author | Jong Kim <jongk@nvidia.com> | 2013-07-01 13:55:59 -0700 |
---|---|---|
committer | Matthew Pedro <mapedro@nvidia.com> | 2013-07-11 14:17:38 -0700 |
commit | b7451bd2afdf469be1b22fda05a887b659449801 (patch) | |
tree | b747de032371d4c3f01d953dc88dadd4de0be809 | |
parent | bb1283797ab18a0d195e32c9c6ea8764a640a9f4 (diff) |
arm: tegra: dalmore: add default hdmi panel mode
Add default 640x480 hdmi panel mode. This HDMI mode is just a dummy
for device probe to pass and finish dc/fb/fbcon registration. The
actual mode will be detected by detect worker and programmed to the
hw a little later during boot process.
bug 1264520
Change-Id: Iad2e3dca1316b347abdc72d8ee8c73444ce368e2
Signed-off-by: Jong Kim <jongk@nvidia.com>
Reviewed-on: http://git-master/r/243979
(cherry picked from commit b44efdeeaa328cb19add0c8f6ef3fb10dc5829dc)
Reviewed-on: http://git-master/r/248024
Reviewed-by: Matthew Pedro <mapedro@nvidia.com>
Tested-by: Matthew Pedro <mapedro@nvidia.com>
-rw-r--r-- | arch/arm/mach-tegra/board-dalmore-panel.c | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/arch/arm/mach-tegra/board-dalmore-panel.c b/arch/arm/mach-tegra/board-dalmore-panel.c index d38b2048d8d1..19635cd20dc7 100644 --- a/arch/arm/mach-tegra/board-dalmore-panel.c +++ b/arch/arm/mach-tegra/board-dalmore-panel.c @@ -277,6 +277,22 @@ struct tegra_hdmi_out dalmore_hdmi_out = { .n_tmds_config = ARRAY_SIZE(dalmore_tmds_config), }; +static struct tegra_dc_mode hdmi_panel_modes[] = { + { + .pclk = KHZ2PICOS(25200), + .h_ref_to_sync = 1, + .v_ref_to_sync = 1, + .h_sync_width = 96, /* hsync_len */ + .v_sync_width = 2, /* vsync_len */ + .h_back_porch = 48, /* left_margin */ + .v_back_porch = 33, /* upper_margin */ + .h_active = 640, /* xres */ + .v_active = 480, /* yres */ + .h_front_porch = 16, /* right_margin */ + .v_front_porch = 10, /* lower_margin */ + }, +}; + static struct tegra_dc_out dalmore_disp2_out = { .type = TEGRA_DC_OUT_HDMI, .flags = TEGRA_DC_OUT_HOTPLUG_HIGH, @@ -287,6 +303,9 @@ static struct tegra_dc_out dalmore_disp2_out = { .hdmi_out = &dalmore_hdmi_out, .max_pixclock = KHZ2PICOS(297000), + .modes = hdmi_panel_modes, + .n_modes = ARRAY_SIZE(hdmi_panel_modes), + .depth = 24, .align = TEGRA_DC_ALIGN_MSB, .order = TEGRA_DC_ORDER_RED_BLUE, @@ -316,8 +335,8 @@ static struct tegra_dc_platform_data dalmore_disp1_pdata = { static struct tegra_fb_data dalmore_disp2_fb_data = { .win = 0, - .xres = 1024, - .yres = 600, + .xres = 640, + .yres = 480, .bits_per_pixel = 32, .flags = TEGRA_FB_FLIP_ON_PROBE, }; |