3.13: update to v3.13-rc8 and fix hdmi output with xorg

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
beagleboard · Jan 13, 2014 · 0e666d9 · 0e666d9
1 parent a314c1b
commit 0e666d9
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 11 deletions.
diff --git a/configs/beaglebone b/configs/beaglebone
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.13.0-rc6 Kernel Configuration
+# Linux/arm 3.13.0-rc8 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -4296,13 +4296,7 @@ CONFIG_SYNC=y
 # CONFIG_WIMAX_GDM72XX is not set
 # CONFIG_LTE_GDM724X is not set
 CONFIG_CED1401=m
-CONFIG_DRM_IMX=y
-CONFIG_DRM_IMX_FB_HELPER=y
-CONFIG_DRM_IMX_PARALLEL_DISPLAY=y
-CONFIG_DRM_IMX_TVE=y
-CONFIG_DRM_IMX_LDB=y
-CONFIG_DRM_IMX_IPUV3_CORE=y
-CONFIG_DRM_IMX_IPUV3=y
+# CONFIG_DRM_IMX is not set
 # CONFIG_DGRP is not set
 # CONFIG_USB_DWC2 is not set
 # CONFIG_LUSTRE_FS is not set

diff --git a/patch.sh b/patch.sh
@@ -17,14 +17,14 @@ RECIPENAME="linux-mainline_3.13.bb"
 RECIPEFILE="${DIR}/recipes/${RECIPENAME}"
 
 #For TAG, use mainline Kernel tags
-TAG="v3.13-rc7"
+TAG="v3.13-rc8"
 EXTRATAG=""
 
 EXTERNAL_TREE="git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git"
 EXTERNAL_BRANCH="master"
-EXTERNAL_SHA="d6e0a2dd12f4067a5bcefb8bbd8ddbeff800afbc"
+EXTERNAL_SHA="7e22e91102c6b9df7c4ae2168910e19d2bb14cd6"
 
-PATCHSET="dts sgx"
+PATCHSET="dts fixes sgx"
 
 git_kernel_stable () {
 	git pull git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git master --tags || true

diff --git a/patches/fixes/0001-pinctrl-pinctrl-single-must-be-initialized-early.patch b/patches/fixes/0001-pinctrl-pinctrl-single-must-be-initialized-early.patch
@@ -0,0 +1,38 @@
+From 72567452d5d6007010597158f6afd00e2bf07579 Mon Sep 17 00:00:00 2001
+From: Pantelis Antoniou <panto@antoniou-consulting.com>
+Date: Sat, 15 Sep 2012 12:00:41 +0300
+Subject: [PATCH] pinctrl: pinctrl-single must be initialized early.
+
+When using pinctrl-single to handle i2c initialization, it has
+to be done early. Whether this is the best way to do so, is an
+exercise left to the reader.
+---
+ drivers/pinctrl/pinctrl-single.c | 12 +++++++++++-
+ 1 file changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/pinctrl/pinctrl-single.c b/drivers/pinctrl/pinctrl-single.c
+index 829b98c..5107dcf 100644
+--- a/drivers/pinctrl/pinctrl-single.c
++++ b/drivers/pinctrl/pinctrl-single.c
+@@ -2039,7 +2039,17 @@ static struct platform_driver pcs_driver = {
+ #endif
+ };
+
+-module_platform_driver(pcs_driver);
++static int __init pcs_init(void)
++{
++	return platform_driver_register(&pcs_driver);
++}
++postcore_initcall(pcs_init);
++
++static void __exit pcs_exit(void)
++{
++	platform_driver_unregister(&pcs_driver);
++}
++module_exit(pcs_exit);
+
+ MODULE_AUTHOR("Tony Lindgren <tony@atomide.com>");
+ MODULE_DESCRIPTION("One-register-per-pin type device tree based pinctrl driver");
+-- 
+1.8.5.2
+