linux-omap 2.6.37rc: bump to rc5

Signed-off-by: Koen Kooi <koen@beagleboard.org>

15 files changed, 75 insertions, 164 deletions

diff --git a/recipes/linux/linux-omap-2.6.37rc/0003-ARM-OMAP-fix-USB-initialization-for-beagleboard-xM.patch b/recipes/linux/linux-omap-2.6.37rc/0001-ARM-OMAP-Power-on-EHCI-serial-camera-and-DVI-on-beag.patch
index b20c8c6ce4..8518d79742 100644
--- a/recipes/linux/linux-omap-2.6.37rc/0003-ARM-OMAP-fix-USB-initialization-for-beagleboard-xM.patch
+++ b/recipes/linux/linux-omap-2.6.37rc/0001-ARM-OMAP-Power-on-EHCI-serial-camera-and-DVI-on-beag.patch
@@ -1,18 +1,18 @@
-From c908140c053071789dfa72f34bee76223ba9bdb7 Mon Sep 17 00:00:00 2001
+From c403de48a5a02e58aabf82f14a068a056fa891f3 Mon Sep 17 00:00:00 2001
 From: Koen Kooi <koen@dominion.thruhere.net>
 Date: Thu, 7 Oct 2010 09:25:45 +0200
-Subject: [PATCH 03/14] ARM: OMAP: fix USB initialization for beagleboard-xM
+Subject: [PATCH 01/11] ARM: OMAP: Power on EHCI, serial, camera and DVI on beagleboard-xM
 
 Signed-off-by: Koen Kooi <koen@beagleboard.org>
 ---
- arch/arm/mach-omap2/board-omap3beagle.c |   12 +++++++-----
- 1 files changed, 7 insertions(+), 5 deletions(-)
+ arch/arm/mach-omap2/board-omap3beagle.c |   27 +++++++++++++++++++++++----
+ 1 files changed, 23 insertions(+), 4 deletions(-)
 
 diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
-index 2943e1f..92335a9 100644
+index f1a8ede..9c9bd96 100644
 --- a/arch/arm/mach-omap2/board-omap3beagle.c
 +++ b/arch/arm/mach-omap2/board-omap3beagle.c
