Skip to content

Changes on Amlogic CEC and new amlogic cec driver #178

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hardkernel merged 4 commits into from
Mar 28, 2016
Merged

Changes on Amlogic CEC and new amlogic cec driver #178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ca64b65
Changing CEC from PLAYBACK_DEVICE to RECORDING_DEVICE to make more keys
Mar 25, 2016
96e8846
CEC: Adding support for samsung vendor keys
Mar 25, 2016
a36c8bd
CEC: Adding some extra keys into the keymap
Mar 25, 2016
7061b2a
Adding new cec driver based on work from Gerald Dachs
Mar 25, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions arch/arm/mach-meson8b/hdmi_tx_hw/hdmi_tx_cec_hw.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,7 @@ int cec_ll_tx(const unsigned char *msg, unsigned char len)
return ret;
}

#ifndef CONFIG_AML_HDMI_TX_NEW_CEC_DRIVER
void cec_polling_online_dev(int log_addr, int *bool)
{
unsigned long r;
Expand All @@ -285,6 +286,7 @@ void cec_polling_online_dev(int log_addr, int *bool)
hdmi_print(INF, CEC "CEC: poll online logic device: 0x%x BOOL: %d\n", log_addr, *bool);

}
#endif


//--------------------------------------------------------------------------
Expand Down
6 changes: 6 additions & 0 deletions drivers/amlogic/hdmi/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,12 @@ config AML_HDMI_TX_CTS_DVI
help
HDMI DVI output enable. By default, Tx will output HDMI mode signal, not DVI.
If you want to pass HDMI official CTS or compliance DVI device, enable it.

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
View file
Open in desktop
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
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

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