linux-omap 2.6.37rc: update SRCREV and add more machines

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

17 files changed, 158 insertions, 78 deletions

diff --git a/recipes/linux/linux-omap-2.6.37rc/0001-ARM-OMAP-Power-on-EHCI-serial-camera-and-DVI-on-beag.patch b/recipes/linux/linux-omap-2.6.37rc/0001-ARM-OMAP-Power-on-EHCI-serial-camera-and-DVI-on-beag.patch
index 265711fff4..27b9cccea6 100644
--- a/recipes/linux/linux-omap-2.6.37rc/0001-ARM-OMAP-Power-on-EHCI-serial-camera-and-DVI-on-beag.patch
+++ b/recipes/linux/linux-omap-2.6.37rc/0001-ARM-OMAP-Power-on-EHCI-serial-camera-and-DVI-on-beag.patch
@@ -1,20 +1,15 @@
-From d48c64139caa1e374fffe10141068df04f3b0536 Mon Sep 17 00:00:00 2001
+From 71b7d633e566195b065e09e97164bec046ca7b6d 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 v2] ARM: OMAP: Power on EHCI, serial, camera and DVI on 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>
-
 ---
-
-Changes since v1:
-	* Reenable the PMU stat LED
-
  arch/arm/mach-omap2/board-omap3beagle.c |   26 ++++++++++++++++++++++++--
  1 files changed, 24 insertions(+), 2 deletions(-)
 
 diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
-index f1a8ede..4756ac7 100644
+index 6c12760..6e8a1b9 100644
 --- a/arch/arm/mach-omap2/board-omap3beagle.c
 +++ b/arch/arm/mach-omap2/board-omap3beagle.c
 @@ -297,13 +297,35 @@ static int beagle_twl_gpio_setup(struct device *dev,
diff --git a/recipes/linux/linux-omap-2.6.37rc/0002-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 7450bec6c3..5cc2582167 100644
--- a/recipes/linux/linux-omap-2.6.37rc/0002-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,4 +1,4 @@
-From 4ff497659816b4f6d558a2fb96e3f9bfe10c05ff Mon Sep 17 00:00:00 2001
+From 60e119550f5a782c512c19d86a08313ae2ffa876 Mon Sep 17 00:00:00 2001
 From: Robert Nelson <robertcnelson@gmail.com>
 Date: Tue, 9 Nov 2010 08:34:55 -0600
 Subject: [PATCH 02/11] omap: Beagle: detect new xM revision B
@@ -12,7 +12,7 @@ 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 4756ac7..2ad28c9 100644
+index 6e8a1b9..be8c4ec 100644
 --- a/arch/arm/mach-omap2/board-omap3beagle.c
 +++ b/arch/arm/mach-omap2/board-omap3beagle.c
 @@ -58,7 +58,8 @@
diff --git a/recipes/linux/linux-omap-2.6.37rc/0003-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 8b49db1144..10167f77a7 100644
--- a/recipes/linux/linux-omap-2.6.37rc/0003-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,4 +1,4 @@
-From be8aed2c51dec505bcf4cacf2a805268740200b2 Mon Sep 17 00:00:00 2001
+From 72657e1ec88da91b772c7158c4c987b29d274ece 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 03/11] ARM: OMAP: beagleboard: Add infrastructure to do fixups based on expansionboard name passed by u-boot
@@ -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 2ad28c9..bb13ca2 100644
+index be8c4ec..495be15 100644
 --- a/arch/arm/mach-omap2/board-omap3beagle.c
 +++ b/arch/arm/mach-omap2/board-omap3beagle.c
 @@ -21,6 +21,7 @@
