Skip to content

Commit

Permalink
new amlogic cec driver
Browse files Browse the repository at this point in the history
redesigned initialization
    - code of delayed init now part of open call
    - interrupt handling moved into open/release
    - removed some debug lines
    - repaired logical address detection

fixed that not all entries from read queue was read
  • Loading branch information
gdachs committed Apr 25, 2016
1 parent 0f60813 commit bed6850
Show file tree
Hide file tree
Showing 7 changed files with 733 additions and 3 deletions.
3 changes: 2 additions & 1 deletion arch/arm/mach-mesong9bb/hdmi_tx_hw_20/hdmi_tx_cec_hw.c
Original file line number Diff line number Diff line change
Expand Up @@ -996,6 +996,7 @@ void cec_tx_irq_handle(void)
#endif
}

#ifndef CONFIG_AML_HDMI_TX_NEW_CEC_DRIVER
void cec_polling_online_dev(int log_addr, int *bool)
{
#ifdef AO_CEC
Expand All @@ -1005,7 +1006,7 @@ void cec_polling_online_dev(int log_addr, int *bool)
#endif
hdmi_print(INF, CEC "CEC: poll online logic device: 0x%x BOOL: %d\n", log_addr, *bool);
}

#endif

// DELETE LATER, TEST ONLY
void cec_test_(unsigned int cmd)
Expand Down
8 changes: 8 additions & 0 deletions drivers/amlogic/hdmi/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,12 @@ config AML_HDMI_TX_HDCP
hdmitx hdcp enable, it should be enalbe if board burned hdmitx hdcp keys
endif

if AML_HDMI_TX
config AML_HDMI_TX_NEW_CEC_DRIVER
bool "HDMI new CEC driver"
default n
help
hdmitx uses new CEC driver
endif

endmenu
8 changes: 7 additions & 1 deletion drivers/amlogic/hdmi/hdmi_tx/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
obj-$(CONFIG_AML_HDMI_TX) += hdmitx.o

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

ifdef CONFIG_AML_HDMI_TX_NEW_CEC_DRIVER
hdmitx-objs += amlogic_cec.o
else
hdmitx-objs += hdmi_tx_cec.o hdmi_cec_key.o
endif

#EXTRA_CFLAGS += -O2
Loading

0 comments on commit bed6850

Please sign in to comment.