-@@ -390,12 +390,14 @@ static int beagle_twl_gpio_setup(struct device *dev,
+@@ -297,12 +297,31 @@ static int beagle_twl_gpio_setup(struct device *dev,
  	gpio_request(gpio + 1, "EHCI_nOC");
  	gpio_direction_input(gpio + 1);
  
@@ -21,13 +21,29 @@ index 2943e1f..92335a9 100644
 +	 * high / others active low) */
  	gpio_request(gpio + TWL4030_GPIO_MAX, "nEN_USB_PWR");
 -	gpio_direction_output(gpio + TWL4030_GPIO_MAX, 0);
--
++	if (omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XM)
++		gpio_direction_output(gpio + TWL4030_GPIO_MAX, 1);
++	else
++		gpio_direction_output(gpio + TWL4030_GPIO_MAX, 0);
++
++	/* DVI reset GPIO is different between revisions */
++	if (omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XM)
++		beagle_dvi_device.reset_gpio = 129;
++	else
++		beagle_dvi_device.reset_gpio = 170;
++
++	 /* Power on DVI, Serial and PWR led */
++	if (omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XM) {
++		gpio_request(gpio + 1, "nDVI_PWR_EN");
++		gpio_direction_output(gpio + 1, 0);
++	}
+ 
 -	/* TWL4030_GPIO_MAX + 1 == ledB, PMU_STAT (out, active low LED) */
 -	gpio_leds[2].gpio = gpio + TWL4030_GPIO_MAX + 1;
++	/* Power on camera interface on P7/P8 or DVI on A2 and beyond */
 +	if (omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XM) {
-+		gpio_direction_output(gpio + TWL4030_GPIO_MAX, 1);
-+	} else {
-+		gpio_direction_output(gpio + TWL4030_GPIO_MAX, 0);
++		gpio_request(gpio + 2, "CAM_EN");
++		gpio_direction_output(gpio + 2, 1);
 +	}
  
  	return 0;
diff --git a/recipes/linux/linux-omap-2.6.37rc/0009-omap-Beagle-detect-new-xM-revision-B.patch b/recipes/linux/linux-omap-2.6.37rc/0002-omap-Beagle-detect-new-xM-revision-B.patch
index d2a64a87aa..89694c6d96 100644
--- a/recipes/linux/linux-omap-2.6.37rc/0009-omap-Beagle-detect-new-xM-revision-B.patch
+++ b/recipes/linux/linux-omap-2.6.37rc/0002-omap-Beagle-detect-new-xM-revision-B.patch
@@ -1,7 +1,7 @@
-From c5d20d17936c53b62603cdc8a9cf771bc5c6fcd2 Mon Sep 17 00:00:00 2001
+From c10787108ac19e36cf8d8f15c3c93edff94a9f10 Mon Sep 17 00:00:00 2001
 From: Robert Nelson <robertcnelson@gmail.com>
 Date: Tue, 9 Nov 2010 08:34:55 -0600
-Subject: [PATCH 09/14] omap: Beagle: detect new xM revision B
+Subject: [PATCH 02/11] omap: Beagle: detect new xM revision B
 
 The xM B uses a DM3730 ES1.1 over the ES1.0 on xM A's, no other board changes.
 
@@ -12,10 +12,10 @@ Signed-off-by: Koen Kooi <koen@beagleboard.org>
  1 files changed, 7 insertions(+), 2 deletions(-)
 
 diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
-index 6d7f008..f63f319 100644
+index 9c9bd96..159d81b 100644
 --- a/arch/arm/mach-omap2/board-omap3beagle.c
 +++ b/arch/arm/mach-omap2/board-omap3beagle.c
-@@ -59,7 +59,8 @@
+@@ -58,7 +58,8 @@
   *	AXBX	= GPIO173, GPIO172, GPIO171: 1 1 1
   *	C1_3	= GPIO173, GPIO172, GPIO171: 1 1 0
   *	C4	= GPIO173, GPIO172, GPIO171: 1 0 1
@@ -25,7 +25,7 @@ index 6d7f008..f63f319 100644
   */
  enum {
  	OMAP3BEAGLE_BOARD_UNKN = 0,
-@@ -118,7 +119,11 @@ static void __init omap3_beagle_init_rev(void)
+@@ -117,7 +118,11 @@ static void __init omap3_beagle_init_rev(void)
  		omap3_beagle_version = OMAP3BEAGLE_BOARD_C4;
  		break;
  	case 0:
diff --git a/recipes/linux/linux-omap-2.6.37rc/0001-ARM-OMAP-beagleboard-Add-infrastructure-to-do-fixups.patch b/recipes/linux/linux-omap-2.6.37rc/0003-ARM-OMAP-beagleboard-Add-infrastructure-to-do-fixups.patch
index 8b40d660cf..b713d80098 100644
--- a/recipes/linux/linux-omap-2.6.37rc/0001-ARM-OMAP-beagleboard-Add-infrastructure-to-do-fixups.patch
+++ b/recipes/linux/linux-omap-2.6.37rc/0003-ARM-OMAP-beagleboard-Add-infrastructure-to-do-fixups.patch
@@ -1,7 +1,7 @@
-From 29fb3969c82a750b41746a299e484172dba443dc Mon Sep 17 00:00:00 2001
+From ea4d9ef8f8550985ee062d5f186efa02bbdb53d1 Mon Sep 17 00:00:00 2001
 From: Koen Kooi <koen@dominion.thruhere.net>
 Date: Wed, 6 Oct 2010 10:19:34 +0200
-Subject: [PATCH 01/14] ARM: OMAP: beagleboard: Add infrastructure to do fixups based on expansionboard name passed by u-boot
+Subject: [PATCH 03/11] ARM: OMAP: beagleboard: Add infrastructure to do fixups based on expansionboard name passed by u-boot
 
 Add support for Tincantools Zippy and Zippy2 expansionboards as well
 
@@ -11,7 +11,7 @@ Signed-off-by: Koen Kooi <koen@beagleboard.org>
  1 files changed, 139 insertions(+), 3 deletions(-)
 
 diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
-index f1a8ede..2943e1f 100644
+index 159d81b..030ab32 100644
 --- a/arch/arm/mach-omap2/board-omap3beagle.c
 +++ b/arch/arm/mach-omap2/board-omap3beagle.c
 @@ -21,6 +21,7 @@
@@ -22,7 +22,7 @@ index f1a8ede..2943e1f 100644
  #include <linux/input.h>
  #include <linux/gpio_keys.h>
  
-@@ -138,6 +139,92 @@ fail0:
+@@ -143,6 +144,92 @@ fail0:
  	return;
  }
  
@@ -115,7 +115,7 @@ index f1a8ede..2943e1f 100644
  static struct mtd_partition omap3beagle_nand_partitions[] = {
  	/* All the partition sizes are listed in terms of NAND block size */
  	{
-@@ -257,6 +344,12 @@ static struct omap2_hsmmc_info mmc[] = {
+@@ -262,6 +349,12 @@ static struct omap2_hsmmc_info mmc[] = {
  		.caps		= MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA,
  		.gpio_wp	= 29,
  	},
@@ -128,7 +128,7 @@ index f1a8ede..2943e1f 100644
  	{}	/* Terminator */
  };
  
-@@ -404,7 +497,7 @@ static struct twl4030_platform_data beagle_twldata = {
+@@ -428,7 +521,7 @@ static struct twl4030_platform_data beagle_twldata = {
  	.vpll2		= &beagle_vpll2,
  };
  
@@ -137,7 +137,7 @@ index f1a8ede..2943e1f 100644
  	{
  		I2C_BOARD_INFO("twl4030", 0x48),
  		.flags = I2C_CLIENT_WAKE,
-@@ -419,10 +512,24 @@ static struct i2c_board_info __initdata beagle_i2c_eeprom[] = {
+@@ -443,10 +536,24 @@ static struct i2c_board_info __initdata beagle_i2c_eeprom[] = {
         },
  };
  
@@ -164,7 +164,7 @@ index f1a8ede..2943e1f 100644
  	/* Bus 3 is attached to the DVI port where devices like the pico DLP
  	 * projector don't work reliably with 400kHz */
  	omap_register_i2c_bus(3, 100, beagle_i2c_eeprom, ARRAY_SIZE(beagle_i2c_eeprom));
-@@ -555,6 +662,15 @@ static struct omap_musb_board_data musb_board_data = {
+@@ -579,6 +686,15 @@ static struct omap_musb_board_data musb_board_data = {
  	.power			= 100,
  };
  
@@ -180,7 +180,7 @@ index f1a8ede..2943e1f 100644
  static void __init omap3_beagle_init(void)
  {
  	omap3_mux_init(board_mux, OMAP_PACKAGE_CBB);
-@@ -569,6 +685,24 @@ static void __init omap3_beagle_init(void)
+@@ -593,6 +709,24 @@ static void __init omap3_beagle_init(void)
  	/* REVISIT leave DVI powered down until it's needed ... */
  	gpio_direction_output(170, true);
  
@@ -205,7 +205,7 @@ index f1a8ede..2943e1f 100644
  	usb_musb_init(&musb_board_data);
  	usb_ehci_init(&ehci_pdata);
  	omap3beagle_flash_init();
-@@ -580,6 +714,8 @@ static void __init omap3_beagle_init(void)
+@@ -604,6 +738,8 @@ static void __init omap3_beagle_init(void)
  	beagle_display_init();
  }
  
diff --git a/recipes/linux/linux-omap-2.6.37rc/0004-ARM-OMAP-Power-on-EHCI-serial-camera-and-DVI-on-beag.patch b/recipes/linux/linux-omap-2.6.37rc/0004-ARM-OMAP-Power-on-EHCI-serial-camera-and-DVI-on-beag.patch
deleted file mode 100644
index 0dd728792c..0000000000
--- a/recipes/linux/linux-omap-2.6.37rc/0004-ARM-OMAP-Power-on-EHCI-serial-camera-and-DVI-on-beag.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 28d1c68dd4fd99b61375217efbe7b59f42f5c886 Mon Sep 17 00:00:00 2001
-From: Koen Kooi <koen@dominion.thruhere.net>
-Date: Thu, 7 Oct 2010 11:46:01 +0200
-Subject: [PATCH 04/14] ARM: OMAP: Power on EHCI, serial, camera and DVI on beagleboard-x<
-
-Signed-off-by: Koen Kooi <koen@beagleboard.org>
----
- arch/arm/mach-omap2/board-omap3beagle.c |   19 +++++++++++++++++++
- 1 files changed, 19 insertions(+), 0 deletions(-)
-
-diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
-index 92335a9..6d7f008 100644
---- a/arch/arm/mach-omap2/board-omap3beagle.c
-+++ b/arch/arm/mach-omap2/board-omap3beagle.c
-@@ -399,6 +399,25 @@ static int beagle_twl_gpio_setup(struct device *dev,
- 		gpio_direction_output(gpio + TWL4030_GPIO_MAX, 0);
- 	}
- 
-+	/* DVI reset GPIO is different between revisions */
-+	if (omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XM) {
-+		beagle_dvi_device.reset_gpio = 129;
-+	} else {
-+		beagle_dvi_device.reset_gpio = 170;
-+	}
-+
-+	 /* Power on DVI, Serial and PWR led */
-+	if (omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XM) {
-+		gpio_request(gpio + 1, "nDVI_PWR_EN");
-+		gpio_direction_output(gpio + 1, 0);
-+	}
-+
-+	/* Power on camera interface */
-+	if (omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XM) {
-+		gpio_request(gpio + 2, "CAM_EN");
-+		gpio_direction_output(gpio + 2, 1);
-+	}
-+
- 	return 0;
- }
- 
--- 
-1.6.6.1
-
diff --git a/recipes/linux/linux-omap-2.6.37rc/0014-ARM-OMAP-beagleboard-pre-export-GPIOs-to-userspace-w.patch b/recipes/linux/linux-omap-2.6.37rc/0004-ARM-OMAP-beagleboard-pre-export-GPIOs-to-userspace-w.patch
index ae98923457..3d1f6eecdc 100644
--- a/recipes/linux/linux-omap-2.6.37rc/0014-ARM-OMAP-beagleboard-pre-export-GPIOs-to-userspace-w.patch
+++ b/recipes/linux/linux-omap-2.6.37rc/0004-ARM-OMAP-beagleboard-pre-export-GPIOs-to-userspace-w.patch
@@ -1,7 +1,7 @@
-From 8b3ec1b570be50d4488c2b865dc76ef47eccf699 Mon Sep 17 00:00:00 2001
+From 9d5908876b85482b55ec36d3dc9970bc43a9b331 Mon Sep 17 00:00:00 2001
 From: Koen Kooi <koen@dominion.thruhere.net>
 Date: Sun, 5 Dec 2010 13:25:00 +0100
-Subject: [PATCH 14/14] ARM: OMAP: beagleboard: pre-export GPIOs to userspace when using a Tincantools trainerboard
+Subject: [PATCH 04/11] ARM: OMAP: beagleboard: pre-export GPIOs to userspace when using a Tincantools trainerboard
 
 This really needs a for loop, patches welcome
 
@@ -11,10 +11,10 @@ Signed-off-by: Koen Kooi <koen@beagleboard.org>
  1 files changed, 31 insertions(+), 0 deletions(-)
 
 diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
-index c3f8b69..60e7fa6 100644
+index 030ab32..c78cdc1 100644
 --- a/arch/arm/mach-omap2/board-omap3beagle.c
 +++ b/arch/arm/mach-omap2/board-omap3beagle.c
-@@ -729,6 +729,37 @@ static void __init omap3_beagle_init(void)
+@@ -727,6 +727,37 @@ static void __init omap3_beagle_init(void)
  		mmc[1].gpio_cd = 162;
  	}
  
diff --git a/recipes/linux/linux-omap-2.6.37rc/0002-modedb.c-add-proper-720p60-mode.patch b/recipes/linux/linux-omap-2.6.37rc/0005-modedb.c-add-proper-720p60-mode.patch
index 1dbcaa803d..edbfaa9de1 100644
--- a/recipes/linux/linux-omap-2.6.37rc/0002-modedb.c-add-proper-720p60-mode.patch
+++ b/recipes/linux/linux-omap-2.6.37rc/0005-modedb.c-add-proper-720p60-mode.patch
@@ -1,7 +1,7 @@
-From 415c97e9ba23bb7d0f24edde11236b0a149d134c Mon Sep 17 00:00:00 2001
+From 2963f2663b0b2457bd0a02eaa2d72d20390af4aa Mon Sep 17 00:00:00 2001
 From: Koen Kooi <koen@dominion.thruhere.net>
 Date: Mon, 8 Mar 2010 14:38:31 +0100
-Subject: [PATCH 02/14] modedb.c: add proper 720p60 mode
+Subject: [PATCH 05/11] modedb.c: add proper 720p60 mode
 
 Signed-off-by: Koen Kooi <koen@beagleboard.org>
 ---
diff --git a/recipes/linux/linux-omap-2.6.37rc/0005-mmc-don-t-display-single-block-read-console-messages.patch b/recipes/linux/linux-omap-2.6.37rc/0006-mmc-don-t-display-single-block-read-console-messages.patch
index 169bd0187c..643ea40539 100644
--- a/recipes/linux/linux-omap-2.6.37rc/0005-mmc-don-t-display-single-block-read-console-messages.patch
+++ b/recipes/linux/linux-omap-2.6.37rc/0006-mmc-don-t-display-single-block-read-console-messages.patch
@@ -1,7 +1,7 @@
-From d7fd875f1885b184c8c9f9145a9a00cc40af1c1b Mon Sep 17 00:00:00 2001
+From c0f7625ced4a0aa2cc0f0317ec2f1ef5a63b79e1 Mon Sep 17 00:00:00 2001
 From: Steve Sakoman <steve@sakoman.com>
 Date: Mon, 4 Jan 2010 19:20:25 -0800
-Subject: [PATCH 05/14] mmc: don't display single block read console messages
+Subject: [PATCH 06/11] mmc: don't display single block read console messages
 
 mmc: don't display single block read console messages
 ---
diff --git a/recipes/linux/linux-omap-2.6.37rc/0006-MTD-silence-ecc-errors-on-mtdblock0.patch b/recipes/linux/linux-omap-2.6.37rc/0007-MTD-silence-ecc-errors-on-mtdblock0.patch
index d909fff925..7327a41efe 100644
--- a/recipes/linux/linux-omap-2.6.37rc/0006-MTD-silence-ecc-errors-on-mtdblock0.patch
+++ b/recipes/linux/linux-omap-2.6.37rc/0007-MTD-silence-ecc-errors-on-mtdblock0.patch
@@ -1,7 +1,7 @@
-From d7a2fe3f2304b3ad49e1f406565038fc3d8834e6 Mon Sep 17 00:00:00 2001
+From 82fc365dde8758566ac3817c8a037711724b56b1 Mon Sep 17 00:00:00 2001
 From: Steve Sakoman <steve@sakoman.com>
 Date: Mon, 26 Apr 2010 11:17:26 -0700
-Subject: [PATCH 06/14] MTD: silence ecc errors on mtdblock0
+Subject: [PATCH 07/11] MTD: silence ecc errors on mtdblock0
 
 mtdblock0 is the x-load partition, which uses hw ecc
 this confuses linux, which uses sw ecc
diff --git a/recipes/linux/linux-omap-2.6.37rc/0007-Miracle-patch.patch b/recipes/linux/linux-omap-2.6.37rc/0008-Miracle-patch.patch
index 2d1cb0e617..d8e4c741fa 100644
--- a/recipes/linux/linux-omap-2.6.37rc/0007-Miracle-patch.patch
+++ b/recipes/linux/linux-omap-2.6.37rc/0008-Miracle-patch.patch
@@ -1,7 +1,7 @@
-From 27f26e95a6cb18d2afc103c6b17bde7d79a95c01 Mon Sep 17 00:00:00 2001
+From f7410950ad86e2b70fca1b02e4c4097fe9280bef Mon Sep 17 00:00:00 2001
 From: Mike Galbraith <efault@gmx.de>
 Date: Fri, 19 Nov 2010 12:52:42 +0100
-Subject: [PATCH 07/14] Miracle patch
+Subject: [PATCH 08/11] Miracle patch
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -126,10 +126,10 @@ index cdd2a6e..b79a8fb 100644
  			on "Classic" PPC cores.
  
 diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
-index c05c5af..5698038 100644
+index 35480dd..1849f4a 100644
 --- a/drivers/tty/tty_io.c
 +++ b/drivers/tty/tty_io.c
-@@ -3160,6 +3160,7 @@ static void __proc_set_tty(struct task_struct *tsk, struct tty_struct *tty)
+@@ -3169,6 +3169,7 @@ static void __proc_set_tty(struct task_struct *tsk, struct tty_struct *tty)
  	put_pid(tsk->signal->tty_old_pgrp);
  	tsk->signal->tty = tty_kref_get(tty);
  	tsk->signal->tty_old_pgrp = NULL;
diff --git a/recipes/linux/linux-omap-2.6.37rc/0008-ARM-OMAP-add-omap_rev_-macros.patch b/recipes/linux/linux-omap-2.6.37rc/0009-ARM-OMAP-add-omap_rev_-macros.patch
index 4260282e29..405e30c03b 100644
--- a/recipes/linux/linux-omap-2.6.37rc/0008-ARM-OMAP-add-omap_rev_-macros.patch
+++ b/recipes/linux/linux-omap-2.6.37rc/0009-ARM-OMAP-add-omap_rev_-macros.patch
@@ -1,7 +1,7 @@
-From 020068c783093a74ef15086afc6405e44676bbd2 Mon Sep 17 00:00:00 2001
+From 85ea664bbf0410eb8132be8427874761113457bc Mon Sep 17 00:00:00 2001
 From: Koen Kooi <koen@dominion.thruhere.net>
 Date: Tue, 23 Nov 2010 11:40:20 +0100
-Subject: [PATCH 08/14] ARM: OMAP: add omap_rev_* macros
+Subject: [PATCH 09/11] ARM: OMAP: add omap_rev_* macros
 
 This is just to make the SGX modules build that depend on omap_rev_lt_3_0
 
diff --git a/recipes/linux/linux-omap-2.6.37rc/0010-OMAP-DSS2-enable-hsclk-in-dsi_pll_init-for-OMAP36XX.patch b/recipes/linux/linux-omap-2.6.37rc/0010-OMAP-DSS2-enable-hsclk-in-dsi_pll_init-for-OMAP36XX.patch
index 224d43be10..7594c0309a 100644
--- a/recipes/linux/linux-omap-2.6.37rc/0010-OMAP-DSS2-enable-hsclk-in-dsi_pll_init-for-OMAP36XX.patch
+++ b/recipes/linux/linux-omap-2.6.37rc/0010-OMAP-DSS2-enable-hsclk-in-dsi_pll_init-for-OMAP36XX.patch
@@ -1,7 +1,7 @@
-From 033209b9aceb9a2dc395e70f49eee9f7b406bb90 Mon Sep 17 00:00:00 2001
+From 99db14dd71d9681b52647edaffefd5dd951b1672 Mon Sep 17 00:00:00 2001
 From: Steve Sakoman <steve@sakoman.com>
 Date: Mon, 10 May 2010 20:44:09 -0700
-Subject: [PATCH 10/14] OMAP: DSS2: enable hsclk in dsi_pll_init for OMAP36XX
+Subject: [PATCH 10/11] OMAP: DSS2: enable hsclk in dsi_pll_init for OMAP36XX
 
 Signed-off-by: Koen Kooi <koen@beagleboard.org>
 ---
diff --git a/recipes/linux/linux-omap-2.6.37rc/0012-AM37x-Switch-SGX-clocks-to-200MHz.patch b/recipes/linux/linux-omap-2.6.37rc/0011-AM37x-Switch-SGX-clocks-to-200MHz.patch
index af27af617b..e4bfc63138 100644
--- a/recipes/linux/linux-omap-2.6.37rc/0012-AM37x-Switch-SGX-clocks-to-200MHz.patch
+++ b/recipes/linux/linux-omap-2.6.37rc/0011-AM37x-Switch-SGX-clocks-to-200MHz.patch
@@ -1,7 +1,7 @@
-From 2f7fbd88fbaf05433fc5a6e6a6c2897246a67af6 Mon Sep 17 00:00:00 2001
+From f98795ac746eb6681738e56fc8df0f126bfd5f2f Mon Sep 17 00:00:00 2001
 From: Prabindh Sundareson <prabu@ti.com>
 Date: Thu, 3 Jun 2010 11:20:57 +0530
-Subject: [PATCH 12/14] AM37x: Switch SGX clocks to 200MHz
+Subject: [PATCH 11/11] AM37x: Switch SGX clocks to 200MHz
 
 Signed-off-by: Prabindh Sundareson <prabu@ti.com>
 Signed-off-by: Koen Kooi <koen@beagleboard.org>
@@ -10,7 +10,7 @@ Signed-off-by: Koen Kooi <koen@beagleboard.org>
  1 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/arch/arm/mach-omap2/clock3xxx_data.c b/arch/arm/mach-omap2/clock3xxx_data.c
-index a8c8c7a..a56f8e9 100644
+index 0579604..f394b4f 100644
 --- a/arch/arm/mach-omap2/clock3xxx_data.c
 +++ b/arch/arm/mach-omap2/clock3xxx_data.c
 @@ -3267,8 +3267,8 @@ static struct omap_clk omap3xxx_clks[] = {
diff --git a/recipes/linux/linux-omap-2.6.37rc/0011-omap3-Increase-limit-on-bootarg-mpurate.patch b/recipes/linux/linux-omap-2.6.37rc/0011-omap3-Increase-limit-on-bootarg-mpurate.patch
deleted file mode 100644
index 1cdf7a645f..0000000000
--- a/recipes/linux/linux-omap-2.6.37rc/0011-omap3-Increase-limit-on-bootarg-mpurate.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From cf1744b32411e18b41aa0de370c50057b577f4c7 Mon Sep 17 00:00:00 2001
-From: Sanjeev Premi <premi@ti.com>
-Date: Thu, 29 Apr 2010 14:09:42 +0530
-Subject: [PATCH 11/14] omap3: Increase limit on bootarg 'mpurate'
-
-The value of mpurate is currently expected to be less
-than 1000 when specified in MHz.
-
-This patch raises this limit to 2000 to support 1GHz
-capable processors. The new limit should be reasonable
-for quite some time.
-
-Signed-off-by: Koen Kooi <koen@beagleboard.org>
----
- arch/arm/plat-omap/clock.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/arch/arm/plat-omap/clock.c b/arch/arm/plat-omap/clock.c
-index fc62fb5..f3e3d29 100644
---- a/arch/arm/plat-omap/clock.c
-+++ b/arch/arm/plat-omap/clock.c
-@@ -181,7 +181,7 @@ static int __init omap_clk_setup(char *str)
- 	if (!mpurate)
- 		return 1;
- 
--	if (mpurate < 1000)
-+	if (mpurate < 2000)
- 		mpurate *= 1000000;
- 
- 	return 1;
--- 
-1.6.6.1
-
diff --git a/recipes/linux/linux-omap-2.6.37rc/0013-ARM-OMAP-Beagle-clarify-CAM_EN-power.patch b/recipes/linux/linux-omap-2.6.37rc/0013-ARM-OMAP-Beagle-clarify-CAM_EN-power.patch
deleted file mode 100644
index c637421e1e..0000000000
--- a/recipes/linux/linux-omap-2.6.37rc/0013-ARM-OMAP-Beagle-clarify-CAM_EN-power.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From ba1cb56e706e5a7291eb43f3a3cc566def5a4e28 Mon Sep 17 00:00:00 2001
-From: Koen Kooi <koen@dominion.thruhere.net>
-Date: Sun, 5 Dec 2010 13:23:04 +0100
-Subject: [PATCH 13/14] ARM: OMAP: Beagle: clarify CAM_EN power
-
-Signed-off-by: Koen Kooi <koen@beagleboard.org>
----
- arch/arm/mach-omap2/board-omap3beagle.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
-index f63f319..c3f8b69 100644
---- a/arch/arm/mach-omap2/board-omap3beagle.c
-+++ b/arch/arm/mach-omap2/board-omap3beagle.c
-@@ -417,7 +417,7 @@ static int beagle_twl_gpio_setup(struct device *dev,
- 		gpio_direction_output(gpio + 1, 0);
- 	}
- 
--	/* Power on camera interface */
-+	/* Power on camera interface on P7/P8 or DVI on A2 and beyond */
- 	if (omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XM) {
- 		gpio_request(gpio + 2, "CAM_EN");
- 		gpio_direction_output(gpio + 2, 1);
--- 
-1.6.6.1
-
diff --git a/recipes/linux/linux-omap_2.6.37rc.bb b/recipes/linux/linux-omap_2.6.37rc.bb
index 72fb17a68d..6bf1cc87d6 100644
--- a/recipes/linux/linux-omap_2.6.37rc.bb
+++ b/recipes/linux/linux-omap_2.6.37rc.bb
@@ -6,9 +6,9 @@ KERNEL_IMAGETYPE = "uImage"
 COMPATIBLE_MACHINE = "beagleboard"
 
 # The main PR is now using MACHINE_KERNEL_PR, for omap3 see conf/machine/include/omap3.inc
-PV = "2.6.36+2.6.37-rc4"
-MACHINE_KERNEL_PR_append = "b+gitr${SRCREV}"
-SRCREV = "a04fd22204b13ce34a3f8a8157f83c44d64f8da9"
+PV = "2.6.36+2.6.37-rc5"
+MACHINE_KERNEL_PR_append = "a+gitr${SRCREV}"
+SRCREV = "f306749fced39b0c71d191ca53a1d4350477df64"
 
 FILESPATHPKG_prepend = "linux-omap-2.6.37rc:"
 
@@ -16,20 +16,17 @@ SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.g
 	   file://defconfig"
 
 SRC_URI_append = " \
-                  file://0001-ARM-OMAP-beagleboard-Add-infrastructure-to-do-fixups.patch \
-                  file://0002-modedb.c-add-proper-720p60-mode.patch \
-                  file://0003-ARM-OMAP-fix-USB-initialization-for-beagleboard-xM.patch \
-                  file://0004-ARM-OMAP-Power-on-EHCI-serial-camera-and-DVI-on-beag.patch \
-                  file://0005-mmc-don-t-display-single-block-read-console-messages.patch \
-                  file://0006-MTD-silence-ecc-errors-on-mtdblock0.patch \
-                  file://0007-Miracle-patch.patch \
-                  file://0008-ARM-OMAP-add-omap_rev_-macros.patch \
-                  file://0009-omap-Beagle-detect-new-xM-revision-B.patch \
+                  file://0001-ARM-OMAP-Power-on-EHCI-serial-camera-and-DVI-on-beag.patch \
+                  file://0002-omap-Beagle-detect-new-xM-revision-B.patch \
+                  file://0003-ARM-OMAP-beagleboard-Add-infrastructure-to-do-fixups.patch \
+                  file://0004-ARM-OMAP-beagleboard-pre-export-GPIOs-to-userspace-w.patch \
+                  file://0005-modedb.c-add-proper-720p60-mode.patch \
+                  file://0006-mmc-don-t-display-single-block-read-console-messages.patch \
+                  file://0007-MTD-silence-ecc-errors-on-mtdblock0.patch \
+                  file://0008-Miracle-patch.patch \
+                  file://0009-ARM-OMAP-add-omap_rev_-macros.patch \
                   file://0010-OMAP-DSS2-enable-hsclk-in-dsi_pll_init-for-OMAP36XX.patch \
-#                  file://0011-omap3-Increase-limit-on-bootarg-mpurate.patch \
-                  file://0012-AM37x-Switch-SGX-clocks-to-200MHz.patch \
-                  file://0013-ARM-OMAP-Beagle-clarify-CAM_EN-power.patch \
-                  file://0014-ARM-OMAP-beagleboard-pre-export-GPIOs-to-userspace-w.patch \
+                  file://0011-AM37x-Switch-SGX-clocks-to-200MHz.patch \
 "
 
 SRC_URI_append_beagleboard = " file://logo_linux_clut224.ppm \