@@ -164,7 +164,7 @@ index 2ad28c9..bb13ca2 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));
-@@ -582,6 +689,15 @@ static struct omap_musb_board_data musb_board_data = {
+@@ -583,6 +690,15 @@ static struct omap_musb_board_data musb_board_data = {
  	.power			= 100,
  };
  
@@ -180,7 +180,7 @@ index 2ad28c9..bb13ca2 100644
  static void __init omap3_beagle_init(void)
  {
  	omap3_mux_init(board_mux, OMAP_PACKAGE_CBB);
-@@ -596,6 +712,24 @@ static void __init omap3_beagle_init(void)
+@@ -597,6 +713,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 2ad28c9..bb13ca2 100644
  	usb_musb_init(&musb_board_data);
  	usb_ehci_init(&ehci_pdata);
  	omap3beagle_flash_init();
-@@ -607,6 +741,8 @@ static void __init omap3_beagle_init(void)
+@@ -608,6 +742,8 @@ static void __init omap3_beagle_init(void)
  	beagle_display_init();
  }
  
diff --git a/recipes/linux/linux-omap-2.6.37rc/0004-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 50909760e0..f52fe2ed5c 100644
--- a/recipes/linux/linux-omap-2.6.37rc/0004-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,4 +1,4 @@
-From 7525475b1a7799035b69c2c039eeea9c14a986ef Mon Sep 17 00:00:00 2001
+From 6f80e6f5205a429951244e690952f192b78d15a8 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 04/11] ARM: OMAP: beagleboard: pre-export GPIOs to userspace when using a Tincantools trainerboard
@@ -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 bb13ca2..074d138 100644
+index 495be15..34f2132 100644
 --- a/arch/arm/mach-omap2/board-omap3beagle.c
 +++ b/arch/arm/mach-omap2/board-omap3beagle.c
-@@ -730,6 +730,37 @@ static void __init omap3_beagle_init(void)
+@@ -731,6 +731,37 @@ static void __init omap3_beagle_init(void)
  		mmc[1].gpio_cd = 162;
  	}
  
diff --git a/recipes/linux/linux-omap-2.6.37rc/0005-modedb.c-add-proper-720p60-mode.patch b/recipes/linux/linux-omap-2.6.37rc/0005-modedb.c-add-proper-720p60-mode.patch
index dbdf9511b0..8059d24942 100644
--- a/recipes/linux/linux-omap-2.6.37rc/0005-modedb.c-add-proper-720p60-mode.patch
+++ b/recipes/linux/linux-omap-2.6.37rc/0005-modedb.c-add-proper-720p60-mode.patch
@@ -1,4 +1,4 @@
-From f4ad137e2db56975adb534d40cac148cf3cc3fea Mon Sep 17 00:00:00 2001
+From ea2b3d705162f8a1622e60da27b2b5b31ad3abe7 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 05/11] modedb.c: add proper 720p60 mode
diff --git a/recipes/linux/linux-omap-2.6.37rc/0006-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 b1812535e9..f19aba3ea8 100644
--- a/recipes/linux/linux-omap-2.6.37rc/0006-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,4 +1,4 @@
-From c0da6149be97cfe2924395534312844575c16e90 Mon Sep 17 00:00:00 2001
+From 2036f80d16c1df22b00953f4d2e2457eef00a82d Mon Sep 17 00:00:00 2001
 From: Steve Sakoman <steve@sakoman.com>
 Date: Mon, 4 Jan 2010 19:20:25 -0800
 Subject: [PATCH 06/11] mmc: don't display single block read console messages
diff --git a/recipes/linux/linux-omap-2.6.37rc/0007-MTD-silence-ecc-errors-on-mtdblock0.patch b/recipes/linux/linux-omap-2.6.37rc/0007-MTD-silence-ecc-errors-on-mtdblock0.patch
index bf4428489b..f5f2ef6a1a 100644
--- a/recipes/linux/linux-omap-2.6.37rc/0007-MTD-silence-ecc-errors-on-mtdblock0.patch
+++ b/recipes/linux/linux-omap-2.6.37rc/0007-MTD-silence-ecc-errors-on-mtdblock0.patch
@@ -1,4 +1,4 @@
-From 74b66c1642ad0840472e7de4023284b15dc815ff Mon Sep 17 00:00:00 2001
+From 793eb265af99817165bc03ae96adaaf6e4860dca Mon Sep 17 00:00:00 2001
 From: Steve Sakoman <steve@sakoman.com>
 Date: Mon, 26 Apr 2010 11:17:26 -0700
 Subject: [PATCH 07/11] MTD: silence ecc errors on mtdblock0
