diff options
| author | Andy Green <andy.green@linaro.org> | 2011-06-26 11:24:32 +0100 |
|---|---|---|
| committer | Andy Green <andy.green@linaro.org> | 2011-06-26 11:24:32 +0100 |
| commit | 49fd4ff01b3e3601f3136407290022ae8a62abc5 (patch) | |
| tree | a89163774d705ad35b13cb4705bc93ebb0d9d2a6 | |
| parent | 83a0790d670cfa9912ae3149dc9d17d57c1bb717 (diff) | |
fix lfb edid uplevel set supported resolution extent in plat
Zach's uplevel of the non-DRM EDID parser redefines the extent of the
resolution table down from 37 set in plat/edid.h to 34, which looks
accurate.
However it blows a redefined manifest constant warning, just set it in plat
instead
Signed-off-by: Andy Green <andy.green@linaro.org>
| -rw-r--r-- | arch/arm/plat-omap/include/plat/edid.h | 2 | ||||
| -rw-r--r-- | drivers/video/omap2/dss/hdmi.h | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/plat-omap/include/plat/edid.h b/arch/arm/plat-omap/include/plat/edid.h index 4e76563517e..ab13f2fb5c1 100644 --- a/arch/arm/plat-omap/include/plat/edid.h +++ b/arch/arm/plat-omap/include/plat/edid.h @@ -122,7 +122,7 @@ #define HDMI_EDID_EX_VIDEO_1920x1080p_25Hz_16_9 33 #define HDMI_EDID_EX_VIDEO_1920x1080p_30Hz_16_9 34 -#define OMAP_HDMI_TIMINGS_NB 37 +#define OMAP_HDMI_TIMINGS_NB 34 #define OMAP_HDMI_TIMINGS_VESA_START 15 #ifdef __cplusplus diff --git a/drivers/video/omap2/dss/hdmi.h b/drivers/video/omap2/dss/hdmi.h index 913aef1b131..3864ed8554f 100644 --- a/drivers/video/omap2/dss/hdmi.h +++ b/drivers/video/omap2/dss/hdmi.h @@ -205,8 +205,6 @@ struct hdmi_reg { u16 idx; }; #define EDID_SIZE_BLOCK0_TIMING_DESCRIPTOR 4 #define EDID_SIZE_BLOCK1_TIMING_DESCRIPTOR 4 -#define OMAP_HDMI_TIMINGS_NB 34 - #define REG_FLD_MOD(idx, val, start, end) \ hdmi_write_reg(idx, FLD_MOD(hdmi_read_reg(idx), val, start, end)) #define REG_GET(idx, start, end) \ |