From 5786afee4f8a19fbeebbbc79d63083a2de54bf6c Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Thu, 17 Apr 2014 07:57:13 +0100 Subject: [PATCH] Drop OMAP DRM hack to load encoder module now it fully supports DT (YAY) --- arm-omap-load-tfp410.patch | 14 -------------- config-armv7 | 2 +- kernel.spec | 5 +++-- 3 files changed, 4 insertions(+), 17 deletions(-) delete mode 100644 arm-omap-load-tfp410.patch diff --git a/arm-omap-load-tfp410.patch b/arm-omap-load-tfp410.patch deleted file mode 100644 index 3ef21a062..000000000 --- a/arm-omap-load-tfp410.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/drivers/video/omap2/dss/core.c b/drivers/video/omap2/dss/core.c -index 60d3958..0e304ce 100644 ---- a/drivers/video/omap2/dss/core.c -+++ b/drivers/video/omap2/dss/core.c -@@ -298,6 +298,9 @@ static int __init omap_dss_init(void) - int r; - int i; - -+ /* hack to load encoder-tfp410 driver */ -+ request_module("encoder-tfp410"); -+ - r = platform_driver_probe(&omap_dss_driver, omap_dss_probe); - if (r) - return r; diff --git a/config-armv7 b/config-armv7 index c51339ab2..fddaf6d8a 100644 --- a/config-armv7 +++ b/config-armv7 @@ -418,7 +418,7 @@ CONFIG_DRM_IMX_FB_HELPER=m CONFIG_DRM_IMX_HDMI=m CONFIG_DRM_IMX_IPUV3_CORE=m CONFIG_DRM_IMX_IPUV3=m -# CONFIG_DRM_IMX_LDB is not set +CONFIG_DRM_IMX_LDB=m CONFIG_DRM_IMX_PARALLEL_DISPLAY=m CONFIG_DRM_IMX_TVE=m CONFIG_VIDEO_CODA=m diff --git a/kernel.spec b/kernel.spec index 4f2d96029..e7eb3e567 100644 --- a/kernel.spec +++ b/kernel.spec @@ -605,7 +605,6 @@ Patch21001: arm-lpae-ax88796.patch Patch21004: arm-sound-soc-samsung-dma-avoid-another-64bit-division.patch # ARM omap -Patch21010: arm-omap-load-tfp410.patch # ARM tegra Patch21020: arm-tegra-usb-no-reset-linux33.patch @@ -1165,7 +1164,6 @@ ApplyPatch 0001-lib-cpumask-Make-CPUMASK_OFFSTACK-usable-without-deb.patch # ApplyPatch arm-lpae-ax88796.patch ApplyPatch arm-sound-soc-samsung-dma-avoid-another-64bit-division.patch -ApplyPatch arm-omap-load-tfp410.patch ApplyPatch arm-tegra-usb-no-reset-linux33.patch # @@ -2060,6 +2058,9 @@ fi # ||----w | # || || %changelog +* Thu Apr 17 2014 Peter Robinson +- Drop OMAP DRM hack to load encoder module now it fully supports DT (YAY!) + * Wed Apr 16 2014 Josh Boyer - 3.15.0-0.rc1.git2.1 - Linux v3.15-rc1-49-g10ec34fcb100