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>

diff --git a/arch/arm/plat-mxc/include/mach/mxc_hdmi.h b/arch/arm/plat-mxc/include/mach/mxc_hdmi.h
index 56729b2295852b179932c2bbf09d4bda8ed19e9a..02a413f2bc424b75e68e4bb3e071330487ba0b01 100644 (file)
--- 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,