diff options
| author | Leann Ogasawara <leann.ogasawara@canonical.com> | 2011-08-18 07:48:31 -0700 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2011-09-23 08:55:48 -0600 |
| commit | 2b072ebede855143a4d0cba0540f8cecb19d4f2e (patch) | |
| tree | 4be342d2cae40a8069060172d200135cea23d1fc /drivers | |
| parent | 3d990df81908a6d3a6d0629e2e97fcdd2900092d (diff) | |
Revert "UBUNTU: SAUCE: OMAP: DSS2: check for both cpu type and revision, rather than just revision"
This reverts commit f9c5baa2a6f1cbaa587840a5acbccf1e750ee333.
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/video/omap2/dss/dispc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/omap2/dss/dispc.c b/drivers/video/omap2/dss/dispc.c index 8793826e688..7a9a2e7d968 100644 --- a/drivers/video/omap2/dss/dispc.c +++ b/drivers/video/omap2/dss/dispc.c @@ -2342,7 +2342,7 @@ void dispc_set_parallel_interface_mode(enum omap_channel channel, static bool _dispc_lcd_timings_ok(int hsw, int hfp, int hbp, int vsw, int vfp, int vbp) { - if (cpu_is_omap24xx() || (cpu_is_omap34xx() && omap_rev_lt_3_0())) { + if (cpu_is_omap24xx() || omap_rev() < OMAP3430_REV_ES3_0) { if (hsw < 1 || hsw > 64 || hfp < 1 || hfp > 256 || hbp < 1 || hbp > 256 || @@ -2375,7 +2375,7 @@ static void _dispc_set_lcd_timings(enum omap_channel channel, int hsw, { u32 timing_h, timing_v; - if (cpu_is_omap24xx() || (cpu_is_omap34xx() && omap_rev_lt_3_0())) { + if (cpu_is_omap24xx() || omap_rev() < OMAP3430_REV_ES3_0) { timing_h = FLD_VAL(hsw-1, 5, 0) | FLD_VAL(hfp-1, 15, 8) | FLD_VAL(hbp-1, 27, 20); |