shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-11 13:27:06 +09:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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>

Conflicts:
	drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hdmi_tx_main.c
This commit is contained in:
Zongdong Jiao
2019-02-22 09:53:13 +08:00
committed by Dongjin Kim
parent c51d9a2be3
commit 625f488cb0
5 changed files with 47 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/linux/amlogic/media/vout/hdmi_tx/hdmi_common.h
View File

@@ -31,8 +31,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)

4
include/linux/amlogic/media/vout/hdmi_tx/hdmi_tx_module.h
View File

@@ -94,9 +94,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;