diff mbox

[Maverick,ti-omap4] SRU: Fix blaze board crash with tiwlan package installed

Message ID 4CC19542.90903@ti.com
State Accepted
Delegated to: Tim Gardner
Headers show

Commit Message

Sebastien Jan Oct. 22, 2010, 1:44 p.m. UTC 
On 10/22/2010 03:32 PM, Tim Gardner wrote:
> Methinks y'all are forgetting the patch that defines
> machine_is_omap4_panda().
>
> /home/rtg/maverick/kern/ubuntu-maverick/arch/arm/mach-omap2/board-4430sdp-wifi.c:
> In function 'sdp4430_wifi_init':
> /home/rtg/maverick/kern/ubuntu-maverick/arch/arm/mach-omap2/board-4430sdp-wifi.c:132:
> error: implicit declaration of function 'machine_is_omap4_panda'

Right, sorry for that, I already had this line in my testing branch...

Here is the fixed patch, + checked compilation on ti-omap4 branch.

 From eb27da7160e112bc206ef6e75824cffd1ec6ce07 Mon Sep 17 00:00:00 2001
From: Sebastien Jan <s-jan@ti.com>
Date: Mon, 18 Oct 2010 18:00:55 +0200
Subject: [PATCH v2] wlan: register wlan device only on pandaboard

Registering the wlan device on blaze triggers the loading
of user-space wlan drivers for 1271 chip. These user-space
drivers are not compatible with the 1283 chip of the blaze and
cause a kernel crash.

The event is the same whatever the wlan controller, which
prevents managing different wlan drivers in user-space.

This patch registers the wlan device only on pandaboard.
Long term, we would like to generate different events depending
on the wlan controller.

Signed-off-by: Sebastien Jan <s-jan@ti.com>
---
  arch/arm/mach-omap2/board-4430sdp-wifi.c |    4 +++-
  1 files changed, 3 insertions(+), 1 deletions(-)
diff mbox

Patch

From eb27da7160e112bc206ef6e75824cffd1ec6ce07 Mon Sep 17 00:00:00 2001
From: Sebastien Jan <s-jan@ti.com>
Date: Mon, 18 Oct 2010 18:00:55 +0200
Subject: [PATCH v2] wlan: register wlan device only on pandaboard

Registering the wlan device on blaze triggers the loading
of user-space wlan drivers for 1271 chip. These user-space
drivers are not compatible with the 1283 chip of the blaze and
cause a kernel crash.

The event is the same whatever the wlan controller, which
prevents managing different wlan drivers in user-space.

This patch registers the wlan device only on pandaboard.
Long term, we would like to generate different events depending
on the wlan controller.

Signed-off-by: Sebastien Jan <s-jan@ti.com>
---
 arch/arm/mach-omap2/board-4430sdp-wifi.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/arch/arm/mach-omap2/board-4430sdp-wifi.c b/arch/arm/mach-omap2/board-4430sdp-wifi.c
index aa731ef..63da1b7 100644
--- a/arch/arm/mach-omap2/board-4430sdp-wifi.c
+++ b/arch/arm/mach-omap2/board-4430sdp-wifi.c
@@ -25,6 +25,7 @@ 
 
 #include <asm/gpio.h>
 #include <asm/io.h>
+#include <asm/mach-types.h>
 #include <plat/wifi_tiwlan.h>
 
 #define SDP4430_WIFI_PMENA_GPIO	 43
@@ -129,7 +130,8 @@  static int __init sdp4430_wifi_init(void)
 	}
 	gpio_direction_input(SDP4430_WIFI_IRQ_GPIO);
 #ifdef CONFIG_WIFI_CONTROL_FUNC
-	ret = platform_device_register(&sdp4430_wifi_device);
+	if (machine_is_omap4_panda())
+		ret = platform_device_register(&sdp4430_wifi_device);
 #endif
 out:
 	return ret;
-- 
1.7.0.4