linux-omap 2.6.37: update WL1271 patch to register platform data

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

diff --git a/recipes/linux/linux-omap-2.6.37/base/0013-omap3-beagleboard-add-WIP-support-for-beagleboardtoy.patch b/recipes/linux/linux-omap-2.6.37/base/0013-omap3-beagleboard-add-WIP-support-for-beagleboardtoy.patch
index 017a024..1bb7e63 100644 (file)
--- a/recipes/linux/linux-omap-2.6.37/base/0013-omap3-beagleboard-add-WIP-support-for-beagleboardtoy.patch
+++ b/recipes/linux/linux-omap-2.6.37/base/0013-omap3-beagleboard-add-WIP-support-for-beagleboardtoy.patch
@@ -1,4 +1,4 @@
-From 92cbd878f5b92d915dadb5bed412eb013141fdfe Mon Sep 17 00:00:00 2001
+From 554ec2d3959b1cc942337b67560bfb9c7b91f645 Mon Sep 17 00:00:00 2001
 From: Koen Kooi <koen@beagleboard.org>
 Date: Mon, 20 Dec 2010 11:57:56 +0100
 Subject: [PATCH 13/28] omap3: beagleboard: add WIP support for beagleboardtoys WL12xx board
@@ -7,11 +7,11 @@ 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(-)
+ arch/arm/mach-omap2/board-omap3beagle.c |   76 +++++++++++++++++++++++++++++++
+ 1 files changed, 76 insertions(+), 0 deletions(-)
 
 diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
-index 64a181e..f699701 100644
+index 64a181e..f6c8152 100644
 --- a/arch/arm/mach-omap2/board-omap3beagle.c
 +++ b/arch/arm/mach-omap2/board-omap3beagle.c
 @@ -146,6 +146,67 @@ fail0:
@@ -97,6 +97,21 @@ index 64a181e..f699701 100644
  
        /* link regulators to MMC adapters */
        beagle_vmmc1_supply.dev = mmc[0].dev;
+@@ -788,6 +856,14 @@ static void __init omap3_beagle_init(void)
+               gpio_export(162, 1);
+       }
+ 
++      if(!strcmp(expansionboard_name, "fixme-beagletoy"))
++      {
++              if (wl12xx_set_platform_data(&omap_beagle_wlan_data))
++                      pr_err("error setting wl12xx data\n");
++              printk(KERN_INFO "Beagle expansionboard: registering wl12xx platform device\n");
++              platform_device_register(&omap_vwlan_device);
++      }
++
+       usb_musb_init(&musb_board_data);
+       usb_ehci_init(&ehci_pdata);
+       omap3beagle_flash_init();
 -- 
 1.6.6.1