From 5d4ef0b6fa67bbc636aa101821034a4bbff8e4ac Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Tue, 11 Dec 2012 07:07:31 -0600
Subject: [PATCH] Beagle: rebase/cleanup expansion patchset

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
 patch.sh                                      |   8 +-
 ...-add-buddy-param-for-expansionboard-.patch |  21 +--
 .../0002-Beagle-expansion-add-zippy.patch     |  24 ++--
 .../0003-Beagle-expansion-add-zippy2.patch    |  22 ++--
 .../0004-Beagle-expansion-add-trainer.patch   |  12 +-
 ...expansion-add-CircuitCo-ulcd-Support.patch |  76 ++++-------
 .../0006-Beagle-expansion-add-wifi.patch      |  55 ++++----
 ...0007-Beagle-expansion-add-beaglefpga.patch |  18 +--
 ...=> 0008-Beagle-expansion-add-spidev.patch} |  14 +-
 ...-expansion-add-Aptina-li5m03-camera.patch} |  34 ++---
 ...xpansion-add-LSR-COM6L-Adapter-Board.patch | 121 ++++++++++++++++++
 ...expansion-limit-buddy-to-beagle-only.patch |  47 -------
 ...-add-LSR-COM6L-Adapter-Board-support.patch |  58 ---------
 ...-TiWi5-needs-26Mhz-clk-no-eeprom-use.patch |  90 -------------
 14 files changed, 249 insertions(+), 351 deletions(-)
 rename patches/omap_beagle_expansion/{0008-Enable-buddy-spidev.patch => 0008-Beagle-expansion-add-spidev.patch} (66%)
 rename patches/omap_beagle_expansion/{0009-Beagle-Camera-add-MT9P031-Aptina-image-sensor-driver.patch => 0009-Beagle-expansion-add-Aptina-li5m03-camera.patch} (86%)
 create mode 100644 patches/omap_beagle_expansion/0010-Beagle-expansion-add-LSR-COM6L-Adapter-Board.patch
 delete mode 100644 patches/omap_beagle_expansion/0010-Beagle-expansion-limit-buddy-to-beagle-only.patch
 delete mode 100644 patches/omap_beagle_expansion/0011-ARM-OMAP-Beagle-add-LSR-COM6L-Adapter-Board-support.patch
 delete mode 100644 patches/omap_beagle_expansion/0012-Beagle-Expansion-TiWi5-needs-26Mhz-clk-no-eeprom-use.patch

