omap3-pandora-kernel: Rebase patches for latest GIT head.

[openpandora.oe.git] / recipes / linux / omap3-pandora-kernel / 0001-SDIO-patches-to-put-some-card-into-into-platform-dev.patch

diff --git a/recipes/linux/omap3-pandora-kernel/0001-SDIO-patches-to-put-some-card-into-into-platform-dev.patch b/recipes/linux/omap3-pandora-kernel/0001-SDIO-patches-to-put-some-card-into-into-platform-dev.patch
index af2c689..0c2c404 100755 (executable)
--- a/recipes/linux/omap3-pandora-kernel/0001-SDIO-patches-to-put-some-card-into-into-platform-dev.patch
+++ b/recipes/linux/omap3-pandora-kernel/0001-SDIO-patches-to-put-some-card-into-into-platform-dev.patch
@@ -1,7 +1,7 @@
-From 6531593a263a254edcf1effbf132ead1aa5e4654 Mon Sep 17 00:00:00 2001
+From 5800973aa82858036239b232e16d63796ba0de95 Mon Sep 17 00:00:00 2001
 From: David-John Willis <John.Willis@Distant-earth.com>
 Date: Mon, 22 Jun 2009 20:49:31 +0100
-Subject: [PATCH] SDIO patches to put some card into into platform devices (hack) to match WL1251 driver.
+Subject: [PATCH 1/4] SDIO patches to put some card into into platform devices (hack) to match WL1251 driver.
 
 ---
  arch/arm/include/asm/mach/mmc.h          |   10 ++++++
@@ -51,10 +51,10 @@ index 4da332b..4df7955
 diff --git a/arch/arm/mach-omap2/board-omap3pandora.c b/arch/arm/mach-omap2/board-omap3pandora.c
 old mode 100644
 new mode 100755
-index 6e4b207..031ad2d
+index 88bc884..6585a15
 --- a/arch/arm/mach-omap2/board-omap3pandora.c
 +++ b/arch/arm/mach-omap2/board-omap3pandora.c
-@@ -35,6 +35,8 @@
+@@ -36,6 +36,8 @@
  #include <linux/mtd/nand.h>
  #include <linux/mtd/partitions.h>
  
@@ -63,7 +63,7 @@ index 6e4b207..031ad2d
  #include <asm/mach-types.h>
  #include <asm/mach/arch.h>
  #include <asm/mach/flash.h>
-@@ -58,6 +60,10 @@
+@@ -59,6 +61,10 @@
  #define GPMC_CS0_BASE  0x60
  #define GPMC_CS_SIZE   0x30
  
@@ -74,7 +74,7 @@ index 6e4b207..031ad2d
  static struct mtd_partition omap3pandora_nand_partitions[] = {
        {
                .name           = "xloader",
-@@ -446,12 +452,56 @@ static struct platform_device bt_device = {
+@@ -489,6 +495,49 @@ static struct platform_device bt_device = {
        },
  };
  
@@ -124,9 +124,10 @@ index 6e4b207..031ad2d
  static struct platform_device *omap3pandora_devices[] __initdata = {
        &omap3pandora_lcd_device,
        &omap3pandora_leds_gpio,
-       &bt_device,
+@@ -496,6 +545,7 @@ static struct platform_device *omap3pandora_devices[] __initdata = {
        &omap3pandora_bl,
        &omap3pandora_dss_device,
+       &pandora_leds_pwm,
 +    &pandora_wifi,
  };