sync with v3.7.x stabl-kernel branch and reset tree for upcoming v3.8-rc merge

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>

patch.sh

@@ -102,11 +102,6 @@ omap () {
 	#Status: unknown: only needed when forcing mpurate over 999 using bootargs...
 	${git} "${DIR}/patches/omap/fixes/0001-omap3-Increase-limit-on-bootarg-mpurate.patch"
 
-	#Status: unknown:
-	${git} "${DIR}/patches/omap/fixes/0002-OMAPDSS-DSI-fix-dsi_get_dsidev_from_id.patch"
-	${git} "${DIR}/patches/omap/fixes/0003-omapdss-dss-Fix-clocks-on-OMAP363x.patch"
-	${git} "${DIR}/patches/omap/fixes/0004-OMAPDSS-HDMI-fix-missing-unlock-on-error-in-hdmi_dum.patch"
-
 	echo "dir: omap/thermal"
 	#Status: https://lkml.org/lkml/2012/11/13/341
 	${git} "${DIR}/patches/omap/thermal/0001-staging-omap-thermal-fix-compilation.patch"

patches/defconfig

 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.7.0-rc5 Kernel Configuration
+# Linux/arm 3.7.0-rc7 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -2297,7 +2297,6 @@ CONFIG_PINMUX=y
 CONFIG_PINCONF=y
 CONFIG_DEBUG_PINCTRL=y
 # CONFIG_PINCTRL_SINGLE is not set
-# CONFIG_PINCTRL_SAMSUNG is not set
 # CONFIG_PINCTRL_EXYNOS4 is not set
 CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y
 CONFIG_ARCH_REQUIRE_GPIOLIB=y

patches/omap/fixes/0002-OMAPDSS-DSI-fix-dsi_get_dsidev_from_id.patch

-From 4e6285d6450a06dfeddb3f84fcf23460431a2ab5 Mon Sep 17 00:00:00 2001
-From: Tomi Valkeinen <tomi.valkeinen@ti.com>
-Date: Mon, 15 Oct 2012 12:48:11 +0300
-Subject: [PATCH 2/4] OMAPDSS: DSI: fix dsi_get_dsidev_from_id()
-
-If dsi_get_dsidev_from_id() is called with a DSI module id that does not
-exist on the board, the function will crash as omap_dss_get_output()
-will return NULL.
-
-This happens on omap3 boards when dumping DSI clocks, as the dumping
-code will try to get the dsidev for DSI modules 0 and 1, but omap3 only
-has DSI module 0.
-
-Also clean up the id -> output mapping, so that if the function is
-called with invalid module ID it will return NULL.
-
-Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
-Cc: Archit Taneja <archit@ti.com>
----
- drivers/video/omap2/dss/dsi.c |   13 +++++++++++--
- 1 file changed, 11 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/video/omap2/dss/dsi.c b/drivers/video/omap2/dss/dsi.c
-index d64ac38..bee9284 100644
---- a/drivers/video/omap2/dss/dsi.c
-+++ b/drivers/video/omap2/dss/dsi.c
-@@ -365,11 +365,20 @@ struct platform_device *dsi_get_dsidev_from_id(int module)
- 	struct omap_dss_output *out;
- 	enum omap_dss_output_id	id;
- 
--	id = module == 0 ? OMAP_DSS_OUTPUT_DSI1 : OMAP_DSS_OUTPUT_DSI2;
-+	switch (module) {
-+	case 0:
-+		id = OMAP_DSS_OUTPUT_DSI1;
-+		break;
-+	case 1:
-+		id = OMAP_DSS_OUTPUT_DSI2;
-+		break;
-+	default:
-+		return NULL;
-+	}
- 
- 	out = omap_dss_get_output(id);
- 
--	return out->pdev;
-+	return out ? out->pdev : NULL;
- }
- 
- static inline void dsi_write_reg(struct platform_device *dsidev,
--- 
-1.7.10.4
-

patches/omap/fixes/0003-omapdss-dss-Fix-clocks-on-OMAP363x.patch

-From f8e51619388e51b71bf675426120a3e0db1de625 Mon Sep 17 00:00:00 2001
-From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Date: Thu, 25 Oct 2012 20:42:10 +0200
-Subject: [PATCH 3/4] omapdss: dss: Fix clocks on OMAP363x
-
-Commit 185bae1095188aa199c9be64d6030d8dbfc65e0a ("OMAPDSS: DSS: Cleanup
-cpu_is_xxxx checks") broke the DSS clocks configuration by erroneously
-using the clock parameters applicable to all other OMAP34xx SoCs for the
-OMAP363x. This went unnoticed probably because the cpu_is_omap34xx()
-class check wasn't seen as matching the OMAP363x subclass.
-
-Fix it by checking for the OMAP363x subclass before checking for the
-OMAP34xx class.
-
-Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
----
- drivers/video/omap2/dss/dss.c |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/video/omap2/dss/dss.c b/drivers/video/omap2/dss/dss.c
-index 2ab1c3e..0bb7406 100644
---- a/drivers/video/omap2/dss/dss.c
-+++ b/drivers/video/omap2/dss/dss.c
-@@ -805,10 +805,10 @@ static int __init dss_init_features(struct device *dev)
- 
- 	if (cpu_is_omap24xx())
- 		src = &omap24xx_dss_feats;
--	else if (cpu_is_omap34xx())
--		src = &omap34xx_dss_feats;
- 	else if (cpu_is_omap3630())
- 		src = &omap3630_dss_feats;
-+	else if (cpu_is_omap34xx())
-+		src = &omap34xx_dss_feats;
- 	else if (cpu_is_omap44xx())
- 		src = &omap44xx_dss_feats;
- 	else if (soc_is_omap54xx())
--- 
-1.7.10.4
-

patches/omap/fixes/0004-OMAPDSS-HDMI-fix-missing-unlock-on-error-in-hdmi_dum.patch

-From 546696a8db3d13adc98cf4260eccb42c1a49bb9c Mon Sep 17 00:00:00 2001
-From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
-Date: Sun, 21 Oct 2012 20:54:26 +0800
-Subject: [PATCH 4/4] OMAPDSS: HDMI: fix missing unlock on error in
- hdmi_dump_regs()
-
-Add the missing unlock on the error handling path in function
-hdmi_dump_regs().
-
-Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
-Reviewed-by: Sumit Semwal <sumit.semwal@ti.com>
-Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
----
- drivers/video/omap2/dss/hdmi.c |    4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/video/omap2/dss/hdmi.c b/drivers/video/omap2/dss/hdmi.c
-index a48a7dd..8c9b8b3 100644
---- a/drivers/video/omap2/dss/hdmi.c
-+++ b/drivers/video/omap2/dss/hdmi.c
-@@ -644,8 +644,10 @@ static void hdmi_dump_regs(struct seq_file *s)
- {
- 	mutex_lock(&hdmi.lock);
- 
--	if (hdmi_runtime_get())
-+	if (hdmi_runtime_get()) {
-+		mutex_unlock(&hdmi.lock);
- 		return;
-+	}
- 
- 	hdmi.ip_data.ops->dump_wrapper(&hdmi.ip_data, s);
- 	hdmi.ip_data.ops->dump_pll(&hdmi.ip_data, s);
--- 
-1.7.10.4
-

patches/ref_omap2plus_defconfig

 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.7.0-rc5 Kernel Configuration
+# Linux/arm 3.7.0-rc7 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -1439,7 +1439,6 @@ CONFIG_PINMUX=y
 CONFIG_PINCONF=y
 # CONFIG_DEBUG_PINCTRL is not set
 CONFIG_PINCTRL_SINGLE=y
-# CONFIG_PINCTRL_SAMSUNG is not set
 # CONFIG_PINCTRL_EXYNOS4 is not set
 CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y
 CONFIG_ARCH_REQUIRE_GPIOLIB=y
@@ -2139,7 +2138,6 @@ CONFIG_USB_ZERO=m
 #
 # CONFIG_USB_GPIO_VBUS is not set
 # CONFIG_USB_ULPI is not set
-# CONFIG_TWL4030_USB is not set
 # CONFIG_NOP_USB_XCEIV is not set
 CONFIG_MMC=y
 # CONFIG_MMC_DEBUG is not set

version.sh

@@ -23,11 +23,11 @@ config="omap2plus_defconfig"
 
 #Kernel/Build
 KERNEL_REL=3.7
-KERNEL_TAG=${KERNEL_REL}-rc5
-BUILD=d2
+KERNEL_TAG=${KERNEL_REL}-rc7
+BUILD=d0
 
 #git branch
-#BRANCH="v3.7.x"
+#BRANCH="v3.8.x"
 
 BUILDREV=1.0
 DISTRO=cross