Merge pull request #328 from lrusak/libcec

Odroid_C2/libcec: add amlogic hybrid cec driver support

packages/devel/libcec/package.mk

@@ -43,9 +43,13 @@ else
 fi
 
 if [ "$KODIPLAYER_DRIVER" = "libamcodec" ]; then
-  EXTRA_CMAKE_OPTS="$EXTRA_CMAKE_OPTS -DHAVE_AMLOGIC_API=1"
+  if [ "$PROJECT" = "Odroid_C2" ]; then
+    EXTRA_CMAKE_OPTS="$EXTRA_CMAKE_OPTS -DHAVE_AOCEC_API=1"
+  else
+    EXTRA_CMAKE_OPTS="$EXTRA_CMAKE_OPTS -DHAVE_AMLOGIC_API=1"
+  fi
 else
-  EXTRA_CMAKE_OPTS="$EXTRA_CMAKE_OPTS -DHAVE_AMLOGIC_API=0"
+  EXTRA_CMAKE_OPTS="$EXTRA_CMAKE_OPTS -DHAVE_AOCEC_API=0 -DHAVE_AMLOGIC_API=0"
 fi
 
 configure_target() {

projects/Odroid_C2/linux/linux.aarch64.conf

@@ -767,6 +767,7 @@ CONFIG_MAC80211_LEDS=y
 #
 # Amlogic Device Drivers
 #
+CONFIG_AML_AO_CEC=y
 CONFIG_MESON_TIMER=y
 CONFIG_AM_UART=y
 CONFIG_SERIAL_MESON_CONSOLE=y
@@ -796,7 +797,6 @@ CONFIG_I2C_AML=y
 CONFIG_AML_HDMI_TX=y
 CONFIG_AML_HDMI_TX_20=y
 # CONFIG_AML_HDMI_TX_14 is not set
-CONFIG_AML_HDMI_TX_NEW_CEC_DRIVER=y
 # CONFIG_AML_RTC is not set
 CONFIG_AML_VRTC=y
 CONFIG_AM_IRBLASTER=y