diff --git a/recipes/linux/linux-omap-2.6.37rc/0008-Miracle-patch.patch b/recipes/linux/linux-omap-2.6.37rc/0008-Miracle-patch.patch
index 637c714b81..67b1ff0a36 100644
--- a/recipes/linux/linux-omap-2.6.37rc/0008-Miracle-patch.patch
+++ b/recipes/linux/linux-omap-2.6.37rc/0008-Miracle-patch.patch
@@ -1,4 +1,4 @@
-From ab08efe84b1362ffda7afb929fdb299bb00a55a2 Mon Sep 17 00:00:00 2001
+From 31949867bace7945acd3ec10c822e6988613aed7 Mon Sep 17 00:00:00 2001
 From: Mike Galbraith <efault@gmx.de>
 Date: Fri, 19 Nov 2010 12:52:42 +0100
 Subject: [PATCH 08/11] Miracle patch
@@ -113,7 +113,7 @@ Signed-off-by: Mike Galbraith <efault@gmx.de>
  create mode 100644 kernel/sched_autogroup.h
 
 diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
-index cdd2a6e..b79a8fb 100644
+index 8b61c93..9408728 100644
 --- a/Documentation/kernel-parameters.txt
 +++ b/Documentation/kernel-parameters.txt
 @@ -1622,6 +1622,8 @@ and is between 256 and 4096 characters. It is defined in the file
@@ -138,7 +138,7 @@ index 35480dd..1849f4a 100644
  
  static void proc_set_tty(struct task_struct *tsk, struct tty_struct *tty)
 diff --git a/include/linux/sched.h b/include/linux/sched.h
-index 2c79e92..1e677c2 100644
+index 2238745..3a775e3 100644
 --- a/include/linux/sched.h
 +++ b/include/linux/sched.h
 @@ -509,6 +509,8 @@ struct thread_group_cputimer {
@@ -205,7 +205,7 @@ index c972899..a4985d9 100644
  	bool
  
 diff --git a/kernel/fork.c b/kernel/fork.c
-index 3b159c5..b6f2475 100644
+index 5447dc7..70ea75f 100644
 --- a/kernel/fork.c
 +++ b/kernel/fork.c
 @@ -174,8 +174,10 @@ static inline void free_signal_struct(struct signal_struct *sig)
@@ -220,7 +220,7 @@ index 3b159c5..b6f2475 100644
  }
  
  void __put_task_struct(struct task_struct *tsk)
-@@ -904,6 +906,7 @@ static int copy_signal(unsigned long clone_flags, struct task_struct *tsk)
+@@ -905,6 +907,7 @@ static int copy_signal(unsigned long clone_flags, struct task_struct *tsk)
  	posix_cpu_timers_init_group(sig);
  
  	tty_audit_fork(sig);
@@ -229,7 +229,7 @@ index 3b159c5..b6f2475 100644
  	sig->oom_adj = current->signal->oom_adj;
  	sig->oom_score_adj = current->signal->oom_score_adj;
 diff --git a/kernel/sched.c b/kernel/sched.c
-index dc91a4d..b4ed496 100644
+index 297d1a0..53ff9a1 100644
 --- a/kernel/sched.c
 +++ b/kernel/sched.c
 @@ -78,6 +78,7 @@
@@ -256,7 +256,7 @@ index dc91a4d..b4ed496 100644
  }
  
  /* Change a task's cfs_rq and parent entity if it moves across CPUs/groups */
-@@ -2006,6 +2010,7 @@ static void sched_irq_time_avg_update(struct rq *rq, u64 curr_irq_time) { }
+@@ -2063,6 +2067,7 @@ static void update_rq_clock_task(struct rq *rq, s64 delta)
  #include "sched_idletask.c"
  #include "sched_fair.c"
  #include "sched_rt.c"
