Merge pull request #76 from gripped/xbmc-fixes

Oversun's MFC and CEC fixes

Author: mdrjr

arch/arm/boot/dts/exynos5422_evt0.dtsi

@@ -1159,6 +1159,27 @@
 		samsung,syscon-phandle = <&pmu_system_controller>;
 		status = "enabled";
 	};
+
+        cec@101B0000 {
+                compatible = "samsung,exynos5-cec_driver";
+                reg = <0x101B0000 0x1000>;
+                interrupts = <0 114 0>;
+
+                gpios = <&gpx3 6 0xf>;
+                pinctrl-names = "hdmi_cec";
+                pinctrl-0 = <&hdmi_cec>;
+
+                clock-names = "pclk_hdmi_cec";
+                clocks = <&clock 966>;
+
+                #address-cells = <1>;
+                #size-cells = <1>;
+                ranges;
+
+                hdmiphy-sys {
+                        reg = <0x10040700 0x4>;
+                };
+        };
 
 	hdmiphy: hdmiphy@145D0000 {
 		reg = <0x145D0000 0x20>;
@@ -1273,12 +1294,11 @@
 		bts-status = "enabled";
 	};
 
-	pd_mfc0: pd-mfc@10044060 {
-		compatible = "samsung,exynos-pd";
-		reg = <0x10044060 0x20>;
-		bts-status = "enabled";
-		status = "enabled";
-	};
+        pd_mfc0: pd-mfc@10044060 {
+                compatible = "samsung,exynos-pd";
+                reg = <0x10044060 0x20>;
+                bts-status = "disable";
+        };
 
 	pd_g3d: pd-g3d@0x10044080 {
 		compatible = "samsung,exynos-pd";

arch/arm/configs/odroidxu3_defconfig

@@ -2369,6 +2369,7 @@ CONFIG_EXYNOS_MFC_V8=y
 # CONFIG_VIDEO_EXYNOS_JPEG is not set
 # CONFIG_VIDEO_EXYNOS_HX_JPEG is not set
 # CONFIG_VIDEO_EXYNOS_TV is not set
+CONFIG_VIDEO_EXYNOS_HDMI_CEC=y
 # CONFIG_VIDEO_TIMBERDALE is not set
 # CONFIG_SOC_CAMERA is not set
 # CONFIG_VIDEO_SAMSUNG_EXYNOS4_IS is not set

drivers/media/platform/exynos/Makefile

@@ -9,4 +9,6 @@ obj-$(CONFIG_VIDEO_EXYNOS_FIMG2D)	+= fimg2d/
 obj-$(CONFIG_VIDEO_EXYNOS_JPEG)		+= jpeg4/
 obj-$(CONFIG_VIDEO_EXYNOS_HX_JPEG)	+= jpeg_hx/
 obj-$(CONFIG_VIDEO_EXYNOS_TV)		+= tv/
+obj-$(CONFIG_VIDEO_EXYNOS_HDMI_CEC) += s5p-hdmi_cec.o
+s5p-hdmi_cec-y += tv/hdmi_cec.o tv/hdmi_cec_ctrl.o
 EXTRA_CLAGS += -Idrivers/media/video

drivers/media/platform/exynos/tv/Kconfig

@@ -75,15 +75,6 @@ config VIDEO_EXYNOS_MIXER
 	  Say Y here if you want support for the Mixer in Samsung S5P SoCs.
 	  This device produce image data to one of output interfaces.
 
-config VIDEO_EXYNOS_HDMI_CEC
-	tristate "Samsung HDMI CEC Driver"
-	depends on VIDEO_DEV && VIDEO_V4L2 && I2C
-	depends on VIDEO_EXYNOS_TV
-	help
-	  Say Y here if you want support for the HDMI CEC
-	  interface in S5P Samsung SoC. The driver can be compiled
-	  as module.
-
 config VIDEO_SAMSUNG_MEMSIZE_TV
 	int "Memory size in kbytes for TV"
 	depends on VIDEO_EXYNOS_MIXER && VIDEOBUF2_CMA_PHYS
@@ -97,3 +88,11 @@ config VIDEO_EXYNOS_MIXER_DEBUG
 	  Enables debugging for Mixer driver.
 
 endif # VIDEO_EXYNOS_TV
+
+config VIDEO_EXYNOS_HDMI_CEC
+        tristate "Samsung HDMI CEC Driver"
+        depends on VIDEO_DEV && VIDEO_V4L2 && I2C
+        help
+          Say Y here if you want support for the HDMI CEC
+          interface in S5P Samsung SoC. The driver can be compiled
+          as module.