hdmitx: rename HDMI_IEEE_OUI to avoid conflicts [1/1]

PD#SWPL-4705

Problem:
In 61207 patch, the define HDMI_IEEE_OUI is conflicted with the kernel
head file include/linux/hdmi.h

Solution:
rename HDMI_IEEE_OUI

Verify:
GXL/P212

Change-Id: I75a12734e85478f22edf0b48636ed86e60302b58
Signed-off-by: Zongdong Jiao <zongdong.jiao@amlogic.com>

diff --git a/drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hdmi_tx_edid.c b/drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hdmi_tx_edid.c
index 8115b67..18eb81e 100644 (file)
--- a/drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hdmi_tx_edid.c
+++ b/drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hdmi_tx_edid.c
@@ -397,9 +397,9 @@ int Edid_Parse_check_HDMI_VSDB(struct hdmitx_dev *hdev,
        if (temp_addr >= VSpecificBoundary)
                ret = -1;
        else {
-               if ((buff[BlockAddr + 1] != GET_OUI_BYTE0(HDMI_IEEE_OUI)) ||
-                       (buff[BlockAddr + 2] != GET_OUI_BYTE1(HDMI_IEEE_OUI)) ||
-                       (buff[BlockAddr + 3] != GET_OUI_BYTE2(HDMI_IEEE_OUI)))
+               if ((buff[BlockAddr + 1] != GET_OUI_BYTE0(HDMI_IEEEOUI)) ||
+                       (buff[BlockAddr + 2] != GET_OUI_BYTE1(HDMI_IEEEOUI)) ||
+                       (buff[BlockAddr + 3] != GET_OUI_BYTE2(HDMI_IEEEOUI)))
                        ret = -1;
        }
        return ret;
@@ -1579,7 +1579,7 @@ static int hdmitx_edid_block_parse(struct hdmitx_dev *hdmitx_device,
                        if ((BlockBuf[offset] == 0x03) &&
                                (BlockBuf[offset+1] == 0x0c) &&
                                (BlockBuf[offset+2] == 0x00)) {
-                               pRXCap->IEEEOUI = HDMI_IEEE_OUI;
+                               pRXCap->ieeeoui = HDMI_IEEEOUI;
                                pRXCap->ColorDeepSupport =
                                        (count > 5) ? BlockBuf[offset+5] : 0;
                                set_vsdb_dc_cap(pRXCap);
@@ -1626,7 +1626,7 @@ static int hdmitx_edid_block_parse(struct hdmitx_dev *hdmitx_device,
                        } else if ((BlockBuf[offset] == 0xd8) &&
                                (BlockBuf[offset+1] == 0x5d) &&
                                (BlockBuf[offset+2] == 0xc4)) {
-                               pRXCap->HF_IEEEOUI = HF_IEEE_OUI;
+                               pRXCap->hf_ieeeoui = HF_IEEEOUI;
                                pRXCap->Max_TMDS_Clock2 = BlockBuf[offset+4];
                                pRXCap->scdc_present =
                                        !!(BlockBuf[offset+5] & (1 << 7));
@@ -2260,18 +2260,18 @@ int hdmitx_edid_parse(struct hdmitx_dev *hdmitx_device)
                pr_info(EDID "edid blk0 checksum:%d ext_flag:%d\n",
                        CheckSum, EDID_buf[0x7e]);
                if ((CheckSum & 0xff) == 0)
-                       hdmitx_device->RXCap.IEEEOUI = 0;
+                       hdmitx_device->RXCap.ieeeoui = 0;
                else
-                       hdmitx_device->RXCap.IEEEOUI = HDMI_IEEE_OUI;
+                       hdmitx_device->RXCap.ieeeoui = HDMI_IEEEOUI;
                if (zero_numbers > 120)
-                       hdmitx_device->RXCap.IEEEOUI = HDMI_IEEE_OUI;
+                       hdmitx_device->RXCap.ieeeoui = HDMI_IEEEOUI;
 
                return 0; /* do nothing. */
        }
 
        /* Note: some DVI monitor have more than 1 block */
        if ((BlockCount == 1) && (EDID_buf[0x81] == 1)) {
-               hdmitx_device->RXCap.IEEEOUI = 0;
+               hdmitx_device->RXCap.ieeeoui = 0;
                hdmitx_device->RXCap.VIC_count = 0x3;
                hdmitx_device->RXCap.VIC[0] = HDMI_720x480p60_16x9;
                hdmitx_device->RXCap.VIC[1] = HDMI_1280x720p60_16x9;
@@ -2368,14 +2368,14 @@ int hdmitx_edid_parse(struct hdmitx_dev *hdmitx_device)
        }
 
        if (hdmitx_edid_search_IEEEOUI(&EDID_buf[128])) {
-               pRXCap->IEEEOUI = HDMI_IEEE_OUI;
+               pRXCap->ieeeoui = HDMI_IEEEOUI;
                pr_info(EDID "find IEEEOUT\n");
        } else {
-               pRXCap->IEEEOUI = 0x0;
+               pRXCap->ieeeoui = 0x0;
                pr_info(EDID "not find IEEEOUT\n");
        }
 
-       if ((pRXCap->IEEEOUI != HDMI_IEEE_OUI) || (pRXCap->IEEEOUI == 0x0) ||
+       if ((pRXCap->ieeeoui != HDMI_IEEEOUI) || (pRXCap->ieeeoui == 0x0) ||
                (pRXCap->VIC_count == 0))
                hdmitx_edid_set_default_vic(hdmitx_device);
 
@@ -2383,15 +2383,15 @@ int hdmitx_edid_parse(struct hdmitx_dev *hdmitx_device)
        /* valid EDID & no audio tag & no IEEEOUI */
        if (edid_check_valid(&EDID_buf[0]) &&
                !hdmitx_edid_search_IEEEOUI(&EDID_buf[128])) {
-               pRXCap->IEEEOUI = 0x0;
+               pRXCap->ieeeoui = 0x0;
                pr_info(EDID "sink is DVI device\n");
        } else
-               pRXCap->IEEEOUI = HDMI_IEEE_OUI;
+               pRXCap->ieeeoui = HDMI_IEEEOUI;
 
        if (edid_zero_data(EDID_buf))
-               pRXCap->IEEEOUI = HDMI_IEEE_OUI;
+               pRXCap->ieeeoui = HDMI_IEEEOUI;
 
-       if ((!pRXCap->AUD_count) && (!pRXCap->IEEEOUI))
+       if ((!pRXCap->AUD_count) && (!pRXCap->ieeeoui))
                hdmitx_edid_set_default_aud(hdmitx_device);
 
        edid_save_checkvalue(EDID_buf, BlockCount+1);
@@ -2401,7 +2401,7 @@ int hdmitx_edid_parse(struct hdmitx_dev *hdmitx_device)
        hdmitx_device->tmp_buf[i] = 0;
 
        if (!hdmitx_edid_check_valid_blocks(&EDID_buf[0])) {
-               pRXCap->IEEEOUI = HDMI_IEEE_OUI;
+               pRXCap->ieeeoui = HDMI_IEEEOUI;
                pr_info(EDID "Invalid edid, consider RX as HDMI device\n");
        }
        /* update RX HDR information */
@@ -2587,7 +2587,7 @@ bool hdmitx_edid_check_valid_mode(struct hdmitx_dev *hdev,
        pRXCap = &(hdev->RXCap);
 
        /* DVI case, only 8bit */
-       if (pRXCap->IEEEOUI != HDMI_IEEE_OUI) {
+       if (pRXCap->ieeeoui != HDMI_IEEEOUI) {
                if (para->cd != COLORDEPTH_24B)
                        return 0;
        }
@@ -2748,7 +2748,7 @@ void hdmitx_edid_clear(struct hdmitx_dev *hdmitx_device)
        /* Note: in most cases, we think that rx is tv and the default
         * IEEEOUI is HDMI Identifier
         */
-       pRXCap->IEEEOUI = HDMI_IEEE_OUI;
+       pRXCap->ieeeoui = HDMI_IEEEOUI;
 
        hdmitx_device->vic_count = 0;
        hdmitx_device->hdmi_info.vsdb_phy_addr.a = 0;
@@ -2928,14 +2928,14 @@ int hdmitx_edid_dump(struct hdmitx_dev *hdmitx_device, char *buffer,
                "Speaker Allocation: %x\n", pRXCap->RxSpeakerAllocation);
        pos += snprintf(buffer+pos, buffer_len-pos,
                "Vendor: 0x%x ( %s device)\n",
-               pRXCap->IEEEOUI, (pRXCap->IEEEOUI)?"HDMI":"DVI");
+               pRXCap->ieeeoui, (pRXCap->ieeeoui)?"HDMI":"DVI");
 
        pos += snprintf(buffer+pos, buffer_len-pos,
                "MaxTMDSClock1 %d MHz\n", pRXCap->Max_TMDS_Clock1 * 5);
 
-       if (pRXCap->HF_IEEEOUI) {
+       if (pRXCap->hf_ieeeoui) {
                pos += snprintf(buffer+pos, buffer_len-pos, "Vendor2: 0x%x\n",
-                       pRXCap->HF_IEEEOUI);
+                       pRXCap->hf_ieeeoui);
                pos += snprintf(buffer+pos, buffer_len-pos,
                        "MaxTMDSClock2 %d MHz\n", pRXCap->Max_TMDS_Clock2 * 5);
        }

diff --git a/drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hdmi_tx_main.c b/drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hdmi_tx_main.c
index 18a9b35..3642942 100644 (file)
--- a/drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hdmi_tx_main.c
+++ b/drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hdmi_tx_main.c
@@ -526,14 +526,14 @@ static int set_disp_mode_auto(void)
        if ((vic_ready != HDMI_Unknown) && (vic_ready == vic)) {
                pr_info(SYS "[%s] ALREADY init VIC = %d\n",
                        __func__, vic);
-               if (hdev->RXCap.IEEEOUI == 0) {
+               if (hdev->RXCap.ieeeoui == 0) {
                        /* DVI case judgement. In uboot, directly output HDMI
                         * mode
                         */
                        hdev->HWOp.CntlConfig(hdev, CONF_HDMI_DVI_MODE,
                                DVI_MODE);
                        pr_info(SYS "change to DVI mode\n");
-               } else if ((hdev->RXCap.IEEEOUI == 0xc03) &&
+               } else if ((hdev->RXCap.ieeeoui == 0xc03) &&
                (hdev->HWOp.CntlConfig(hdev, CONF_GET_HDMI_DVI_MODE, 0)
                        == DVI_MODE)) {
                        hdev->HWOp.CntlConfig(hdev, CONF_HDMI_DVI_MODE,
@@ -3893,7 +3893,7 @@ static void hdmitx_hpd_plugin_handler(struct work_struct *work)
                rx_repeat_hpd_state(1);
        hdmitx_get_edid(hdev);
        hdmi_physcial_size_update(hdev);
-       if (hdev->RXCap.IEEEOUI != HDMI_IEEE_OUI)
+       if (hdev->RXCap.ieeeoui != HDMI_IEEEOUI)
                hdev->HWOp.CntlConfig(hdev,
                        CONF_HDMI_DVI_MODE, DVI_MODE);
        else

diff --git a/drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hdmi_tx_video.c b/drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hdmi_tx_video.c
index 181ea70..b86b6e2 100644 (file)
--- a/drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hdmi_tx_video.c
+++ b/drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hdmi_tx_video.c
@@ -871,12 +871,12 @@ static void hdmi_tx_construct_avi_packet(
  *************************************/
 
 /*
- * HDMI Identifier = HDMI_IEEE_OUI 0x000c03
+ * HDMI Identifier = HDMI_IEEEOUI 0x000c03
  * If not, treated as a DVI Device
  */
 static int is_dvi_device(struct rx_cap *pRXCap)
 {
-       if (pRXCap->IEEEOUI != HDMI_IEEE_OUI)
+       if (pRXCap->ieeeoui != HDMI_IEEEOUI)
                return 1;
        else
                return 0;
@@ -1024,9 +1024,9 @@ static void hdmi_set_vend_spec_infofram(struct hdmitx_dev *hdev,
 
        for (i = 0; i < 0x6; i++)
                VEN_DB[i] = 0;
-       VEN_DB[0] = GET_OUI_BYTE0(HDMI_IEEE_OUI);
-       VEN_DB[1] = GET_OUI_BYTE1(HDMI_IEEE_OUI);
-       VEN_DB[2] = GET_OUI_BYTE2(HDMI_IEEE_OUI);
+       VEN_DB[0] = GET_OUI_BYTE0(HDMI_IEEEOUI);
+       VEN_DB[1] = GET_OUI_BYTE1(HDMI_IEEEOUI);
+       VEN_DB[2] = GET_OUI_BYTE2(HDMI_IEEEOUI);
        VEN_DB[3] = 0x00;    /* 4k x 2k  Spec P156 */
 
        if (VideoCode == HDMI_4k2k_30) {
@@ -1060,9 +1060,9 @@ int hdmi_set_3d(struct hdmitx_dev *hdev, int type, unsigned int param)
        else {
                for (i = 0; i < 0x6; i++)
                        VEN_DB[i] = 0;
-               VEN_DB[0] = GET_OUI_BYTE0(HDMI_IEEE_OUI);
-               VEN_DB[1] = GET_OUI_BYTE1(HDMI_IEEE_OUI);
-               VEN_DB[2] = GET_OUI_BYTE2(HDMI_IEEE_OUI);
+               VEN_DB[0] = GET_OUI_BYTE0(HDMI_IEEEOUI);
+               VEN_DB[1] = GET_OUI_BYTE1(HDMI_IEEEOUI);
+               VEN_DB[2] = GET_OUI_BYTE2(HDMI_IEEEOUI);
                VEN_DB[3] = 0x40;
                VEN_DB[4] = type<<4;
                VEN_DB[5] = param<<4;
@@ -1139,7 +1139,7 @@ int hdmitx_construct_vsif(struct hdmitx_dev *hdev, enum vsif_type type,
        case VT_DEFAULT:
                break;
        case VT_HDMI14_4K:
-               ieeeoui = HDMI_IEEE_OUI;
+               ieeeoui = HDMI_IEEEOUI;
                len = 5;
                if (is_hdmi14_4k(hdev->cur_VIC)) {
                        fill_hdmi4k_vsif_data(hdev->cur_VIC, DB, HB);
@@ -1147,7 +1147,7 @@ int hdmitx_construct_vsif(struct hdmitx_dev *hdev, enum vsif_type type,
                }
                break;
        case VT_ALLM:
-               ieeeoui = HF_IEEE_OUI;
+               ieeeoui = HF_IEEEOUI;
                len = 5;
                DB[3] = 0x1; /* Fixed value */
                if (on) {

diff --git a/include/linux/amlogic/media/vout/hdmi_tx/hdmi_common.h b/include/linux/amlogic/media/vout/hdmi_tx/hdmi_common.h
index ba21dff..c9f29fa 100644 (file)
--- a/include/linux/amlogic/media/vout/hdmi_tx/hdmi_common.h
+++ b/include/linux/amlogic/media/vout/hdmi_tx/hdmi_common.h
@@ -33,8 +33,8 @@
 #define HDMITX_VIC_MASK                        0xff
 
 /* Refer to http://standards-oui.ieee.org/oui/oui.txt */
-#define HDMI_IEEE_OUI  0x000C03
-#define HF_IEEE_OUI            0xC45DD8
+#define HDMI_IEEEOUI   0x000C03
+#define HF_IEEEOUI             0xC45DD8
 #define GET_OUI_BYTE0(oui)     (oui & 0xff) /* Little Endian */
 #define GET_OUI_BYTE1(oui)     ((oui >> 8) & 0xff)
 #define GET_OUI_BYTE2(oui)     ((oui >> 16) & 0xff)

diff --git a/include/linux/amlogic/media/vout/hdmi_tx/hdmi_tx_module.h b/include/linux/amlogic/media/vout/hdmi_tx/hdmi_tx_module.h
index 3f58f55..7e46a27 100644 (file)
--- a/include/linux/amlogic/media/vout/hdmi_tx/hdmi_tx_module.h
+++ b/include/linux/amlogic/media/vout/hdmi_tx/hdmi_tx_module.h
@@ -95,9 +95,9 @@ struct rx_cap {
        unsigned char AUD_count;
        unsigned char RxSpeakerAllocation;
        /*vendor*/
-       unsigned int IEEEOUI;
+       unsigned int ieeeoui;
        unsigned char Max_TMDS_Clock1; /* HDMI1.4b TMDS_CLK */
-       unsigned int HF_IEEEOUI;        /* For HDMI Forum */
+       unsigned int hf_ieeeoui;        /* For HDMI Forum */
        unsigned int Max_TMDS_Clock2; /* HDMI2.0 TMDS_CLK */
        /* CEA861-F, Table 56, Colorimetry Data Block */
        unsigned int colorimetry_data;