diff --git a/patch.sh b/patch.sh
index edfcd97c4..f1fa0b67f 100644
--- a/patch.sh
+++ b/patch.sh
@@ -271,11 +271,9 @@ omap () {
 	${git} "${DIR}/patches/omap_beagle_expansion/0005-Beagle-expansion-add-CircuitCo-ulcd-Support.patch"
 	${git} "${DIR}/patches/omap_beagle_expansion/0006-Beagle-expansion-add-wifi.patch"
 	${git} "${DIR}/patches/omap_beagle_expansion/0007-Beagle-expansion-add-beaglefpga.patch"
-	${git} "${DIR}/patches/omap_beagle_expansion/0008-Enable-buddy-spidev.patch"
-	${git} "${DIR}/patches/omap_beagle_expansion/0009-Beagle-Camera-add-MT9P031-Aptina-image-sensor-driver.patch"
-	${git} "${DIR}/patches/omap_beagle_expansion/0010-Beagle-expansion-limit-buddy-to-beagle-only.patch"
-	${git} "${DIR}/patches/omap_beagle_expansion/0011-ARM-OMAP-Beagle-add-LSR-COM6L-Adapter-Board-support.patch"
-	${git} "${DIR}/patches/omap_beagle_expansion/0012-Beagle-Expansion-TiWi5-needs-26Mhz-clk-no-eeprom-use.patch"
+	${git} "${DIR}/patches/omap_beagle_expansion/0008-Beagle-expansion-add-spidev.patch"
+	${git} "${DIR}/patches/omap_beagle_expansion/0009-Beagle-expansion-add-Aptina-li5m03-camera.patch"
+	${git} "${DIR}/patches/omap_beagle_expansion/0010-Beagle-expansion-add-LSR-COM6L-Adapter-Board.patch"
 
 	echo "dir: omap/beagle"
 	#Status: for meego guys..
diff --git a/patches/omap_beagle_expansion/0001-Beagle-expansion-add-buddy-param-for-expansionboard-.patch b/patches/omap_beagle_expansion/0001-Beagle-expansion-add-buddy-param-for-expansionboard-.patch
index 3f90b768c..2e982ab39 100644
--- a/patches/omap_beagle_expansion/0001-Beagle-expansion-add-buddy-param-for-expansionboard-.patch
+++ b/patches/omap_beagle_expansion/0001-Beagle-expansion-add-buddy-param-for-expansionboard-.patch
@@ -1,16 +1,16 @@
-From da412a43a5fa28a78831ac206a2a28dd40fe24c6 Mon Sep 17 00:00:00 2001
+From ad06241303a7a08d29f9efc9c9b202674b2eae2d Mon Sep 17 00:00:00 2001
 From: Robert Nelson <robertcnelson@gmail.com>
-Date: Mon, 10 Oct 2011 11:12:40 -0500
-Subject: [PATCH 1/9] Beagle: expansion: add buddy param for expansionboard
+Date: Tue, 11 Dec 2012 06:25:27 -0600
+Subject: [PATCH 01/10] Beagle: expansion: add buddy param for expansionboard
  names
 
 Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
 ---
- arch/arm/mach-omap2/board-omap3beagle.c |   14 ++++++++++++++
- 1 file changed, 14 insertions(+)
+ arch/arm/mach-omap2/board-omap3beagle.c |   17 +++++++++++++++++
+ 1 file changed, 17 insertions(+)
 
 diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
-index d41ab98..c1c6332 100644
+index d41ab98..dd282d5 100644
 --- a/arch/arm/mach-omap2/board-omap3beagle.c
 +++ b/arch/arm/mach-omap2/board-omap3beagle.c
 @@ -21,6 +21,7 @@
@@ -30,23 +30,26 @@ index d41ab98..c1c6332 100644
  static struct mtd_partition omap3beagle_nand_partitions[] = {
  	/* All the partition sizes are listed in terms of NAND block size */
  	{
-@@ -445,6 +448,15 @@ static struct omap_board_mux board_mux[] __initdata = {
+@@ -445,6 +448,18 @@ static struct omap_board_mux board_mux[] __initdata = {
  };
  #endif
  
 +static int __init expansionboard_setup(char *str)
 +{
++	if (!machine_is_omap3_beagle())
++		return 0;
++
 +	if (!str)
 +		return -EINVAL;
 +	strncpy(expansionboard_name, str, 16);
-+	printk(KERN_INFO "Beagle expansionboard: %s\n", expansionboard_name);
++	pr_info("Beagle expansionboard: %s\n", expansionboard_name);
 +	return 0;
 +}
 +
  static int __init beagle_opp_init(void)
  {
  	int r = 0;
-@@ -530,6 +542,8 @@ static void __init omap3_beagle_init(void)
+@@ -530,6 +545,8 @@ static void __init omap3_beagle_init(void)
  	omap_mux_init_signal("sdrc_cke1", OMAP_PIN_OUTPUT);
  }
  
diff --git a/patches/omap_beagle_expansion/0002-Beagle-expansion-add-zippy.patch b/patches/omap_beagle_expansion/0002-Beagle-expansion-add-zippy.patch
index c2cd0e83f..c0625614b 100644
--- a/patches/omap_beagle_expansion/0002-Beagle-expansion-add-zippy.patch
+++ b/patches/omap_beagle_expansion/0002-Beagle-expansion-add-zippy.patch
@@ -1,7 +1,7 @@
-From 77ed7e226774b4bdd3fc944d092d52b8770ce660 Mon Sep 17 00:00:00 2001
+From abb685e337dd8f9fcdc6cd48c914cf7efe22cf6a Mon Sep 17 00:00:00 2001
 From: Robert Nelson <robertcnelson@gmail.com>
-Date: Tue, 22 May 2012 15:04:46 -0500
-Subject: [PATCH 2/9] Beagle: expansion: add zippy
+Date: Tue, 11 Dec 2012 06:30:06 -0600
+Subject: [PATCH 02/10] Beagle: expansion: add zippy
 
 Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
 ---
@@ -9,7 +9,7 @@ Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
  1 file changed, 157 insertions(+), 6 deletions(-)
 
 diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
-index c1c6332..3ce1f93d 100644
+index dd282d5..35ad593 100644
 --- a/arch/arm/mach-omap2/board-omap3beagle.c
 +++ b/arch/arm/mach-omap2/board-omap3beagle.c
 @@ -162,6 +162,86 @@ static void __init omap3_beagle_init_rev(void)
@@ -46,7 +46,7 @@ index c1c6332..3ce1f93d 100644
 +};
 +
 +static struct platform_device omap_zippy_device = {
-+	.name		= "reg-fixed-voltage",
++	.name	= "reg-fixed-voltage",
 +	.id		= 1,
 +	.dev = {
 +		.platform_data = &beagle_vzippy,
@@ -70,8 +70,8 @@ index c1c6332..3ce1f93d 100644
 +	{
 +		.modalias		= "enc28j60",
 +		.bus_num		= 4,
-+		.chip_select		= 0,
-+		.max_speed_hz		= 20000000,
++		.chip_select	= 0,
++		.max_speed_hz	= 20000000,
 +		.controller_data	= &enc28j60_spi_chip_info,
 +	},
 +};
@@ -84,7 +84,7 @@ index c1c6332..3ce1f93d 100644
 +		omap3beagle_zippy_spi_board_info[0].irq = gpio_to_irq(OMAP3BEAGLE_GPIO_ENC28J60_IRQ);
 +		irq_set_irq_type(omap3beagle_zippy_spi_board_info[0].irq, IRQ_TYPE_EDGE_FALLING);
 +	} else {
-+		printk(KERN_ERR "could not obtain gpio for ENC28J60_IRQ\n");
++		pr_err("Beagle expansionboard: could not obtain gpio for ENC28J60_IRQ\n");
 +		return;
 +	}
 +
@@ -180,13 +180,13 @@ index c1c6332..3ce1f93d 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));
-@@ -510,10 +635,30 @@ static void __init omap3_beagle_init(void)
+@@ -513,10 +638,30 @@ static void __init omap3_beagle_init(void)
  	omap3_mux_init(board_mux, OMAP_PACKAGE_CBB);
  	omap3_beagle_init_rev();
  
 +	if (!strcmp(expansionboard_name, "zippy"))
 +	{
-+		printk(KERN_INFO "Beagle expansionboard: initializing zippy mmc\n");
++		pr_info("Beagle expansionboard: initializing zippy mmc\n");
 +		platform_device_register(&omap_zippy_device);
 +
 +		expansion_config.i2c_settings = EXPANSION_I2C_ZIPPY;
@@ -213,13 +213,13 @@ index c1c6332..3ce1f93d 100644
  
  	omap3_beagle_i2c_init();
  
-@@ -528,6 +673,12 @@ static void __init omap3_beagle_init(void)
+@@ -531,6 +676,12 @@ static void __init omap3_beagle_init(void)
  	omap_sdrc_init(mt46h32m32lf6_sdrc_params,
  				  mt46h32m32lf6_sdrc_params);
  
 +	if (!strcmp(expansionboard_name, "zippy"))
 +	{
-+		printk(KERN_INFO "Beagle expansionboard: initializing enc28j60\n");
++		pr_info("Beagle expansionboard: initializing enc28j60\n");
 +		omap3beagle_enc28j60_init();
 +	}
 +
diff --git a/patches/omap_beagle_expansion/0003-Beagle-expansion-add-zippy2.patch b/patches/omap_beagle_expansion/0003-Beagle-expansion-add-zippy2.patch
index 14e09923f..f2f6fa5ed 100644
--- a/patches/omap_beagle_expansion/0003-Beagle-expansion-add-zippy2.patch
+++ b/patches/omap_beagle_expansion/0003-Beagle-expansion-add-zippy2.patch
@@ -1,7 +1,7 @@
-From 450124a1f560566d4a4f246a83b8354b48370140 Mon Sep 17 00:00:00 2001
+From 1d42aea05fee246a7d4afdc3265c86a372f2fca0 Mon Sep 17 00:00:00 2001
 From: Robert Nelson <robertcnelson@gmail.com>
-Date: Tue, 22 May 2012 15:09:04 -0500
-Subject: [PATCH 3/9] Beagle: expansion: add zippy2
+Date: Tue, 11 Dec 2012 06:32:15 -0600
+Subject: [PATCH 03/10] Beagle: expansion: add zippy2
 
 Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
 ---
@@ -9,7 +9,7 @@ Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
  1 file changed, 47 insertions(+), 1 deletion(-)
 
 diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
-index 3ce1f93d..74554ce 100644
+index 35ad593..c762083 100644
 --- a/arch/arm/mach-omap2/board-omap3beagle.c
 +++ b/arch/arm/mach-omap2/board-omap3beagle.c
 @@ -242,6 +242,46 @@ static void __init omap3beagle_enc28j60_init(void)
@@ -30,8 +30,8 @@ index 3ce1f93d..74554ce 100644
 +	{
 +		.modalias		= "ks8851",
 +		.bus_num		= 4,
-+		.chip_select		= 0,
-+		.max_speed_hz		= 36000000,
++		.chip_select	= 0,
++		.max_speed_hz	= 36000000,
 +		.controller_data	= &ks8851_spi_chip_info,
 +	},
 +};
@@ -44,7 +44,7 @@ index 3ce1f93d..74554ce 100644
 +		omap3beagle_zippy2_spi_board_info[0].irq = gpio_to_irq(OMAP3BEAGLE_GPIO_KS8851_IRQ);
 +		irq_set_irq_type(omap3beagle_zippy2_spi_board_info[0].irq, IRQ_TYPE_EDGE_FALLING);
 +	} else {
-+		printk(KERN_ERR "could not obtain gpio for KS8851_IRQ\n");
++		pr_err("Beagle expansionboard: could not obtain gpio for KS8851_IRQ\n");
 +		return;
 +	}
 +