@@ -264,7 +264,7 @@ index dc91a4d..b4ed496 100644
  #include "sched_stoptask.c"
  #ifdef CONFIG_SCHED_DEBUG
  # include "sched_debug.c"
-@@ -7979,7 +7984,7 @@ void __init sched_init(void)
+@@ -8164,7 +8169,7 @@ void __init sched_init(void)
  #ifdef CONFIG_CGROUP_SCHED
  	list_add(&init_task_group.list, &task_groups);
  	INIT_LIST_HEAD(&init_task_group.children);
@@ -273,7 +273,7 @@ index dc91a4d..b4ed496 100644
  #endif /* CONFIG_CGROUP_SCHED */
  
  #if defined CONFIG_FAIR_GROUP_SCHED && defined CONFIG_SMP
-@@ -8509,15 +8514,11 @@ void sched_destroy_group(struct task_group *tg)
+@@ -8694,15 +8699,11 @@ void sched_destroy_group(struct task_group *tg)
  /* change task's runqueue when it moves between groups.
   *	The caller of this function should have put the task in its new group
   *	by now. This function just updates tsk->se.cfs_rq and tsk->se.parent to
@@ -291,7 +291,7 @@ index dc91a4d..b4ed496 100644
  
  	running = task_current(rq, tsk);
  	on_rq = tsk->se.on_rq;
-@@ -8538,7 +8539,15 @@ void sched_move_task(struct task_struct *tsk)
+@@ -8723,7 +8724,15 @@ void sched_move_task(struct task_struct *tsk)
  		tsk->sched_class->set_curr_task(rq);
  	if (on_rq)
  		enqueue_task(rq, tsk, 0);
diff --git a/recipes/linux/linux-omap-2.6.37rc/0009-ARM-OMAP-add-omap_rev_-macros.patch b/recipes/linux/linux-omap-2.6.37rc/0009-ARM-OMAP-add-omap_rev_-macros.patch
index fac32c4434..61057274ad 100644
--- a/recipes/linux/linux-omap-2.6.37rc/0009-ARM-OMAP-add-omap_rev_-macros.patch
+++ b/recipes/linux/linux-omap-2.6.37rc/0009-ARM-OMAP-add-omap_rev_-macros.patch
@@ -1,4 +1,4 @@
-From 09cd8d4547576b788461de5254d53c83171bebe5 Mon Sep 17 00:00:00 2001
+From 1beed5ee3301a9756c8cd2672d487c568c562e81 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 09/11] ARM: OMAP: add omap_rev_* macros
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 a4a6029666..9b66242cbd 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,4 +1,4 @@
-From 919babbcde4fa8d5224ccf35c6bb68c3c97f7f76 Mon Sep 17 00:00:00 2001
+From f051874f829ed2e2462c0e64c28e28bd6f942f2d 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/11] OMAP: DSS2: enable hsclk in dsi_pll_init for OMAP36XX
diff --git a/recipes/linux/linux-omap-2.6.37rc/0011-AM37x-Switch-SGX-clocks-to-200MHz.patch b/recipes/linux/linux-omap-2.6.37rc/0011-AM37x-Switch-SGX-clocks-to-200MHz.patch
deleted file mode 100644
index 8adf6aa37f..0000000000
--- a/recipes/linux/linux-omap-2.6.37rc/0011-AM37x-Switch-SGX-clocks-to-200MHz.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 169f78033b2700b787dc03080094004aabab836c Mon Sep 17 00:00:00 2001
-From: Prabindh Sundareson <prabu@ti.com>
-Date: Thu, 3 Jun 2010 11:20:57 +0530
-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>
----
- arch/arm/mach-omap2/clock3xxx_data.c |    4 ++--
- 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 c16253f..9e0582d 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[] = {
- 	CLK(NULL,	"gfx_l3_ick",	&gfx_l3_ick,	CK_3430ES1),
- 	CLK(NULL,	"gfx_cg1_ck",	&gfx_cg1_ck,	CK_3430ES1),
- 	CLK(NULL,	"gfx_cg2_ck",	&gfx_cg2_ck,	CK_3430ES1),
--	CLK(NULL,	"sgx_fck",	&sgx_fck,	CK_3430ES2 | CK_3517),
--	CLK(NULL,	"sgx_ick",	&sgx_ick,	CK_3430ES2 | CK_3517),
-+	CLK(NULL,	"sgx_fck",	&sgx_fck,	CK_3430ES2 | CK_3517 | CK_36XX),
-+	CLK(NULL,	"sgx_ick",	&sgx_ick,	CK_3430ES2 | CK_3517 | CK_36XX),
- 	CLK(NULL,	"d2d_26m_fck",	&d2d_26m_fck,	CK_3430ES1),
- 	CLK(NULL,	"modem_fck",	&modem_fck,	CK_343X),
- 	CLK(NULL,	"sad2d_ick",	&sad2d_ick,	CK_343X),
--- 
-1.6.6.1
-
diff --git a/recipes/linux/linux-omap-2.6.37rc/0011-omap3-beagleboard-add-WIP-support-for-beagleboardtoy.patch b/recipes/linux/linux-omap-2.6.37rc/0011-omap3-beagleboard-add-WIP-support-for-beagleboardtoy.patch
new file mode 100644
index 0000000000..c42d93059e
--- /dev/null
+++ b/recipes/linux/linux-omap-2.6.37rc/0011-omap3-beagleboard-add-WIP-support-for-beagleboardtoy.patch
@@ -0,0 +1,102 @@
+From 18333339fe5e104c2ddfb2688989a15df0e0f94c Mon Sep 17 00:00:00 2001
+From: Koen Kooi <koen@beagleboard.org>
+Date: Mon, 20 Dec 2010 11:57:56 +0100
+Subject: [PATCH 11/11] omap3: beagleboard: add WIP support for beagleboardtoys WL12xx board
+
+Based on a patch by Luciano Coelho <luciano.coelho@nokia.com>
+
+Signed-off-by: Koen Kooi <koen@beagleboard.org>
+---
+ arch/arm/mach-omap2/board-omap3beagle.c |   68 +++++++++++++++++++++++++++++++
+ 1 files changed, 68 insertions(+), 0 deletions(-)
+
+diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
+index 34f2132..073276b 100644
+--- a/arch/arm/mach-omap2/board-omap3beagle.c
++++ b/arch/arm/mach-omap2/board-omap3beagle.c
+@@ -146,6 +146,67 @@ fail0:
+ 
+ char expansionboard_name[16];
+ 
++#if defined(CONFIG_WL1271) || defined(CONFIG_WL1271_MODULE)
++#include <linux/regulator/fixed.h>
++#include <linux/wl12xx.h>
++
++#define OMAP_BEAGLE_WLAN_EN_GPIO    (139)
++#define OMAP_BEAGLE_WLAN_IRQ_GPIO   (137)
++
++struct wl12xx_platform_data omap_beagle_wlan_data __initdata = {
++	.irq = OMAP_GPIO_IRQ(OMAP_BEAGLE_WLAN_IRQ_GPIO),
++	.board_ref_clock = 2, /* 38.4 MHz */
++};
++
++ static struct omap2_hsmmc_info mmcbbt[] = {
++ 	{
++ 		.mmc		= 1,
++ 		.caps		= MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA,
++ 		.gpio_wp	= 29,
++ 	},
++	{
++		.name           = "wl1271",
++		.mmc            = 2,
++		.caps		= MMC_CAP_4_BIT_DATA,
++		.gpio_wp        = -EINVAL,
++		.gpio_cd        = -EINVAL,
++		.nonremovable   = true,
++	},
++ 	{}	/* Terminator */
++ };
++
++static struct regulator_consumer_supply beagle_vmmc2_supply = {
++	.supply         = "vmmc",
++	.dev_name       = "mmci-omap-hs.1",
++};
++
++static struct regulator_init_data beagle_vmmc2 = {
++	.constraints = {
++		.valid_ops_mask = REGULATOR_CHANGE_STATUS,
++	},
++	.num_consumer_supplies = 1,
++	.consumer_supplies = &beagle_vmmc2_supply,
++};
++
++static struct fixed_voltage_config beagle_vwlan = {
++	.supply_name = "vwl1271",
++	.microvolts = 1800000,  /* 1.8V */
++	.gpio = OMAP_BEAGLE_WLAN_EN_GPIO,
++	.startup_delay = 70000, /* 70ms */
++	.enable_high = 1,
++	.enabled_at_boot = 0,
++	.init_data = &beagle_vmmc2,
++};
++
++static struct platform_device omap_vwlan_device = {
++	.name           = "reg-fixed-voltage",
++	.id             = 1,
++	.dev = {
++		.platform_data = &beagle_vwlan,
++	},
++};
++#endif
++
+ #if defined(CONFIG_ENC28J60) || defined(CONFIG_ENC28J60_MODULE)
+ 
+ #include <plat/mcspi.h>
+@@ -382,7 +443,14 @@ static int beagle_twl_gpio_setup(struct device *dev,
+ 	}
+ 	/* gpio + 0 is "mmc0_cd" (input/IRQ) */
+ 	mmc[0].gpio_cd = gpio + 0;
++#if defined(CONFIG_WL1271) || defined(CONFIG_WL1271_MODULE)
++	if(!strcmp(expansionboard_name, "fixme-beagletoy")) 
++		omap2_hsmmc_init(mmcbbt);
++	else
++		omap2_hsmmc_init(mmc);
++#else
+ 	omap2_hsmmc_init(mmc);
++#endif
+ 
+ 	/* link regulators to MMC adapters */
+ 	beagle_vmmc1_supply.dev = mmc[0].dev;
+-- 
+1.6.6.1
+
diff --git a/recipes/linux/linux-omap-2.6.37rc/beagleboard/defconfig b/recipes/linux/linux-omap-2.6.37rc/beagleboard/defconfig
index 0064da09af..ffda441fdb 100644
--- a/recipes/linux/linux-omap-2.6.37rc/beagleboard/defconfig
+++ b/recipes/linux/linux-omap-2.6.37rc/beagleboard/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux/arm 2.6.37-rc5 Kernel Configuration
-# Mon Dec 13 10:45:25 2010
+# Linux/arm 2.6.37-rc7 Kernel Configuration
+# Wed Dec 29 11:57:49 2010
 #
 CONFIG_ARM=y
 CONFIG_HAVE_PWM=y
