Skip to content

Commit 3bde219

Browse files
committed
New amlogic cec driver
1 parent 716f179 commit 3bde219

File tree

7 files changed

+569
-3
lines changed

7 files changed

+569
-3
lines changed

arch/arm/mach-mesong9bb/hdmi_tx_hw_20/hdmi_tx_cec_hw.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -996,6 +996,7 @@ void cec_tx_irq_handle(void)
996996
#endif
997997
}
998998

999+
#ifndef CONFIG_AML_HDMI_TX_NEW_CEC_DRIVER
9991000
void cec_polling_online_dev(int log_addr, int *bool)
10001001
{
10011002
#ifdef AO_CEC
@@ -1005,7 +1006,7 @@ void cec_polling_online_dev(int log_addr, int *bool)
10051006
#endif
10061007
hdmi_print(INF, CEC "CEC: poll online logic device: 0x%x BOOL: %d\n", log_addr, *bool);
10071008
}
1008-
1009+
#endif
10091010

10101011
// DELETE LATER, TEST ONLY
10111012
void cec_test_(unsigned int cmd)

drivers/amlogic/hdmi/Kconfig

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,12 @@ config AML_HDMI_TX_HDCP
2424
hdmitx hdcp enable, it should be enalbe if board burned hdmitx hdcp keys
2525
endif
2626

27+
if AML_HDMI_TX
28+
config AML_HDMI_TX_NEW_CEC_DRIVER
29+
bool "HDMI new CEC driver"
30+
default n
31+
help
32+
hdmitx uses new CEC driver
33+
endif
34+
2735
endmenu

drivers/amlogic/hdmi/hdmi_tx/Makefile

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
obj-$(CONFIG_AML_HDMI_TX) += hdmitx.o
22

3-
hdmitx-objs := hdmi_tx.o hdmi_tx_cec.o hdmi_cec_key.o hdmi_tx_video.o hdmi_tx_audio.o hdmi_tx_edid.o hdmi_tx_audio.o hdmi_tx_hdcp.o hdmi_tx_compliance.o
3+
hdmitx-objs := hdmi_tx.o hdmi_tx_video.o hdmi_tx_audio.o hdmi_tx_edid.o hdmi_tx_audio.o hdmi_tx_hdcp.o hdmi_tx_compliance.o
4+
5+
ifdef CONFIG_AML_HDMI_TX_NEW_CEC_DRIVER
6+
hdmitx-objs += amlogic_cec.o
7+
else
8+
hdmitx-objs += hdmi_tx_cec.o hdmi_cec_key.o
9+
endif
410

511
#EXTRA_CFLAGS += -O2

0 commit comments

Comments
 (0)