Odroid 3.8 cec

README

@@ -1,3 +1,26 @@
+Summary:
+	Get CEC (tv-remote control over HDMI) working on linux.
+	There are android-kernel sources, which have not made it 
+	to the main linux kernel-tree, so also the hardkernel 
+	linux-tree doesn't have CEC for exynos platforms.
+
+Status:
+	Copied s5p-cec code from all over the internet, mostly from
+		http://dn.odroid.com/Android_Alpha_4.0.3/BSP/
+	Made it compile as module (s5p-cec.ko)
+	Fixed the insmod()/rmmod() stuff. Error handling and resource 
+		free-ing were quite broken.
+
+	Using a modified cec-client, it's possible to observe the
+	tv changing it's inputs, see:
+		https://github.com/vamanea/libcec.git
+
+TODO: 
+	Cleanup this tree, so it becomes a nice diff upon hardkernel's 3.8 tree
+
+
+================================================================================
+
         Linux kernel release 3.x <http://kernel.org/>
 
 These are the release notes for Linux version 3.  Read them carefully,

arch/arm/mach-exynos/clock-exynos4.c

@@ -716,6 +716,10 @@ static struct clk exynos4_init_clocks_off[] = {
 		.parent		= &exynos4_clk_aclk_100.clk,
 		.enable		= exynos4_clk_ip_perir_ctrl,
 		.ctrlbit	= (1 << 14),
+	}, {
+		.name		= "hdmicec",
+		.enable		= exynos4_clk_ip_perir_ctrl,
+		.ctrlbit	= (1 << 11),
 	}, {
 		.name		= "usbhost",
 		.enable		= exynos4_clk_ip_fsys_ctrl ,

arch/arm/mach-exynos/include/mach/irqs.h

@@ -132,6 +132,7 @@
 #define EXYNOS4_IRQ_GPS			IRQ_SPI(111)
 #define EXYNOS4_IRQ_INTFEEDCTRL_SSS	IRQ_SPI(112)
 #define EXYNOS4_IRQ_SLIMBUS		IRQ_SPI(113)
+#define EXYNOS4_IRQ_CEC			IRQ_SPI(114)
 
 #define EXYNOS4_IRQ_TSI			IRQ_SPI(115)
 #define EXYNOS4_IRQ_SATA		IRQ_SPI(116)
@@ -235,6 +236,8 @@
 #define IRQ_KEYPAD			EXYNOS4_IRQ_KEYPAD
 #define IRQ_PMU				EXYNOS4_IRQ_PMU
 
+#define IRQ_CEC				EXYNOS4_IRQ_CEC
+
 #define IRQ_FIMD0_FIFO			EXYNOS4_IRQ_FIMD0_FIFO
 #define IRQ_FIMD0_VSYNC			EXYNOS4_IRQ_FIMD0_VSYNC
 #define IRQ_FIMD0_SYSTEM		EXYNOS4_IRQ_FIMD0_SYSTEM

arch/arm/mach-exynos/include/mach/map.h

@@ -79,6 +79,8 @@
 
 #define EXYNOS4_PA_KEYPAD		0x100A0000
 
+#define EXYNOS4_PA_CEC			0x100B0000
+
 #define EXYNOS4_PA_DMC0			0x10400000
 #define EXYNOS4_PA_DMC1			0x10410000
 
@@ -276,6 +278,9 @@
 #define SAMSUNG_PA_ADC1			EXYNOS4_PA_ADC1
 #define SAMSUNG_PA_KEYPAD		EXYNOS4_PA_KEYPAD
 
+#define S5P_PA_HDMI_CEC			EXYNOS4_PA_CEC
+#define S5P_SZ_HDMI_CEC			SZ_4K
+
 /* Compatibility UART */
 
 #define EXYNOS4_PA_UART0		0x13800000

arch/arm/mach-exynos/mach-hkdk4412.c

@@ -393,6 +393,7 @@ static struct platform_device *hkdk4412_devices[] __initdata = {
 	&mali_gpu_device,
 #if defined(CONFIG_S5P_DEV_TV)
 	&s5p_device_hdmi,
+	&s5p_device_cec,
 	&s5p_device_i2c_hdmiphy,
 	&s5p_device_mixer,
 	&hdmi_fixed_voltage,
@@ -417,6 +418,12 @@ static struct platform_device *hkdk4412_devices[] __initdata = {
 #endif
 };
 
+#if defined(CONFIG_S5P_DEV_TV)
+static struct s5p_platform_cec hdmi_cec_data __initdata = {
+
+};
+#endif
+
 static void __init hkdk4412_map_io(void)
 {
 	clk_xusbxti.rate = 24000000;
@@ -525,6 +532,7 @@ static void __init hkdk4412_machine_init(void)
 	s5p_tv_setup();
 	s5p_i2c_hdmiphy_set_platdata(NULL);
 	s5p_hdmi_set_platdata(&hdmiphy_info, NULL, 0);
+	s5p_hdmi_cec_set_platdata(&hdmi_cec_data);
 #endif
 
 	s5p_fimd0_set_platdata(&hkdk4412_fb_pdata);

arch/arm/mach-exynos/mach-origen.c

@@ -705,6 +705,7 @@ static struct platform_device *origen_devices[] __initdata = {
 	&s5p_device_fimd0,
 	&s5p_device_g2d,
 	&s5p_device_hdmi,
+	&s5p_device_cec,
 	&s5p_device_i2c_hdmiphy,
 	&s5p_device_jpeg,
 	&s5p_device_mfc,

arch/arm/mach-exynos/mach-smdk4x12.c

@@ -39,12 +39,19 @@
 #include <plat/mfc.h>
 #include <plat/regs-serial.h>
 #include <plat/sdhci.h>
+#include <plat/hdmi.h>
 
 #include <mach/map.h>
 
 #include <drm/exynos_drm.h>
 #include "common.h"
 
+#if defined(CONFIG_ARCH_EXYNOS4)
+#define HDMI_GPX(_nr)	EXYNOS4_GPX3(_nr)
+#elif defined(CONFIG_ARCH_EXYNOS5)
+#define HDMI_GPX(_nr)	EXYNOS5_GPX3(_nr)
+#endif
+
 /* Following are default values for UCON, ULCON and UFCON UART registers */
 #define SMDK4X12_UCON_DEFAULT	(S3C2410_UCON_TXILEVEL |	\
 				 S3C2410_UCON_RXILEVEL |	\
@@ -246,6 +253,12 @@ static struct samsung_keypad_platdata smdk4x12_keypad_data __initdata = {
 	.cols		= 8,
 };
 
+#if defined(CONFIG_S5P_DEV_TV)
+static struct s5p_platform_cec hdmi_cec_data __initdata = {
+
+};
+#endif
+
 #ifdef CONFIG_DRM_EXYNOS_FIMD
 static struct exynos_drm_fimd_pdata drm_fimd_pdata = {
 	.panel	= {
@@ -332,6 +345,14 @@ static void __init smdk4x12_reserve(void)
 	s5p_mfc_reserve_mem(0x43000000, 8 << 20, 0x51000000, 8 << 20);
 }
 
+#if defined(CONFIG_S5P_DEV_TV)
+void s5p_cec_cfg_gpio(struct platform_device *pdev)
+{
+	s3c_gpio_cfgpin(HDMI_GPX(6), S3C_GPIO_SFN(0x3));
+	s3c_gpio_setpull(HDMI_GPX(6), S3C_GPIO_PULL_NONE);
+}
+#endif
+
 static void __init smdk4x12_machine_init(void)
 {
 	s3c_i2c0_set_platdata(NULL);
@@ -359,6 +380,10 @@ static void __init smdk4x12_machine_init(void)
 	s3c_sdhci3_set_platdata(&smdk4x12_hsmmc3_pdata);
 
 	s3c_hsotg_set_platdata(&smdk4x12_hsotg_pdata);
+
+#if defined(CONFIG_S5P_DEV_TV)
+	s5p_hdmi_cec_set_platdata(&hdmi_cec_data);
+#endif
 
 #ifdef CONFIG_DRM_EXYNOS_FIMD
 	s5p_device_fimd0.dev.platform_data = &drm_fimd_pdata;

arch/arm/mach-exynos/mach-smdkv310.c

@@ -315,6 +315,7 @@ static struct platform_device *smdkv310_devices[] __initdata = {
 	&smdkv310_smsc911x,
 	&exynos4_device_ahci,
 	&s5p_device_hdmi,
+	&s5p_device_cec,
 	&s5p_device_mixer,
 };
 

arch/arm/mach-s5pv210/include/mach/map.h

@@ -48,6 +48,8 @@
 #define S5PV210_PA_PCM1			0xE1200000
 #define S5PV210_PA_PCM2			0xE2B00000
 
+#define S5PV210_PA_CEC			0xE1B00000
+
 #define S5PV210_PA_TIMER		0xE2500000
 #define S5PV210_PA_SYSTIMER		0xE2600000
 #define S5PV210_PA_WATCHDOG		0xE2700000
@@ -126,6 +128,8 @@
 #define S5P_PA_VP			S5PV210_PA_VP
 #define S5P_PA_MIXER			S5PV210_PA_MIXER
 #define S5P_PA_HDMI			S5PV210_PA_HDMI
+#define S5P_PA_CEC			S5PV210_PA_CEC
+#define S5P_SZ_CEC			SZ_4K
 
 #define S5P_PA_ONENAND			S5PC110_PA_ONENAND
 #define S5P_PA_ONENAND_DMA		S5PC110_PA_ONENAND_DMA

arch/arm/plat-samsung/devs.c

@@ -68,6 +68,8 @@
 #include <plat/regs-serial.h>
 #include <plat/regs-spi.h>
 #include <linux/platform_data/spi-s3c64xx.h>
+#include <plat/hdmi.h>
+
 
 static u64 samsung_device_dma_mask = DMA_BIT_MASK(32);
 
@@ -806,6 +808,7 @@ void __init s5p_hdmi_set_platdata(struct i2c_board_info *hdmiphy_info,
 
 #endif /* CONFIG_S5P_DEV_I2C_HDMIPHY */
 
+
 /* I2S */
 
 #ifdef CONFIG_PLAT_S3C24XX
@@ -1357,6 +1360,18 @@ struct platform_device s5p_device_hdmi = {
 	.resource	= s5p_hdmi_resources,
 };
 
+static struct resource s5p_cec_resources[] = {
+	[0] = DEFINE_RES_MEM(S5P_PA_HDMI_CEC, S5P_SZ_HDMI_CEC),
+	[1] = DEFINE_RES_IRQ(IRQ_CEC),
+};
+
+struct platform_device s5p_device_cec = {
+	.name           = "s5p-cec",
+	.id             = -1,
+	.num_resources  = ARRAY_SIZE(s5p_cec_resources),
+	.resource       = s5p_cec_resources,
+};
+
 static struct resource s5p_sdo_resources[] = {
 	[0] = DEFINE_RES_MEM(S5P_PA_SDO, SZ_64K),
 	[1] = DEFINE_RES_IRQ(IRQ_SDO),
@@ -1385,6 +1400,22 @@ struct platform_device s5p_device_mixer = {
 		.coherent_dma_mask	= DMA_BIT_MASK(32),
 	}
 };
+
+void __init s5p_hdmi_cec_set_platdata(struct s5p_platform_cec *pd)
+{
+	struct s5p_platform_cec *npd;
+	printk(KERN_INFO "s5p_hdmi_cec_set_platdata()\n");
+
+	npd = kmemdup(pd, sizeof(struct s5p_platform_cec), GFP_KERNEL);
+	if (!npd)
+		printk(KERN_ERR "%s: no memory for platform data\n", __func__);
+	else {
+		if (!npd->cfg_gpio)
+			npd->cfg_gpio = s5p_cec_cfg_gpio;
+
+		s5p_device_cec.dev.platform_data = npd;
+	}
+}
 #endif /* CONFIG_S5P_DEV_TV */
 
 /* USB */

arch/arm/plat-samsung/include/plat/devs.h

@@ -87,6 +87,7 @@ extern struct platform_device mali_gpu_device;
 
 extern struct platform_device s5p_device_fimd0;
 extern struct platform_device s5p_device_hdmi;
+extern struct platform_device s5p_device_cec;
 extern struct platform_device s5p_device_i2c_hdmiphy;
 extern struct platform_device s5p_device_mfc;
 extern struct platform_device s5p_device_mfc_l;

arch/arm/plat-samsung/include/plat/hdmi.h

@@ -10,7 +10,17 @@
 #ifndef __PLAT_SAMSUNG_HDMI_H
 #define __PLAT_SAMSUNG_HDMI_H __FILE__
 
+struct s5p_platform_cec {
+
+	void	(*cfg_gpio)(struct platform_device *pdev);
+};
+
 extern void s5p_hdmi_set_platdata(struct i2c_board_info *hdmiphy_info,
 				  struct i2c_board_info *mhl_info, int mhl_bus);
 
+extern void s5p_hdmi_cec_set_platdata(struct s5p_platform_cec *pd);
+
+/* defined by architecture to configure gpio */
+extern void s5p_cec_cfg_gpio(struct platform_device *pdev);
+
 #endif /* __PLAT_SAMSUNG_HDMI_H */

arch/arm/plat-samsung/include/plat/tv-core.h

@@ -27,6 +27,13 @@ static inline void s5p_hdmi_setname(char *name)
 #endif
 }
 
+static inline void s5p_cec_setname(char *name)
+{
+#ifdef CONFIG_S5P_DEV_TV
+	s5p_device_cec.name = name;
+#endif
+}
+
 static inline void s5p_mixer_setname(char *name)
 {
 #ifdef CONFIG_S5P_DEV_TV

build.sh

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+export CROSS_COMPILE=arm-linux-gnueabihf-
+export ARCH=arm
+
+make M=drivers/media/platform/s5p-tv modules
+scp drivers/media/platform/s5p-tv/s5p-cec.ko root@x2_wifi:/root

drivers/gpu/drm/drm_vm.c

@@ -422,6 +422,7 @@ void drm_vm_open_locked(struct drm_device *dev,
 		list_add(&vma_entry->head, &dev->vmalist);
 	}
 }
+EXPORT_SYMBOL_GPL(drm_vm_open_locked);
 
 static void drm_vm_open(struct vm_area_struct *vma)
 {

drivers/media/platform/s5p-tv/Kconfig

@@ -36,6 +36,15 @@ config VIDEO_SAMSUNG_S5P_HDMI_DEBUG
 	help
 	  Enables debugging for HDMI driver.
 
+config VIDEO_SAMSUNG_S5P_HDMI_CEC
+	tristate "Enable CEC support for HDMI Driver"
+	depends on VIDEO_SAMSUNG_S5P_HDMI
+	default n
+	help
+	  Enables CEC over the HDMI driver.
+	  CEC enables tv-control, and reception of tv-remote
+	  control commands over the HDMI interface
+
 config VIDEO_SAMSUNG_S5P_HDMIPHY
 	tristate "Samsung HDMIPHY Driver"
 	depends on VIDEO_DEV && VIDEO_V4L2 && I2C

drivers/media/platform/s5p-tv/Makefile

@@ -8,14 +8,19 @@
 
 obj-$(CONFIG_VIDEO_SAMSUNG_S5P_HDMIPHY) += s5p-hdmiphy.o
 s5p-hdmiphy-y += hdmiphy_drv.o
+
 obj-$(CONFIG_VIDEO_SAMSUNG_S5P_SII9234) += s5p-sii9234.o
 s5p-sii9234-y += sii9234_drv.o
+
 obj-$(CONFIG_VIDEO_SAMSUNG_S5P_HDMI) += s5p-hdmi.o
 s5p-hdmi-$(CONFIG_CPU_EXYNOS4210) += hdmi_drv.o
 s5p-hdmi-$(CONFIG_SOC_EXYNOS4412) += hdmi_v14_drv.o
 
+obj-$(CONFIG_VIDEO_SAMSUNG_S5P_HDMI_CEC) += s5p-cec.o
+s5p-cec-y += cec_drv.o cec_hw.o
+
 obj-$(CONFIG_VIDEO_SAMSUNG_S5P_SDO) += s5p-sdo.o
 s5p-sdo-y += sdo_drv.o
+
 obj-$(CONFIG_VIDEO_SAMSUNG_S5P_MIXER) += s5p-mixer.o
 s5p-mixer-y += mixer_drv.o mixer_video.o mixer_reg.o mixer_grp_layer.o mixer_vp_layer.o
-