linux: wl12xx driver does not autoload on mt100eocg-pcie-dk

1 files changed, 11 insertions, 16 deletions

diff --git a/multitech/recipes/linux/linux-2.6.39.4/mt100eocg-pcie-dk/linux-2.6.39.4-mach-at91-mt100eocg-pcie-dk.patch b/multitech/recipes/linux/linux-2.6.39.4/mt100eocg-pcie-dk/linux-2.6.39.4-mach-at91-mt100eocg-pcie-dk.patch
index 36da1a2..00fe6ba 100644
--- a/multitech/recipes/linux/linux-2.6.39.4/mt100eocg-pcie-dk/linux-2.6.39.4-mach-at91-mt100eocg-pcie-dk.patch
+++ b/multitech/recipes/linux/linux-2.6.39.4/mt100eocg-pcie-dk/linux-2.6.39.4-mach-at91-mt100eocg-pcie-dk.patch
@@ -1,7 +1,7 @@
 Index: linux-2.6.39.4/arch/arm/mach-at91/at91sam9260_devices.c
 ===================================================================
 --- linux-2.6.39.4.orig/arch/arm/mach-at91/at91sam9260_devices.c	2011-08-03 14:43:28.000000000 -0500
-+++ linux-2.6.39.4/arch/arm/mach-at91/at91sam9260_devices.c	2012-09-10 12:33:08.656010481 -0500
++++ linux-2.6.39.4/arch/arm/mach-at91/at91sam9260_devices.c	2013-04-10 12:05:56.478657961 -0500
 @@ -183,9 +183,9 @@
  		at91_set_B_periph(AT91_PIN_PA25, 0);	/* ERX2 */
  		at91_set_B_periph(AT91_PIN_PA26, 0);	/* ERX3 */
@@ -35,7 +35,7 @@ Index: linux-2.6.39.4/arch/arm/mach-at91/at91sam9260_devices.c
 Index: linux-2.6.39.4/arch/arm/mach-at91/board-sam9g20ek.c
 ===================================================================
 --- linux-2.6.39.4.orig/arch/arm/mach-at91/board-sam9g20ek.c	2011-08-03 14:43:28.000000000 -0500
-+++ linux-2.6.39.4/arch/arm/mach-at91/board-sam9g20ek.c	2012-09-10 12:37:02.306005503 -0500
++++ linux-2.6.39.4/arch/arm/mach-at91/board-sam9g20ek.c	2013-04-16 17:25:39.173271597 -0500
 @@ -30,6 +30,12 @@
  #include <linux/regulator/machine.h>
  #include <linux/regulator/fixed.h>
@@ -120,7 +120,7 @@ Index: linux-2.6.39.4/arch/arm/mach-at91/board-sam9g20ek.c
  	at91sam9260_init_interrupts(NULL);
  }
  
-@@ -97,10 +151,37 @@
+@@ -97,11 +151,38 @@
   * USB Device port
   */
  static struct at91_udc_data __initdata ek_udc_data = {
@@ -128,9 +128,9 @@ Index: linux-2.6.39.4/arch/arm/mach-at91/board-sam9g20ek.c
 -	.pullup_pin	= 0,		/* pull-up driven by UDC */
 +	.vbus_pin	= AT91_PIN_PC12,
 +	.pullup_pin	= 0,			/* pull-up driven by UDC */
-+};
-+
-+
+ };
+ 
+ 
 +#define MTS_EXT_AT25_TEST		0
 +#if MTS_EXT_AT25_TEST
 +static struct spi_eeprom at25040b = {
@@ -149,17 +149,18 @@ Index: linux-2.6.39.4/arch/arm/mach-at91/board-sam9g20ek.c
 +		.offset	= 0x00000000,
 +		.size	= MTDPART_SIZ_FULL,
 +	},
- };
- 
++};
++
 +static struct flash_platform_data m25_spi_flash_data = {
 +	.type		= "sst25vf080b",
 +	.nr_parts	= ARRAY_SIZE(m25_partitions),
 +	.parts		= m25_partitions,
 +};
 +#endif
- 
++
  /*
   * SPI devices.
+  */
 @@ -122,6 +203,54 @@
  	},
  #endif
@@ -380,7 +381,7 @@ Index: linux-2.6.39.4/arch/arm/mach-at91/board-sam9g20ek.c
  
  static void __init ek_board_init(void)
  {
-@@ -401,7 +600,22 @@
+@@ -401,7 +600,16 @@
  	/* PCK0 provides MCLK to the WM8731 */
  	at91_set_B_periph(AT91_PIN_PC1, 0);
  	/* SSC (for WM8731) */
@@ -395,12 +396,6 @@ Index: linux-2.6.39.4/arch/arm/mach-at91/board-sam9g20ek.c
 +
 +	if (wl12xx_set_platform_data(&at91_wl12xx_wlan_data))
 +		pr_err("error setting wl12xx data\n");
-+
-+	/* configure WLAN_EN as output and enable chip */
-+	at91_set_gpio_output_with_pullup(WL12XX_ENABLE_PIN, 0, 0);
-+	mdelay(10);
-+	at91_set_gpio_output_with_pullup(WL12XX_ENABLE_PIN, 1, 0);
-+	mdelay(100);
  }
  
  MACHINE_START(AT91SAM9G20EK, "Atmel AT91SAM9G20-EK")