From 48d5fa309fc3a106e531528867406d6a3adb3059 Mon Sep 17 00:00:00 2001 From: Per Persson Date: Fri, 2 Jul 2010 13:14:25 +0200 Subject: HDMI and AV8100: new features * HDMI api, including EDID, CEC, INFOFRAME, audio coniguration, aes key handling, event support. * Automatic detection and handling of av8100 chip version 1 and 2. * Support for av8100/mcde hw trig method using I2SDAT3 (menuconfig). ST Ericsson Change-Id: WP264235 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/2120 Reviewed-by: Dan JOHANSSON Tested-by: Per PERSSON Reviewed-by: Marcel TUNNISSEN Signed-off-by: Mian Yousaf Kaukab Change-Id: Ic205e046988fff7a5d49ae3091559d1fd76768d2 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/2841 --- drivers/video/av8100/Kconfig | 18 + drivers/video/av8100/Makefile | 3 + drivers/video/av8100/av8100.c | 1105 ++++++++++++++------- drivers/video/av8100/av8100_fw.h | 17 +- drivers/video/av8100/av8100_regs.h | 12 + drivers/video/av8100/av8100v2_fw.h | 1166 ++++++++++++++++++++++ drivers/video/av8100/hdmi.c | 1819 ++++++++++++++++++++++++++++++++++- drivers/video/av8100/hdmi_loc.h | 57 ++ drivers/video/mcde/display-av8100.c | 244 ++--- drivers/video/mcde/mcde_hw.c | 25 +- 10 files changed, 3896 insertions(+), 570 deletions(-) create mode 100644 drivers/video/av8100/av8100v2_fw.h mode change 100644 => 100755 drivers/video/av8100/hdmi.c create mode 100755 drivers/video/av8100/hdmi_loc.h (limited to 'drivers/video') diff --git a/drivers/video/av8100/Kconfig b/drivers/video/av8100/Kconfig index 12e44e2c430..6fe0f88d9b8 100644 --- a/drivers/video/av8100/Kconfig +++ b/drivers/video/av8100/Kconfig @@ -3,3 +3,21 @@ config AV8100 default n help Please enable this feature if hdmi/tvout driver support is required. + +config AV8100_HWTRIG_I2SDAT3 + bool "AV8100 HW trig on I2SDAT3" + default n + depends on AV8100 + ---help--- + If you say Y here AV8100 will use HW triggering + from AV8100 I2SDAT3 to MCDE sync1. + If you say N here AV8100 will use HW triggering + method from AV8100 INT to MCDE sync0. + +config HDMI_AV8100_DEBUG + bool "HDMI and AV8100 debug messages" + default n + depends on AV8100 + ---help--- + Say Y here if you want the HDMI and AV8100 driver to output debug messages + diff --git a/drivers/video/av8100/Makefile b/drivers/video/av8100/Makefile index d857753b4bc..2d3028b18ca 100644 --- a/drivers/video/av8100/Makefile +++ b/drivers/video/av8100/Makefile @@ -2,6 +2,9 @@ obj-$(CONFIG_AV8100) += av8100.o hdmi.o +ifdef CONFIG_HDMI_AV8100_DEBUG +EXTRA_CFLAGS += -DDEBUG +endif clean-files := av8100.o hdmi.o built-in.o modules.order diff --git a/drivers/video/av8100/av8100.c b/drivers/video/av8100/av8100.c index dd0fcaade23..e4df11441a1 100644 --- a/drivers/video/av8100/av8100.c +++ b/drivers/video/av8100/av8100.c @@ -29,17 +29,18 @@ #include