@@ -59,22 +59,22 @@ index 3ce1f93d..74554ce 100644
  static struct mtd_partition omap3beagle_nand_partitions[] = {
  	/* All the partition sizes are listed in terms of NAND block size */
  	{
-@@ -635,7 +675,7 @@ static void __init omap3_beagle_init(void)
+@@ -638,7 +678,7 @@ static void __init omap3_beagle_init(void)
  	omap3_mux_init(board_mux, OMAP_PACKAGE_CBB);
  	omap3_beagle_init_rev();
  
 -	if (!strcmp(expansionboard_name, "zippy"))
 +	if ((!strcmp(expansionboard_name, "zippy")) || (!strcmp(expansionboard_name, "zippy2")))
  	{
- 		printk(KERN_INFO "Beagle expansionboard: initializing zippy mmc\n");
+ 		pr_info("Beagle expansionboard: initializing zippy mmc\n");
  		platform_device_register(&omap_zippy_device);
-@@ -679,6 +719,12 @@ static void __init omap3_beagle_init(void)
+@@ -682,6 +722,12 @@ static void __init omap3_beagle_init(void)
  		omap3beagle_enc28j60_init();
  	}
  
 +	if (!strcmp(expansionboard_name, "zippy2"))
 +	{
-+		printk(KERN_INFO "Beagle expansionboard: initializing ks_8851\n");
++		pr_info("Beagle expansionboard: initializing ks_8851\n");
 +		omap3beagle_ks8851_init();
 +	}
 +
diff --git a/patches/omap_beagle_expansion/0004-Beagle-expansion-add-trainer.patch b/patches/omap_beagle_expansion/0004-Beagle-expansion-add-trainer.patch
index 04c8485b4..325bc99f3 100644
--- a/patches/omap_beagle_expansion/0004-Beagle-expansion-add-trainer.patch
+++ b/patches/omap_beagle_expansion/0004-Beagle-expansion-add-trainer.patch
@@ -1,7 +1,7 @@
-From aa3f5f8006f0c3ba62c2fc8458afee625fe05bb3 Mon Sep 17 00:00:00 2001
+From e5de14c8525445e4e77c0539a17470b08ef5cf1e Mon Sep 17 00:00:00 2001
 From: Robert Nelson <robertcnelson@gmail.com>
-Date: Tue, 22 May 2012 15:11:30 -0500
-Subject: [PATCH 4/9] Beagle: expansion: add trainer
+Date: Tue, 11 Dec 2012 06:33:24 -0600
+Subject: [PATCH 04/10] Beagle: expansion: add trainer
 
 Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
 ---
@@ -9,16 +9,16 @@ Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
  1 file changed, 31 insertions(+)
 
 diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
-index 74554ce..9809479 100644
+index c762083..c6b33e7 100644
 --- a/arch/arm/mach-omap2/board-omap3beagle.c
 +++ b/arch/arm/mach-omap2/board-omap3beagle.c
-@@ -725,6 +725,37 @@ static void __init omap3_beagle_init(void)
+@@ -728,6 +728,37 @@ static void __init omap3_beagle_init(void)
  		omap3beagle_ks8851_init();
  	}
  
 +	if (!strcmp(expansionboard_name, "trainer"))
 +	{
-+		printk(KERN_INFO "Beagle expansionboard: exporting GPIOs 130-141,162 to userspace\n");
++		pr_info("Beagle expansionboard: exporting GPIOs 130-141,162 to userspace\n");
 +		gpio_request(130, "sysfs");
 +		gpio_export(130, 1);
 +		gpio_request(131, "sysfs");
diff --git a/patches/omap_beagle_expansion/0005-Beagle-expansion-add-CircuitCo-ulcd-Support.patch b/patches/omap_beagle_expansion/0005-Beagle-expansion-add-CircuitCo-ulcd-Support.patch
index 930e5ead5..f78149790 100644
--- a/patches/omap_beagle_expansion/0005-Beagle-expansion-add-CircuitCo-ulcd-Support.patch
+++ b/patches/omap_beagle_expansion/0005-Beagle-expansion-add-CircuitCo-ulcd-Support.patch
@@ -1,7 +1,7 @@
-From c32ea0c7c8b6778f2c123da68ba23c14ab0a3118 Mon Sep 17 00:00:00 2001
+From 96bee54317a6a035fc5d4e8bb49a51f8eb0f7d03 Mon Sep 17 00:00:00 2001
 From: Robert Nelson <robertcnelson@gmail.com>
-Date: Tue, 22 May 2012 15:18:27 -0500
-Subject: [PATCH 5/9] Beagle: expansion: add CircuitCo ulcd Support
+Date: Tue, 11 Dec 2012 06:42:03 -0600
+Subject: [PATCH 05/10] Beagle: expansion: add CircuitCo ulcd Support
 
 This of a cleanup, squashed both ulcd commits into one:
 
@@ -19,12 +19,12 @@ Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
 
 Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
 ---
- arch/arm/mach-omap2/board-omap3beagle.c          |  134 ++++++++++++++++++++++
+ arch/arm/mach-omap2/board-omap3beagle.c          |  125 ++++++++++++++++++++++
  drivers/video/omap2/displays/panel-generic-dpi.c |   27 +++++
- 2 files changed, 161 insertions(+)
+ 2 files changed, 152 insertions(+)
 
 diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
-index 9809479..b9d4904 100644
+index c6b33e7..9098869 100644
 --- a/arch/arm/mach-omap2/board-omap3beagle.c
 +++ b/arch/arm/mach-omap2/board-omap3beagle.c
 @@ -42,6 +42,7 @@
@@ -52,15 +52,7 @@ index 9809479..b9d4904 100644
  };
  
  static struct gpio omap3_beagle_rev_gpios[] __initdata = {
-@@ -161,6 +166,7 @@ static void __init omap3_beagle_init_rev(void)
- }
- 
- char expansionboard_name[16];
-+char expansionboard2_name[16];
- 
- enum {
- 	EXPANSION_MMC_NONE = 0,
-@@ -171,6 +177,7 @@ enum {
+@@ -171,6 +176,7 @@ enum {
  enum {
  	EXPANSION_I2C_NONE = 0,
  	EXPANSION_I2C_ZIPPY,
@@ -68,17 +60,17 @@ index 9809479..b9d4904 100644
  };
  
  static struct {
-@@ -335,9 +342,53 @@ static struct omap_dss_device beagle_tv_device = {
+@@ -335,9 +341,53 @@ static struct omap_dss_device beagle_tv_device = {
  	.phy.venc.type = OMAP_DSS_VENC_TYPE_SVIDEO,
  };
  
 +static int beagle_enable_lcd(struct omap_dss_device *dssdev)
 +{
 +	if (gpio_is_valid(beagle_config.lcd_pwren)) {
-+		printk(KERN_INFO "%s: Enabling LCD\n", __FUNCTION__);
++		pr_info("%s: Enabling LCD\n", __FUNCTION__);
 +		gpio_set_value(beagle_config.lcd_pwren, 0);
 +	} else {
-+		printk(KERN_INFO "%s: Invalid LCD enable GPIO: %d\n",
++		pr_info("%s: Invalid LCD enable GPIO: %d\n",
 +			__FUNCTION__, beagle_config.lcd_pwren);
 +	}
 +
@@ -88,10 +80,10 @@ index 9809479..b9d4904 100644
 +static void beagle_disable_lcd(struct omap_dss_device *dssdev)
 +{
 +	if (gpio_is_valid(beagle_config.lcd_pwren)) {
-+		printk(KERN_INFO "%s: Disabling LCD\n", __FUNCTION__);
++		pr_info("%s: Disabling LCD\n", __FUNCTION__);
 +		gpio_set_value(beagle_config.lcd_pwren, 1);
 +	} else {
-+		printk(KERN_INFO "%s: Invalid LCD enable GPIO: %d\n",
++		pr_info("%s: Invalid LCD enable GPIO: %d\n",
 +			__FUNCTION__, beagle_config.lcd_pwren);
 +	}
 +
@@ -122,7 +114,7 @@ index 9809479..b9d4904 100644
  };
  
  static struct omap_dss_board_info beagle_dss_data = {
-@@ -505,6 +556,54 @@ static struct i2c_board_info __initdata zippy_i2c2_rtc[] = {
+@@ -505,6 +555,54 @@ static struct i2c_board_info __initdata zippy_i2c2_rtc[] = {
  #endif
  };
  
@@ -161,7 +153,7 @@ index 9809479..b9d4904 100644
 +
 +	r = gpio_request_one(OMAP3BEAGLE_TSC2007_GPIO, GPIOF_IN, "tsc2007_pen_down");
 +	if (r < 0) {
-+		printk(KERN_ERR "failed to request GPIO#%d for "
++		pr_err("Beagle expansionboard: failed to request GPIO#%d for "
 +		"tsc2007 pen down IRQ\n", OMAP3BEAGLE_TSC2007_GPIO);
 +		return;
 +	}
@@ -177,7 +169,7 @@ index 9809479..b9d4904 100644
  static int __init omap3_beagle_i2c_init(void)
  {
  	omap3_pmic_get_config(&beagle_twldata,
-@@ -517,6 +616,10 @@ static int __init omap3_beagle_i2c_init(void)
+@@ -517,6 +615,10 @@ static int __init omap3_beagle_i2c_init(void)
  	omap3_pmic_init("twl4030", &beagle_twldata);
  
  	switch (expansion_config.i2c_settings) {
@@ -188,27 +180,11 @@ index 9809479..b9d4904 100644
  	case EXPANSION_I2C_ZIPPY:
  		omap_register_i2c_bus(2, 400, zippy_i2c2_rtc, ARRAY_SIZE(zippy_i2c2_rtc));
  		break;
-@@ -622,6 +725,15 @@ static int __init expansionboard_setup(char *str)
- 	return 0;
- }
- 
-+static int __init expansionboard2_setup(char *str)
-+{
-+	if (!str)
-+		return -EINVAL;
-+	strncpy(expansionboard2_name, str, 16);
-+	printk(KERN_INFO "Beagle second expansionboard: %s\n", expansionboard2_name);
-+	return 0;
-+}
-+
- static int __init beagle_opp_init(void)
- {
- 	int r = 0;
-@@ -687,6 +799,21 @@ static void __init omap3_beagle_init(void)
+@@ -690,6 +792,21 @@ static void __init omap3_beagle_init(void)
  		omap_mux_init_gpio(OMAP3BEAGLE_GPIO_ZIPPY_MMC_CD, OMAP_PIN_INPUT);
  	}
  
-+	if (!strcmp(expansionboard2_name, "bbtoys-ulcd"))
++	if (!strcmp(expansionboard_name, "bbtoys-ulcd"))
 +	{
 +		int r;
 +		expansion_config.i2c_settings = EXPANSION_I2C_7ULCD;
@@ -219,34 +195,28 @@ index 9809479..b9d4904 100644
 +
 +		r = gpio_request_one(beagle_config.lcd_pwren, GPIOF_OUT_INIT_LOW, "LCD power");
 +		if (r < 0)
-+			printk(KERN_ERR "Unable to get LCD power enable GPIO\n");
++			pr_err("Beagle expansionboard: Unable to get LCD power enable GPIO\n");
 +
 +	}
 +
  	if (gpio_is_valid(beagle_config.mmc1_gpio_wp))
  		omap_mux_init_gpio(beagle_config.mmc1_gpio_wp, OMAP_PIN_INPUT);
  
-@@ -756,6 +883,12 @@ static void __init omap3_beagle_init(void)
+@@ -759,6 +876,14 @@ static void __init omap3_beagle_init(void)
  		gpio_export(162, 1);
  	}
  
-+	if (!strcmp(expansionboard2_name, "bbtoys-ulcd"))
++	if (!strcmp(expansionboard_name, "bbtoys-ulcd"))
 +	{
-+		printk(KERN_INFO "Beagle second expansionboard: initializing touchscreen: tsc2007\n");
++	#if defined(CONFIG_TOUCHSCREEN_TSC2007) || defined(CONFIG_TOUCHSCREEN_TSC2007_MODULE)
++		pr_info("Beagle expansionboard: initializing touchscreen: tsc2007\n");
 +		omap3beagle_tsc2007_init();
++	#endif
 +	}
 +
  	usb_musb_init(NULL);
  	usbhs_init(&usbhs_bdata);
  	omap_nand_flash_init(NAND_BUSWIDTH_16, omap3beagle_nand_partitions,
-@@ -771,6 +904,7 @@ static void __init omap3_beagle_init(void)
- }
- 
- early_param("buddy", expansionboard_setup);
-+early_param("buddy2", expansionboard2_setup);
- 
- MACHINE_START(OMAP3_BEAGLE, "OMAP3 Beagle Board")
- 	/* Maintainer: Syed Mohammed Khasim - http://beagleboard.org */
 diff --git a/drivers/video/omap2/displays/panel-generic-dpi.c b/drivers/video/omap2/displays/panel-generic-dpi.c
 index 88295c5..b7f296b 100644
 --- a/drivers/video/omap2/displays/panel-generic-dpi.c
diff --git a/patches/omap_beagle_expansion/0006-Beagle-expansion-add-wifi.patch b/patches/omap_beagle_expansion/0006-Beagle-expansion-add-wifi.patch
index 07b43e7d3..3beb77881 100644
--- a/patches/omap_beagle_expansion/0006-Beagle-expansion-add-wifi.patch
+++ b/patches/omap_beagle_expansion/0006-Beagle-expansion-add-wifi.patch
@@ -1,18 +1,18 @@
-From 6d416c259bd7d514368f53064e6a8794c6bcf4ff Mon Sep 17 00:00:00 2001
+From 3e5b933bd1217253fc58764ab64d14c7e480bcad Mon Sep 17 00:00:00 2001
 From: Robert Nelson <robertcnelson@gmail.com>
-Date: Tue, 22 May 2012 15:31:43 -0500
-Subject: [PATCH 6/9] Beagle: expansion: add wifi
+Date: Tue, 11 Dec 2012 06:48:52 -0600
+Subject: [PATCH 06/10] Beagle: expansion: add wifi
 
 Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
 ---
- arch/arm/mach-omap2/board-omap3beagle.c |  117 +++++++++++++++++++++++++++++++
- 1 file changed, 117 insertions(+)
+ arch/arm/mach-omap2/board-omap3beagle.c |  116 +++++++++++++++++++++++++++++++
+ 1 file changed, 116 insertions(+)
 
 diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
-index b9d4904..25819e7 100644
+index 9098869..57e9060 100644
 --- a/arch/arm/mach-omap2/board-omap3beagle.c
 +++ b/arch/arm/mach-omap2/board-omap3beagle.c
-@@ -188,6 +188,71 @@ static struct {
+@@ -187,6 +187,71 @@ static struct {
  	.i2c_settings = EXPANSION_I2C_NONE,
  };
  
@@ -27,7 +27,7 @@ index b9d4904..25819e7 100644
 +#define OMAP_BEAGLE_FM_EN_BT_WU     (136)
 +
 +struct wl12xx_platform_data omap_beagle_wlan_data __initdata = {
-+	.board_ref_clock = 2, /* 38.4 MHz */
++	.board_ref_clock = WL12XX_REFCLOCK_38, /* 38.4 MHz */
 +};
 +
 +static struct ti_st_plat_data wilink_platform_data = {
@@ -35,9 +35,9 @@ index b9d4904..25819e7 100644
 +	.dev_name		= "/dev/ttyO1",
 +	.flow_cntrl		= 1,
 +	.baud_rate		= 3000000,
-+	.chip_enable		= NULL,
++	.chip_enable	= NULL,
 +	.suspend		= NULL,
-+	.resume		= NULL,
++	.resume			= NULL,
 +};
 +
 +static struct platform_device wl12xx_device = {
@@ -84,7 +84,7 @@ index b9d4904..25819e7 100644
  //rcn-ee: this is just a fake regulator, the zippy hardware provides 3.3/1.8 with jumper..
  static struct fixed_voltage_config beagle_vzippy = {
  	.supply_name = "vzippy",
-@@ -426,6 +491,26 @@ static struct omap2_hsmmc_info mmc_zippy[] = {
+@@ -425,6 +490,26 @@ static struct omap2_hsmmc_info mmc_zippy[] = {
  	},
  	{}	/* Terminator */
  };
@@ -111,7 +111,7 @@ index b9d4904..25819e7 100644
  static struct regulator_consumer_supply beagle_vmmc1_supply[] = {
  	REGULATOR_SUPPLY("vmmc", "omap_hsmmc.0"),
  };
-@@ -442,6 +527,13 @@ static int beagle_twl_gpio_setup(struct device *dev,
+@@ -441,6 +526,13 @@ static int beagle_twl_gpio_setup(struct device *dev,
  	int r;
  
  	switch (expansion_config.mmc_settings) {
@@ -125,21 +125,20 @@ index b9d4904..25819e7 100644
  	case EXPANSION_MMC_ZIPPY:
  		mmc_zippy[0].gpio_wp = beagle_config.mmc1_gpio_wp;
  		/* gpio + 0 is "mmc0_cd" (input/IRQ) */
-@@ -799,6 +891,13 @@ static void __init omap3_beagle_init(void)
- 		omap_mux_init_gpio(OMAP3BEAGLE_GPIO_ZIPPY_MMC_CD, OMAP_PIN_INPUT);
- 	}
+@@ -804,13 +896,23 @@ static void __init omap3_beagle_init(void)
+ 		r = gpio_request_one(beagle_config.lcd_pwren, GPIOF_OUT_INIT_LOW, "LCD power");
+ 		if (r < 0)
+ 			pr_err("Beagle expansionboard: Unable to get LCD power enable GPIO\n");
++	}
  
 +#if defined(CONFIG_WL12XX) || defined(CONFIG_WL12XX_MODULE)
 +	if (!strcmp(expansionboard_name, "bbtoys-wifi"))
 +	{
 +		expansion_config.mmc_settings = EXPANSION_MMC_WIFI;
-+	}
+ 	}
 +#endif
-+
- 	if (!strcmp(expansionboard2_name, "bbtoys-ulcd"))
- 	{
- 		int r;
-@@ -818,6 +917,10 @@ static void __init omap3_beagle_init(void)
+ 
+ 	if (gpio_is_valid(beagle_config.mmc1_gpio_wp))
  		omap_mux_init_gpio(beagle_config.mmc1_gpio_wp, OMAP_PIN_INPUT);
  
  	switch (expansion_config.mmc_settings) {
@@ -150,8 +149,8 @@ index b9d4904..25819e7 100644
  	case EXPANSION_MMC_ZIPPY:
  		mmc_zippy[0].caps = beagle_config.mmc_caps;
  		omap_hsmmc_init(mmc_zippy);
-@@ -883,6 +986,20 @@ static void __init omap3_beagle_init(void)
- 		gpio_export(162, 1);
+@@ -884,6 +986,20 @@ static void __init omap3_beagle_init(void)
+ 	#endif
  	}
  
 +#if defined(CONFIG_WL12XX) || defined(CONFIG_WL12XX_MODULE)
@@ -160,17 +159,17 @@ index b9d4904..25819e7 100644
 +		omap_beagle_wlan_data.irq = gpio_to_irq(OMAP_BEAGLE_WLAN_IRQ_GPIO);
 +		if (wl12xx_set_platform_data(&omap_beagle_wlan_data))
 +			pr_err("error setting wl12xx data\n");
-+		printk(KERN_INFO "Beagle expansionboard: registering wl12xx bt platform device\n");
++		pr_info("Beagle expansionboard: registering wl12xx bt platform device\n");
 +		platform_device_register(&wl12xx_device);
 +		platform_device_register(&btwilink_device);
-+		printk(KERN_INFO "Beagle expansionboard: registering wl12xx wifi platform device\n");
++		pr_info("Beagle expansionboard: registering wl12xx wifi platform device\n");
 +		platform_device_register(&omap_vwlan_device);
 +	}
 +#endif
 +
- 	if (!strcmp(expansionboard2_name, "bbtoys-ulcd"))
- 	{
- 		printk(KERN_INFO "Beagle second expansionboard: initializing touchscreen: tsc2007\n");
+ 	usb_musb_init(NULL);
+ 	usbhs_init(&usbhs_bdata);
+ 	omap_nand_flash_init(NAND_BUSWIDTH_16, omap3beagle_nand_partitions,
 -- 
 1.7.10.4
 
diff --git a/patches/omap_beagle_expansion/0007-Beagle-expansion-add-beaglefpga.patch b/patches/omap_beagle_expansion/0007-Beagle-expansion-add-beaglefpga.patch
index f13b0b9a3..a2c12a890 100644
--- a/patches/omap_beagle_expansion/0007-Beagle-expansion-add-beaglefpga.patch
+++ b/patches/omap_beagle_expansion/0007-Beagle-expansion-add-beaglefpga.patch
@@ -1,7 +1,7 @@
-From 809bc79efc73221d88489e5c5a92fc2edb411a74 Mon Sep 17 00:00:00 2001
+From 485e4267b887eb8b55977eedc82406ed62f21f93 Mon Sep 17 00:00:00 2001
 From: Bas van der Doorn <bas@doornvd.com>
-Date: Sat, 19 May 2012 17:09:28 +0200
-Subject: [PATCH 7/9] Beagle: expansion: add beaglefpga
+Date: Tue, 11 Dec 2012 06:52:22 -0600
+Subject: [PATCH 07/10] Beagle: expansion: add beaglefpga
 
 Added SPI dev and McBSP 3 mux when FPGA is detected
 
@@ -12,7 +12,7 @@ Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
  1 file changed, 74 insertions(+)
 
 diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
-index 25819e7..a2c9be5 100644
+index 57e9060..d867a0b 100644
 --- a/arch/arm/mach-omap2/board-omap3beagle.c
 +++ b/arch/arm/mach-omap2/board-omap3beagle.c
 @@ -39,6 +39,7 @@
@@ -23,7 +23,7 @@ index 25819e7..a2c9be5 100644
  
  #include "common.h"
  #include <video/omapdss.h>
-@@ -874,6 +875,68 @@ static int __init beagle_opp_init(void)
+@@ -867,6 +868,68 @@ static int __init beagle_opp_init(void)
  }
  device_initcall(beagle_opp_init);
  
@@ -98,7 +98,7 @@ index 25819e7..a2c9be5 100644
  
 +	if (!strcmp(expansionboard_name, "beaglefpga"))
 +	{
-+		printk(KERN_INFO "Beagle FPGA expansionboard: enabling SPIdev for McSPI3/4 and pin muxing for McBSP3 slave mode\n");
++		pr_info("Beagle expansionboard: enabling SPIdev for McSPI3/4 and pin muxing for McBSP3 slave mode\n");
 +
 +		/* FPGA pin settings configure McSPI 3, McSPI 4 and McBSP 3 */
 +		omap3_beagle_config_fpga_mux();
@@ -107,9 +107,9 @@ index 25819e7..a2c9be5 100644
 +		spi_register_board_info(beagle_mcspi_board_info, ARRAY_SIZE(beagle_mcspi_board_info));
 +	}
 +
- 	if (!strcmp(expansionboard2_name, "bbtoys-ulcd"))
- 	{
- 		printk(KERN_INFO "Beagle second expansionboard: initializing touchscreen: tsc2007\n");
+ 	usb_musb_init(NULL);
+ 	usbhs_init(&usbhs_bdata);
+ 	omap_nand_flash_init(NAND_BUSWIDTH_16, omap3beagle_nand_partitions,
 -- 
 1.7.10.4
 
diff --git a/patches/omap_beagle_expansion/0008-Enable-buddy-spidev.patch b/patches/omap_beagle_expansion/0008-Beagle-expansion-add-spidev.patch
similarity index 66%
rename from patches/omap_beagle_expansion/0008-Enable-buddy-spidev.patch
rename to patches/omap_beagle_expansion/0008-Beagle-expansion-add-spidev.patch
index b6539dd6c..edcd61440 100644
--- a/patches/omap_beagle_expansion/0008-Enable-buddy-spidev.patch
+++ b/patches/omap_beagle_expansion/0008-Beagle-expansion-add-spidev.patch
@@ -1,7 +1,7 @@
-From a5e2c5218d32157fde573697f56d2520fcaea2e0 Mon Sep 17 00:00:00 2001
+From 953ac384015231add0d67636d7ecc80feca4a491 Mon Sep 17 00:00:00 2001
 From: Russell Hay <russell.hay@gmail.com>
-Date: Mon, 28 May 2012 09:45:24 -0700
-Subject: [PATCH 8/9] Enable buddy=spidev
+Date: Tue, 11 Dec 2012 06:53:58 -0600
+Subject: [PATCH 08/10] Beagle: expansion: add spidev
 
 Signed-off-by: Russell Hay <russell.hay@gmail.com>
 Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
@@ -10,16 +10,16 @@ Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
  1 file changed, 8 insertions(+)
 
 diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
-index a2c9be5..9829fb5 100644
+index d867a0b..3a79574 100644
 --- a/arch/arm/mach-omap2/board-omap3beagle.c
 +++ b/arch/arm/mach-omap2/board-omap3beagle.c
-@@ -1080,6 +1080,14 @@ static void __init omap3_beagle_init(void)
- 		omap3beagle_tsc2007_init();
+@@ -1074,6 +1074,14 @@ static void __init omap3_beagle_init(void)
+ 		spi_register_board_info(beagle_mcspi_board_info, ARRAY_SIZE(beagle_mcspi_board_info));
  	}
  
 +	if (!strcmp(expansionboard_name, "spidev"))
 +	{
-+		printk(KERN_INFO "Beagle expansionboard: registering spidev\n");
++		pr_info("Beagle expansionboard: registering spidev\n");
 +		omap3_beagle_config_mcspi3_mux();
 +		omap3_beagle_config_mcspi4_mux();
 +		spi_register_board_info(beagle_mcspi_board_info, ARRAY_SIZE(beagle_mcspi_board_info));
diff --git a/patches/omap_beagle_expansion/0009-Beagle-Camera-add-MT9P031-Aptina-image-sensor-driver.patch b/patches/omap_beagle_expansion/0009-Beagle-expansion-add-Aptina-li5m03-camera.patch
similarity index 86%
rename from patches/omap_beagle_expansion/0009-Beagle-Camera-add-MT9P031-Aptina-image-sensor-driver.patch
rename to patches/omap_beagle_expansion/0009-Beagle-expansion-add-Aptina-li5m03-camera.patch
index 2ab5d9711..8c84c8c61 100644
--- a/patches/omap_beagle_expansion/0009-Beagle-Camera-add-MT9P031-Aptina-image-sensor-driver.patch
+++ b/patches/omap_beagle_expansion/0009-Beagle-expansion-add-Aptina-li5m03-camera.patch
@@ -1,7 +1,7 @@
-From 3b6000a45e771c4a22ae160bc600feadccd7ee5e Mon Sep 17 00:00:00 2001
+From 92afb2c8e72439ca573de368b3c355b0890aae75 Mon Sep 17 00:00:00 2001
 From: Robert Nelson <robertcnelson@gmail.com>
-Date: Tue, 9 Oct 2012 16:18:13 -0500
-Subject: [PATCH 9/9] Beagle: Camera: add MT9P031 Aptina image sensor driver
+Date: Tue, 11 Dec 2012 06:58:15 -0600
+Subject: [PATCH 09/10] Beagle: expansion: add Aptina li5m03 camera
 
 Based on:
 https://github.com/Aptina/BeagleBoard-xM/blob/master/tools/0266-Adding-MT9P031-Support-files.patch
@@ -14,22 +14,22 @@ https://github.com/beagleboard/kernel/blob/beagleboard-3.2/patches/camera/0003-b
 
 Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
 ---
- arch/arm/mach-omap2/board-omap3beagle.c |  149 +++++++++++++++++++++++++++++++
- 1 file changed, 149 insertions(+)
+ arch/arm/mach-omap2/board-omap3beagle.c |  152 +++++++++++++++++++++++++++++++
+ 1 file changed, 152 insertions(+)
 
 diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
-index 9829fb5..c370d72 100644
+index 3a79574..1eccc59 100644
 --- a/arch/arm/mach-omap2/board-omap3beagle.c
 +++ b/arch/arm/mach-omap2/board-omap3beagle.c
-@@ -168,6 +168,7 @@ static void __init omap3_beagle_init_rev(void)
+@@ -167,6 +167,7 @@ static void __init omap3_beagle_init_rev(void)
+ }
  
  char expansionboard_name[16];
- char expansionboard2_name[16];
 +char camera_name[16];
  
  enum {
  	EXPANSION_MMC_NONE = 0,
-@@ -520,6 +521,14 @@ static struct regulator_consumer_supply beagle_vsim_supply[] = {
+@@ -519,6 +520,14 @@ static struct regulator_consumer_supply beagle_vsim_supply[] = {
  	REGULATOR_SUPPLY("vmmc_aux", "omap_hsmmc.0"),
  };
  
@@ -44,7 +44,7 @@ index 9829fb5..c370d72 100644
  static struct gpio_led gpio_leds[];
  
  static int beagle_twl_gpio_setup(struct device *dev,
-@@ -628,11 +637,43 @@ static struct regulator_init_data beagle_vsim = {
+@@ -627,11 +636,43 @@ static struct regulator_init_data beagle_vsim = {
  	.consumer_supplies	= beagle_vsim_supply,
  };
  
@@ -88,7 +88,7 @@ index 9829fb5..c370d72 100644
  };
  
  static struct i2c_board_info __initdata beagle_i2c_eeprom[] = {
-@@ -697,6 +738,71 @@ static struct i2c_board_info __initdata beagle_i2c2_bbtoys_ulcd[] = {};
+@@ -696,6 +737,71 @@ static struct i2c_board_info __initdata beagle_i2c2_bbtoys_ulcd[] = {};
  static void __init omap3beagle_tsc2007_init(void) { return; }
  #endif
  
@@ -160,23 +160,26 @@ index 9829fb5..c370d72 100644
  static int __init omap3_beagle_i2c_init(void)
  {
  	omap3_pmic_get_config(&beagle_twldata,
-@@ -827,6 +933,15 @@ static int __init expansionboard2_setup(char *str)
+@@ -820,6 +926,18 @@ static int __init expansionboard_setup(char *str)
  	return 0;
  }
  
 +static int __init camera_setup(char *str)
 +{
++	if (!machine_is_omap3_beagle())
++		return 0;
++
 +	if (!str)
 +		return -EINVAL;
 +	strncpy(camera_name, str, 16);
-+	printk(KERN_INFO "Beagle camera: %s\n", camera_name);
++	pr_info("Beagle camera: %s\n", camera_name);
 +	return 0;
 +}
 +
  static int __init beagle_opp_init(void)
  {
  	int r = 0;
-@@ -1102,8 +1217,42 @@ static void __init omap3_beagle_init(void)
+@@ -1096,7 +1214,41 @@ static void __init omap3_beagle_init(void)
  	omap_mux_init_signal("sdrc_cke1", OMAP_PIN_OUTPUT);
  }
  
@@ -191,7 +194,7 @@ index 9829fb5..c370d72 100644
 +#if defined(CONFIG_VIDEO_MT9P031)
 +	if ((!strcmp(camera_name, "lbcm5m1")) || (!strcmp(camera_name, "li5m03")))
 +	{
-+		pr_info("Beagle camera: MT9P031 init");
++		pr_info("Beagle camera: MT9P031 init\n");
 +
 +		reg_1v8 = regulator_get(NULL, "cam_1v8");
 +		if (IS_ERR(reg_1v8))
@@ -212,7 +215,6 @@ index 9829fb5..c370d72 100644
 +}
 +
  early_param("buddy", expansionboard_setup);
- early_param("buddy2", expansionboard2_setup);
 +early_param("camera", camera_setup);
 +
 +late_initcall(omap3_beagle_late_initcall);
diff --git a/patches/omap_beagle_expansion/0010-Beagle-expansion-add-LSR-COM6L-Adapter-Board.patch b/patches/omap_beagle_expansion/0010-Beagle-expansion-add-LSR-COM6L-Adapter-Board.patch
new file mode 100644
index 000000000..5da92e6a5
--- /dev/null
+++ b/patches/omap_beagle_expansion/0010-Beagle-expansion-add-LSR-COM6L-Adapter-Board.patch
@@ -0,0 +1,121 @@
+From b33b42fd5c739b9d7ef868b0acb81c5020a79a2b Mon Sep 17 00:00:00 2001
+From: Robert Nelson <robertcnelson@gmail.com>
+Date: Tue, 11 Dec 2012 07:02:40 -0600
+Subject: [PATCH 10/10] Beagle: expansion: add LSR COM6L Adapter Board
+
+Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
+---
+ arch/arm/mach-omap2/board-omap3beagle.c |   60 ++++++++++++++++++++++++++++---
+ 1 file changed, 55 insertions(+), 5 deletions(-)
+
+diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
+index 1eccc59..ddff957 100644
+--- a/arch/arm/mach-omap2/board-omap3beagle.c
++++ b/arch/arm/mach-omap2/board-omap3beagle.c
+@@ -168,6 +168,7 @@ static void __init omap3_beagle_init_rev(void)
+ 
+ char expansionboard_name[16];
+ char camera_name[16];
++char wl12xx_name[16];
+ 
+ enum {
+ 	EXPANSION_MMC_NONE = 0,
+@@ -203,6 +204,10 @@ struct wl12xx_platform_data omap_beagle_wlan_data __initdata = {
+ 	.board_ref_clock = WL12XX_REFCLOCK_38, /* 38.4 MHz */
+ };
+ 
++struct wl12xx_platform_data omap_beagle_wlan_data_26mhz __initdata = {
++	.board_ref_clock = WL12XX_REFCLOCK_26, /* 26 MHz */
++};
++
+ static struct ti_st_plat_data wilink_platform_data = {
+ 	.nshutdown_gpio	= OMAP_BEAGLE_BT_EN_GPIO,
+ 	.dev_name		= "/dev/ttyO1",
+@@ -938,6 +943,18 @@ static int __init camera_setup(char *str)
+ 	return 0;
+ }
+ 
++static int __init wl12xx_setup(char *str)
++{
++	if (!machine_is_omap3_beagle())
++		return 0;
++
++	if (!str)
++		return -EINVAL;
++	strncpy(wl12xx_name, str, 16);
++	pr_info("Beagle wl12xx clk: %s\n", wl12xx_name);
++	return 0;
++}
++
+ static int __init beagle_opp_init(void)
+ {
+ 	int r = 0;
+@@ -1080,8 +1097,28 @@ static void __init omap3_beagle_init(void)
+ 	}
+ 
+ #if defined(CONFIG_WL12XX) || defined(CONFIG_WL12XX_MODULE)
+-	if (!strcmp(expansionboard_name, "bbtoys-wifi"))
++	if ((!strcmp(expansionboard_name, "bbtoys-wifi")) || (!strcmp(expansionboard_name, "lsr-com6l-adpt")))
+ 	{
++		pr_info("Beagle expansion: wl12xx: setting up gpio pinmux\n");
++
++		omap_mux_init_gpio(OMAP_BEAGLE_FM_EN_BT_WU, OMAP_PIN_OUTPUT);
++		omap_mux_init_gpio(OMAP_BEAGLE_BT_EN_GPIO, OMAP_PIN_OUTPUT);
++		omap_mux_init_gpio(OMAP_BEAGLE_WLAN_EN_GPIO, OMAP_PIN_OUTPUT);
++
++		omap_mux_init_gpio(OMAP_BEAGLE_WLAN_IRQ_GPIO, OMAP_PIN_INPUT_PULLUP);
++
++		/* WLAN SDIO: MMC2 CLK */
++		omap_mux_init_signal("sdmmc2_clk.sdmmc2_clk", OMAP_PIN_INPUT_PULLUP);
++
++		/* WLAN SDIO: MMC2 CMD */
++		omap_mux_init_signal("sdmmc2_cmd.sdmmc2_cmd", OMAP_PIN_INPUT_PULLUP);
++
++		/* WLAN SDIO: MMC2 DAT[0-3] */
++		omap_mux_init_signal("sdmmc2_dat0.sdmmc2_dat0", OMAP_PIN_INPUT_PULLUP);
++		omap_mux_init_signal("sdmmc2_dat1.sdmmc2_dat1", OMAP_PIN_INPUT_PULLUP);
++		omap_mux_init_signal("sdmmc2_dat2.sdmmc2_dat2", OMAP_PIN_INPUT_PULLUP);
++		omap_mux_init_signal("sdmmc2_dat3.sdmmc2_dat3", OMAP_PIN_INPUT_PULLUP);
++
+ 		expansion_config.mmc_settings = EXPANSION_MMC_WIFI;
+ 	}
+ #endif
+@@ -1168,11 +1205,23 @@ static void __init omap3_beagle_init(void)
+ 	}
+ 
+ #if defined(CONFIG_WL12XX) || defined(CONFIG_WL12XX_MODULE)
+-	if (!strcmp(expansionboard_name, "bbtoys-wifi"))
++	if ((!strcmp(expansionboard_name, "bbtoys-wifi")) || (!strcmp(expansionboard_name, "lsr-com6l-adpt")))
+ 	{
+-		omap_beagle_wlan_data.irq = gpio_to_irq(OMAP_BEAGLE_WLAN_IRQ_GPIO);
+-		if (wl12xx_set_platform_data(&omap_beagle_wlan_data))
+-			pr_err("error setting wl12xx data\n");
++		pr_info("Beagle expansionboard: initializing wl12xx platform\n");
++
++		if (!strcmp(wl12xx_name, "wl12xx_26mhz")) {
++			pr_info("wl12xx: 26Mhz reference clock (TiWi5)\n");
++			omap_beagle_wlan_data_26mhz.irq = gpio_to_irq(OMAP_BEAGLE_WLAN_IRQ_GPIO);
++			if (wl12xx_set_platform_data(&omap_beagle_wlan_data_26mhz))
++				pr_err("error setting wl12xx data\n");
++		} else {
++			pr_info("wl12xx: 38.4Mhz reference clock (TiWi2/TiWi-BLE)\n");
++			pr_info("wl12xx: for (TiWi5) support pass kernel [wl12xx_clk=wl12xx_26mhz]\n");
++			omap_beagle_wlan_data.irq = gpio_to_irq(OMAP_BEAGLE_WLAN_IRQ_GPIO);
++			if (wl12xx_set_platform_data(&omap_beagle_wlan_data))
++				pr_err("error setting wl12xx data\n");
++		}
++
+ 		pr_info("Beagle expansionboard: registering wl12xx bt platform device\n");
+ 		platform_device_register(&wl12xx_device);
+ 		platform_device_register(&btwilink_device);
+@@ -1247,6 +1296,7 @@ static int __init omap3_beagle_late_initcall(void)
+ 
+ early_param("buddy", expansionboard_setup);
+ early_param("camera", camera_setup);
++early_param("wl12xx_clk", wl12xx_setup);
+ 
+ late_initcall(omap3_beagle_late_initcall);
+ 
+-- 
+1.7.10.4
+
diff --git a/patches/omap_beagle_expansion/0010-Beagle-expansion-limit-buddy-to-beagle-only.patch b/patches/omap_beagle_expansion/0010-Beagle-expansion-limit-buddy-to-beagle-only.patch
deleted file mode 100644
index f6da15d8c..000000000
--- a/patches/omap_beagle_expansion/0010-Beagle-expansion-limit-buddy-to-beagle-only.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From efc3c252e663c18260be00bc4587c86734c71d39 Mon Sep 17 00:00:00 2001
-From: Robert Nelson <robertcnelson@gmail.com>
-Date: Thu, 6 Dec 2012 10:00:05 -0600
-Subject: [PATCH 10/10] Beagle: expansion: limit buddy to beagle only
-
-Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
----
- arch/arm/mach-omap2/board-omap3beagle.c |    9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
-index c097e3c..21ad9d6 100644
---- a/arch/arm/mach-omap2/board-omap3beagle.c
-+++ b/arch/arm/mach-omap2/board-omap3beagle.c
-@@ -953,6 +953,9 @@ static struct omap_board_mux board_mux[] __initdata = {
- 
- static int __init expansionboard_setup(char *str)
- {
-+	if (!machine_is_omap3_beagle())
-+		return 0;
-+
- 	if (!str)
- 		return -EINVAL;
- 	strncpy(expansionboard_name, str, 16);
-@@ -962,6 +965,9 @@ static int __init expansionboard_setup(char *str)
- 
- static int __init expansionboard2_setup(char *str)
- {
-+	if (!machine_is_omap3_beagle())
-+		return 0;
-+
- 	if (!str)
- 		return -EINVAL;
- 	strncpy(expansionboard2_name, str, 16);
-@@ -971,6 +977,9 @@ static int __init expansionboard2_setup(char *str)
- 
- static int __init camera_setup(char *str)
- {
-+	if (!machine_is_omap3_beagle())
-+		return 0;
-+
- 	if (!str)
- 		return -EINVAL;
- 	strncpy(camera_name, str, 16);
--- 
-1.7.10.4
-
diff --git a/patches/omap_beagle_expansion/0011-ARM-OMAP-Beagle-add-LSR-COM6L-Adapter-Board-support.patch b/patches/omap_beagle_expansion/0011-ARM-OMAP-Beagle-add-LSR-COM6L-Adapter-Board-support.patch
deleted file mode 100644
index 2ef5dd259..000000000
--- a/patches/omap_beagle_expansion/0011-ARM-OMAP-Beagle-add-LSR-COM6L-Adapter-Board-support.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 93ec403fa4aad569fa8b29a0ffd23dfb40ddc09d Mon Sep 17 00:00:00 2001
-From: Robert Nelson <robertcnelson@gmail.com>
-Date: Mon, 10 Dec 2012 13:39:26 -0600
-Subject: [PATCH 11/11] ARM: OMAP: Beagle: add LSR COM6L Adapter Board support
-
-Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
----
- arch/arm/mach-omap2/board-omap3beagle.c |   25 +++++++++++++++++++++++--
- 1 file changed, 23 insertions(+), 2 deletions(-)
-
-diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
-index b039a0c..02e3049 100644
---- a/arch/arm/mach-omap2/board-omap3beagle.c
-+++ b/arch/arm/mach-omap2/board-omap3beagle.c
-@@ -1079,8 +1079,28 @@ static void __init omap3_beagle_init(void)
- 	}
- 
- #if defined(CONFIG_WL12XX) || defined(CONFIG_WL12XX_MODULE)
--	if (!strcmp(expansionboard_name, "bbtoys-wifi"))
-+	if ((!strcmp(expansionboard_name, "bbtoys-wifi")) || (!strcmp(expansionboard_name, "lsr-com6l-adpt")))
- 	{
-+		pr_info("Beagle expansion: wl12xx: setting up gpio pinmux\n");
-+
-+		omap_mux_init_gpio(OMAP_BEAGLE_FM_EN_BT_WU, OMAP_PIN_OUTPUT);
-+		omap_mux_init_gpio(OMAP_BEAGLE_BT_EN_GPIO, OMAP_PIN_OUTPUT);
-+		omap_mux_init_gpio(OMAP_BEAGLE_WLAN_EN_GPIO, OMAP_PIN_OUTPUT);
-+
-+		omap_mux_init_gpio(OMAP_BEAGLE_WLAN_IRQ_GPIO, OMAP_PIN_INPUT_PULLUP);
-+
-+		/* WLAN SDIO: MMC2 CLK */
-+		omap_mux_init_signal("sdmmc2_clk.sdmmc2_clk", OMAP_PIN_INPUT_PULLUP);
-+
-+		/* WLAN SDIO: MMC2 CMD */
-+		omap_mux_init_signal("sdmmc2_cmd.sdmmc2_cmd", OMAP_PIN_INPUT_PULLUP);
-+
-+		/* WLAN SDIO: MMC2 DAT[0-3] */
-+		omap_mux_init_signal("sdmmc2_dat0.sdmmc2_dat0", OMAP_PIN_INPUT_PULLUP);
-+		omap_mux_init_signal("sdmmc2_dat1.sdmmc2_dat1", OMAP_PIN_INPUT_PULLUP);
-+		omap_mux_init_signal("sdmmc2_dat2.sdmmc2_dat2", OMAP_PIN_INPUT_PULLUP);
-+		omap_mux_init_signal("sdmmc2_dat3.sdmmc2_dat3", OMAP_PIN_INPUT_PULLUP);
-+
- 		expansion_config.mmc_settings = EXPANSION_MMC_WIFI;
- 	}
- #endif
-@@ -1174,8 +1194,9 @@ static void __init omap3_beagle_init(void)
- 	}
- 
- #if defined(CONFIG_WL12XX) || defined(CONFIG_WL12XX_MODULE)
--	if (!strcmp(expansionboard_name, "bbtoys-wifi"))
-+	if ((!strcmp(expansionboard_name, "bbtoys-wifi")) || (!strcmp(expansionboard_name, "lsr-com6l-adpt")))
- 	{
-+		pr_info("Beagle expansionboard: initializing wl12xx platform\n");
- 		omap_beagle_wlan_data.irq = gpio_to_irq(OMAP_BEAGLE_WLAN_IRQ_GPIO);
- 		if (wl12xx_set_platform_data(&omap_beagle_wlan_data))
- 			pr_err("error setting wl12xx data\n");
--- 
-1.7.10.4
-
diff --git a/patches/omap_beagle_expansion/0012-Beagle-Expansion-TiWi5-needs-26Mhz-clk-no-eeprom-use.patch b/patches/omap_beagle_expansion/0012-Beagle-Expansion-TiWi5-needs-26Mhz-clk-no-eeprom-use.patch
deleted file mode 100644
index 3f1b442b2..000000000
--- a/patches/omap_beagle_expansion/0012-Beagle-Expansion-TiWi5-needs-26Mhz-clk-no-eeprom-use.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-From 915dd55e6a0303420d0918c380a6173218aa7471 Mon Sep 17 00:00:00 2001
-From: Robert Nelson <robertcnelson@gmail.com>
-Date: Mon, 10 Dec 2012 19:12:25 -0600
-Subject: [PATCH 12/12] Beagle: Expansion: TiWi5 needs 26Mhz clk, no eeprom:
- use new kernel wl12xx_clk=wl12xx_26mhz
-
-Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
----
- arch/arm/mach-omap2/board-omap3beagle.c |   37 +++++++++++++++++++++++++++----
- 1 file changed, 33 insertions(+), 4 deletions(-)
-
-diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
-index 02e3049..1534ddd 100644
---- a/arch/arm/mach-omap2/board-omap3beagle.c
-+++ b/arch/arm/mach-omap2/board-omap3beagle.c
-@@ -169,6 +169,7 @@ static void __init omap3_beagle_init_rev(void)
- char expansionboard_name[16];
- char expansionboard2_name[16];
- char camera_name[16];
-+char wl12xx_name[16];
- 
- enum {
- 	EXPANSION_MMC_NONE = 0,
-@@ -201,7 +202,11 @@ static struct {
- #define OMAP_BEAGLE_FM_EN_BT_WU     (136)
- 
- struct wl12xx_platform_data omap_beagle_wlan_data __initdata = {
--	.board_ref_clock = 2, /* 38.4 MHz */
-+	.board_ref_clock = WL12XX_REFCLOCK_38, /* 38.4 MHz */
-+};
-+
-+struct wl12xx_platform_data omap_beagle_wlan_data_26mhz __initdata = {
-+	.board_ref_clock = WL12XX_REFCLOCK_26, /* 26 MHz */
- };
- 
- static struct ti_st_plat_data wilink_platform_data = {
-@@ -951,6 +956,18 @@ static int __init camera_setup(char *str)
- 	return 0;
- }
- 
-+static int __init wl12xx_setup(char *str)
-+{
-+	if (!machine_is_omap3_beagle())
-+		return 0;
-+
-+	if (!str)
-+		return -EINVAL;
-+	strncpy(wl12xx_name, str, 16);
-+	printk(KERN_INFO "Beagle wl12xx clk: %s\n", wl12xx_name);
-+	return 0;
-+}
-+
- static int __init beagle_opp_init(void)
- {
- 	int r = 0;
-@@ -1197,9 +1214,20 @@ static void __init omap3_beagle_init(void)
- 	if ((!strcmp(expansionboard_name, "bbtoys-wifi")) || (!strcmp(expansionboard_name, "lsr-com6l-adpt")))
- 	{
- 		pr_info("Beagle expansionboard: initializing wl12xx platform\n");
--		omap_beagle_wlan_data.irq = gpio_to_irq(OMAP_BEAGLE_WLAN_IRQ_GPIO);
--		if (wl12xx_set_platform_data(&omap_beagle_wlan_data))
--			pr_err("error setting wl12xx data\n");
-+
-+		if (!strcmp(wl12xx_name, "wl12xx_26mhz")) {
-+			pr_info("wl12xx: 26Mhz reference clock (TiWi5)\n");
-+			omap_beagle_wlan_data_26mhz.irq = gpio_to_irq(OMAP_BEAGLE_WLAN_IRQ_GPIO);
-+			if (wl12xx_set_platform_data(&omap_beagle_wlan_data_26mhz))
-+				pr_err("error setting wl12xx data\n");
-+		} else {
-+			pr_info("wl12xx: 38.4Mhz reference clock (TiWi2/TiWi-BLE)\n");
-+			pr_info("wl12xx: for (TiWi5) support pass kernel [wl12xx_clk=wl12xx_26mhz]\n");
-+			omap_beagle_wlan_data.irq = gpio_to_irq(OMAP_BEAGLE_WLAN_IRQ_GPIO);
-+			if (wl12xx_set_platform_data(&omap_beagle_wlan_data))
-+				pr_err("error setting wl12xx data\n");
-+		}
-+
- 		printk(KERN_INFO "Beagle expansionboard: registering wl12xx bt platform device\n");
- 		platform_device_register(&wl12xx_device);
- 		platform_device_register(&btwilink_device);
-@@ -1281,6 +1309,7 @@ static int __init omap3_beagle_late_initcall(void)
- early_param("buddy", expansionboard_setup);
- early_param("buddy2", expansionboard2_setup);
- early_param("camera", camera_setup);
-+early_param("wl12xx_clk", wl12xx_setup);
- 
- late_initcall(omap3_beagle_late_initcall);
- 
--- 
-1.7.10.4
-
-- 
GitLab