@@ -279,6 +279,8 @@ CONFIG_ARCH_OMAP2PLUS=y
 #
 # OMAP Feature Selections
 #
+CONFIG_OMAP_SMARTREFLEX=y
+CONFIG_OMAP_SMARTREFLEX_CLASS3=y
 CONFIG_OMAP_RESET_CLOCKS=y
 # CONFIG_OMAP_MUX is not set
 CONFIG_OMAP_MCBSP=y
@@ -310,16 +312,16 @@ CONFIG_MACH_OMAP3_BEAGLE=y
 # CONFIG_MACH_OMAP_LDP is not set
 # CONFIG_MACH_OMAP3530_LV_SOM is not set
 # CONFIG_MACH_OMAP3_TORPEDO is not set
-# CONFIG_MACH_OVERO is not set
-# CONFIG_MACH_OMAP3EVM is not set
+CONFIG_MACH_OVERO=y
+CONFIG_MACH_OMAP3EVM=y
 # CONFIG_MACH_OMAP3517EVM is not set
 # CONFIG_MACH_CRANEBOARD is not set
 # CONFIG_MACH_OMAP3_PANDORA is not set
-# CONFIG_MACH_OMAP3_TOUCHBOOK is not set
+CONFIG_MACH_OMAP3_TOUCHBOOK=y
 # CONFIG_MACH_OMAP_3430SDP is not set
 # CONFIG_MACH_NOKIA_RM680 is not set
 # CONFIG_MACH_NOKIA_RX51 is not set
