diff options
| author | Troy Kisky <troy.kisky@boundarydevices.com> | 2013-05-08 14:00:47 -0700 |
|---|---|---|
| committer | Eric Nelson <eric.nelson@boundarydevices.com> | 2013-09-03 14:12:28 -0700 |
| commit | 0fde024cf0ff0e584829ee0c93c137b6c761f935 (patch) | |
| tree | bf0955b89e00cec6df51de95d91e4d1f92a6aa1d /drivers | |
| parent | 04537bd8b8aa0e22388be9ba381deffa7ab8e024 (diff) | |
mx6_h: add initial board file
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/media/video/mxc/capture/sensor_clock.c | 11 | ||||
| -rw-r--r-- | drivers/video/mxc/mxc_lcdif.c | 9 |
2 files changed, 14 insertions, 6 deletions
diff --git a/drivers/media/video/mxc/capture/sensor_clock.c b/drivers/media/video/mxc/capture/sensor_clock.c index 3e4eb764da0d..99fdfc173ce6 100644 --- a/drivers/media/video/mxc/capture/sensor_clock.c +++ b/drivers/media/video/mxc/capture/sensor_clock.c @@ -49,12 +49,11 @@ void set_mclk_rate(uint32_t *p_mclk_freq, uint32_t csi) } else if (cpu_is_mx6q() || cpu_is_mx6dl()) { if (csi == 0) { if (machine_is_mx6q_sabrelite() - || - machine_is_mx6_nitrogen6x() - || - machine_is_mx6_nit6xlite() - || - machine_is_mx6_oc()) + || machine_is_mx6_nitrogen6x() + || machine_is_mx6_nit6xlite() + || machine_is_mx6_oc() + || machine_is_mx6_h() + ) mclk = "clko2_clk"; else mclk = "clko_clk"; diff --git a/drivers/video/mxc/mxc_lcdif.c b/drivers/video/mxc/mxc_lcdif.c index 0d603ab4bcbc..5390fb055fd4 100644 --- a/drivers/video/mxc/mxc_lcdif.c +++ b/drivers/video/mxc/mxc_lcdif.c @@ -48,6 +48,15 @@ static struct fb_videomode lcdif_modedb[] = { .sync = FB_SYNC_CLK_LAT_FALL, .vmode = FB_VMODE_NONINTERLACED, .flag = 0,}, + { + /* 800x480 @ 57 Hz , pixel clk @ 27MHz */ + "INNOLUX-WVGA", 57, 800, 480, 25000, + .left_margin = 45, .right_margin = 1056 - 1 - 45 - 800, + .upper_margin = 22, .lower_margin = 635 - 1 - 22 - 480, + .hsync_len = 1, .vsync_len = 1, + .sync = FB_SYNC_CLK_LAT_FALL, + .vmode = FB_VMODE_NONINTERLACED, + .flag = 0,}, }; static int lcdif_modedb_sz = ARRAY_SIZE(lcdif_modedb); |