diff options
| author | Sandor Yu <R01008@freescale.com> | 2011-12-26 23:20:31 +0800 |
|---|---|---|
| committer | Jason Liu <r64343@freescale.com> | 2012-01-09 21:13:03 +0800 |
| commit | 1edcefbae6ea1f12174c4a73ef92066c5127a8f2 (patch) | |
| tree | 0265db69249096a022213a058c0b0a1d0b4fe5ea /arch | |
| parent | 57f3541a35c4ccd7b5ce13fc58583a59d9f3bea4 (diff) | |
ENGR00170938-1 mxc hdmi: Enable HDMI output color space convert
Fix HDMI AVI info frame config register bit define error.
Signed-off-by: Sandor Yu <R01008@freescale.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/plat-mxc/include/mach/mxc_hdmi.h | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/arch/arm/plat-mxc/include/mach/mxc_hdmi.h b/arch/arm/plat-mxc/include/mach/mxc_hdmi.h index 56729b229585..02a413f2bc42 100644 --- a/arch/arm/plat-mxc/include/mach/mxc_hdmi.h +++ b/arch/arm/plat-mxc/include/mach/mxc_hdmi.h @@ -787,26 +787,26 @@ enum { HDMI_FC_PRCONF_OUTPUT_PR_FACTOR_MASK = 0x0F, HDMI_FC_PRCONF_OUTPUT_PR_FACTOR_OFFSET = 0, -/* FC_AVICONF0-FC_AVICONF2 field values */ - HDMI_FC_AVICONF0_PIX_FMT_MASK = 0x60, +/* FC_AVICONF0-FC_AVICONF3 field values */ + HDMI_FC_AVICONF0_PIX_FMT_MASK = 0x03, HDMI_FC_AVICONF0_PIX_FMT_RGB = 0x00, - HDMI_FC_AVICONF0_PIX_FMT_YCBCR422 = 0x20, - HDMI_FC_AVICONF0_PIX_FMT_YCBCR444 = 0x40, - HDMI_FC_AVICONF0_ACTIVE_FMT_MASK = 0x10, - HDMI_FC_AVICONF0_ACTIVE_FMT_INFO_PRESENT = 0x10, + HDMI_FC_AVICONF0_PIX_FMT_YCBCR422 = 0x01, + HDMI_FC_AVICONF0_PIX_FMT_YCBCR444 = 0x02, + HDMI_FC_AVICONF0_ACTIVE_FMT_MASK = 0x40, + HDMI_FC_AVICONF0_ACTIVE_FMT_INFO_PRESENT = 0x40, HDMI_FC_AVICONF0_ACTIVE_FMT_NO_INFO = 0x00, HDMI_FC_AVICONF0_BAR_DATA_MASK = 0x0C, HDMI_FC_AVICONF0_BAR_DATA_NO_DATA = 0x00, - HDMI_FC_AVICONF0_BAR_DATA_VERT_BAR = 0x40, - HDMI_FC_AVICONF0_BAR_DATA_HORIZ_BAR = 0x80, - HDMI_FC_AVICONF0_BAR_DATA_VERT_HORIZ_BAR = 0xC0, - HDMI_FC_AVICONF0_SCAN_INFO_MASK = 0x03, - HDMI_FC_AVICONF0_SCAN_INFO_OVERSCAN = 0x01, - HDMI_FC_AVICONF0_SCAN_INFO_UNDERSCAN = 0x02, + HDMI_FC_AVICONF0_BAR_DATA_VERT_BAR = 0x04, + HDMI_FC_AVICONF0_BAR_DATA_HORIZ_BAR = 0x08, + HDMI_FC_AVICONF0_BAR_DATA_VERT_HORIZ_BAR = 0x0C, + HDMI_FC_AVICONF0_SCAN_INFO_MASK = 0x30, + HDMI_FC_AVICONF0_SCAN_INFO_OVERSCAN = 0x10, + HDMI_FC_AVICONF0_SCAN_INFO_UNDERSCAN = 0x20, HDMI_FC_AVICONF0_SCAN_INFO_NODATA = 0x00, HDMI_FC_AVICONF1_ACTIVE_ASPECT_RATIO_MASK = 0x0F, - HDMI_FC_AVICONF1_ACTIVE_ASPECT_RATIO_USE_CODED = 0x09, + HDMI_FC_AVICONF1_ACTIVE_ASPECT_RATIO_USE_CODED = 0x08, HDMI_FC_AVICONF1_ACTIVE_ASPECT_RATIO_4_3 = 0x09, HDMI_FC_AVICONF1_ACTIVE_ASPECT_RATIO_16_9 = 0x0A, HDMI_FC_AVICONF1_ACTIVE_ASPECT_RATIO_14_9 = 0x0B, @@ -840,10 +840,10 @@ enum { HDMI_FC_AVICONF2_IT_CONTENT_VALID = 0x80, HDMI_FC_AVICONF3_IT_CONTENT_TYPE_MASK = 0x03, - HDMI_FC_AVICONF2_IT_CONTENT_TYPE_GRAPHICS = 0x00, - HDMI_FC_AVICONF2_IT_CONTENT_TYPE_PHOTO = 0x01, - HDMI_FC_AVICONF2_IT_CONTENT_TYPE_CINEMA = 0x02, - HDMI_FC_AVICONF2_IT_CONTENT_TYPE_GAME = 0x03, + HDMI_FC_AVICONF3_IT_CONTENT_TYPE_GRAPHICS = 0x00, + HDMI_FC_AVICONF3_IT_CONTENT_TYPE_PHOTO = 0x01, + HDMI_FC_AVICONF3_IT_CONTENT_TYPE_CINEMA = 0x02, + HDMI_FC_AVICONF3_IT_CONTENT_TYPE_GAME = 0x03, HDMI_FC_AVICONF3_QUANT_RANGE_MASK = 0x0C, HDMI_FC_AVICONF3_QUANT_RANGE_LIMITED = 0x00, HDMI_FC_AVICONF3_QUANT_RANGE_FULL = 0x04, |