-# CONFIG_MACH_OMAP_ZOOM2 is not set
+CONFIG_MACH_OMAP_ZOOM2=y
 # CONFIG_MACH_OMAP_ZOOM3 is not set
 # CONFIG_MACH_CM_T35 is not set
 # CONFIG_MACH_CM_T3517 is not set
@@ -481,6 +483,8 @@ CONFIG_SUSPEND_FREEZER=y
 # CONFIG_APM_EMULATION is not set
 CONFIG_PM_RUNTIME=y
 CONFIG_PM_OPS=y
+CONFIG_ARCH_HAS_OPP=y
+CONFIG_PM_OPP=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
 CONFIG_NET=y
 
@@ -1266,7 +1270,7 @@ CONFIG_MICREL_PHY=m
 # CONFIG_MDIO_BITBANG is not set
 CONFIG_NET_ETHERNET=y
 # CONFIG_AX88796 is not set
-# CONFIG_SMC91X is not set
+CONFIG_SMC91X=y
 # CONFIG_TI_DAVINCI_EMAC is not set
 CONFIG_TI_DAVINCI_MDIO=m
 CONFIG_TI_DAVINCI_CPDMA=m
@@ -1441,6 +1445,7 @@ CONFIG_INPUT_KEYBOARD=y
 CONFIG_KEYBOARD_QT2160=m
 # CONFIG_KEYBOARD_LKKBD is not set
 CONFIG_KEYBOARD_GPIO=y
+# CONFIG_KEYBOARD_GPIO_POLLED is not set
 # CONFIG_KEYBOARD_TCA6416 is not set
 # CONFIG_KEYBOARD_MATRIX is not set
 # CONFIG_KEYBOARD_LM8323 is not set
@@ -1818,7 +1823,7 @@ CONFIG_MFD_TPS6586X=y
 CONFIG_REGULATOR=y
 # CONFIG_REGULATOR_DEBUG is not set
 CONFIG_REGULATOR_DUMMY=y
-# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
+CONFIG_REGULATOR_FIXED_VOLTAGE=y
 # CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
 # CONFIG_REGULATOR_USERSPACE_CONSUMER is not set
 # CONFIG_REGULATOR_BQ24022 is not set
@@ -2337,7 +2342,7 @@ CONFIG_SND_PCM_OSS_PLUGINS=y
 CONFIG_SND_SEQUENCER_OSS=y
 CONFIG_SND_HRTIMER=m
 CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
-# CONFIG_SND_DYNAMIC_MINORS is not set
+CONFIG_SND_DYNAMIC_MINORS=y
 CONFIG_SND_SUPPORT_OLD_API=y
 CONFIG_SND_VERBOSE_PROCFS=y
 # CONFIG_SND_VERBOSE_PRINTK is not set
@@ -2364,7 +2369,10 @@ CONFIG_SND_USB_CAIAQ_INPUT=y
 CONFIG_SND_SOC=y
 CONFIG_SND_OMAP_SOC=y
 CONFIG_SND_OMAP_SOC_MCBSP=y
+CONFIG_SND_OMAP_SOC_OVERO=y
+CONFIG_SND_OMAP_SOC_OMAP3EVM=y
 CONFIG_SND_OMAP_SOC_OMAP3_BEAGLE=y
+CONFIG_SND_OMAP_SOC_ZOOM2=y
 CONFIG_SND_SOC_I2C_AND_SPI=y
 # CONFIG_SND_SOC_ALL_CODECS is not set
 CONFIG_SND_SOC_TWL4030=y
@@ -2465,7 +2473,6 @@ CONFIG_USB_MON=y
 CONFIG_USB_EHCI_HCD=y
 # CONFIG_USB_EHCI_ROOT_HUB_TT is not set
 CONFIG_USB_EHCI_TT_NEWSCHED=y
-CONFIG_USB_EHCI_HCD_OMAP=y
 # CONFIG_USB_OXU210HP_HCD is not set
 # CONFIG_USB_ISP116X_HCD is not set
 # CONFIG_USB_ISP1760_HCD is not set
@@ -2476,8 +2483,11 @@ CONFIG_USB_EHCI_HCD_OMAP=y
 # CONFIG_USB_R8A66597_HCD is not set
 # CONFIG_USB_HWA_HCD is not set
 CONFIG_USB_MUSB_HDRC=y
-# CONFIG_USB_MUSB_TUSB6010 is not set
-CONFIG_USB_MUSB_OMAP2PLUS=y
+CONFIG_USB_MUSB_SOC=y
+
+#
+# OMAP 343x high speed USB support
+#
 # CONFIG_USB_MUSB_AM35X is not set
 # CONFIG_USB_MUSB_HOST is not set
 # CONFIG_USB_MUSB_PERIPHERAL is not set
@@ -2632,7 +2642,6 @@ CONFIG_USB_GADGET_VBUS_DRAW=480
 CONFIG_USB_GADGET_SELECTED=y
 # CONFIG_USB_GADGET_OMAP is not set
 # CONFIG_USB_GADGET_R8A66597 is not set
-# CONFIG_USB_GADGET_PXA_U2O is not set
 # CONFIG_USB_GADGET_M66592 is not set
 # CONFIG_USB_GADGET_DUMMY_HCD is not set
 CONFIG_USB_GADGET_DUALSPEED=y
diff --git a/recipes/linux/linux-omap-2.6.37rc/omap3-touchbook/defconfig b/recipes/linux/linux-omap-2.6.37rc/omap3-touchbook/defconfig
new file mode 120000
index 0000000000..44e34a711f
--- /dev/null
+++ b/recipes/linux/linux-omap-2.6.37rc/omap3-touchbook/defconfig
@@ -0,0 +1 @@
+../beagleboard/defconfig
\ No newline at end of file
diff --git a/recipes/linux/linux-omap-2.6.37rc/omap3evm/defconfig b/recipes/linux/linux-omap-2.6.37rc/omap3evm/defconfig
new file mode 120000
index 0000000000..44e34a711f
--- /dev/null
+++ b/recipes/linux/linux-omap-2.6.37rc/omap3evm/defconfig
@@ -0,0 +1 @@
+../beagleboard/defconfig
\ No newline at end of file
diff --git a/recipes/linux/linux-omap-2.6.37rc/overo/defconfig b/recipes/linux/linux-omap-2.6.37rc/overo/defconfig
new file mode 120000
index 0000000000..44e34a711f
--- /dev/null
+++ b/recipes/linux/linux-omap-2.6.37rc/overo/defconfig
@@ -0,0 +1 @@
+../beagleboard/defconfig
\ No newline at end of file
diff --git a/recipes/linux/linux-omap_2.6.37rc.bb b/recipes/linux/linux-omap_2.6.37rc.bb
index 2d207a319b..dbc56078c6 100644
--- a/recipes/linux/linux-omap_2.6.37rc.bb
+++ b/recipes/linux/linux-omap_2.6.37rc.bb
@@ -7,8 +7,8 @@ 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-rc7"
-MACHINE_KERNEL_PR_append = "a+gitr${SRCREV}"
-SRCREV = "04b7dac5b85442b970838188f6338952a98aae84"
+MACHINE_KERNEL_PR_append = "b+gitr${SRCREV}"
+SRCREV = "7b6b2e84ada1eca268eac17a90f93fc6145f6146"
 
 FILESPATHPKG_prepend = "linux-omap-2.6.37rc:"
 
@@ -26,7 +26,7 @@ SRC_URI_append = " \
                   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-AM37x-Switch-SGX-clocks-to-200MHz.patch \
+                  file://0011-omap3-beagleboard-add-WIP-support-for-beagleboardtoy.patch \
 "
 
 SRC_URI_append_beagleboard = " file://logo_linux_clut224.ppm \