r3213 - trunk/src/target/kernel/patches

[laforge at sita.openmoko.org]

Author: laforge
Date: 2007-10-18 07:10:20 +0200 (Thu, 18 Oct 2007)
New Revision: 3213

Modified:
   trunk/src/target/kernel/patches/gta02-core.patch
Log:
* GTA02: work around a race condition between usb detection and pmu driver
* GTA02: add (untested) wifi power-up code statically at boot time


Modified: trunk/src/target/kernel/patches/gta02-core.patch
===================================================================
--- trunk/src/target/kernel/patches/gta02-core.patch	2007-10-18 05:09:14 UTC (rev 3212)
+++ trunk/src/target/kernel/patches/gta02-core.patch	2007-10-18 05:10:20 UTC (rev 3213)
@@ -2,7 +2,7 @@
 ===================================================================
 --- /dev/null
 +++ linux-2.6.22.5-moko/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -0,0 +1,636 @@
+@@ -0,0 +1,657 @@
 +/*
 + * linux/arch/arm/mach-s3c2440/mach-gta02.c
 + *
@@ -33,6 +33,7 @@
 +#include <linux/types.h>
 +#include <linux/interrupt.h>
 +#include <linux/list.h>
++#include <linux/delay.h>
 +#include <linux/timer.h>
 +#include <linux/init.h>
 +#include <linux/workqueue.h>
@@ -391,6 +392,11 @@
 +
 +static void __gta02_udc_vbus_draw(struct work_struct *work)
 +{
++	if (!pcf50633_global) {
++		printk(KERN_ERR "pcf50633 not initialized yet, can't change "
++		       "vbus_draw\n");
++		return;
++	}
 +	pcf50633_usb_curlim_set(pcf50633_global, gta02_udc_vbus_drawer.ma);
 +}
 +
@@ -605,6 +611,19 @@
 +	s3c24xx_udc_set_platdata(&gta02_udc_cfg);
 +	set_s3c2410ts_info(&gta02_ts_cfg);
 +
++	/* FIXME: hardcoded WLAN module power-up */
++	s3c2410_gpio_setpin(GTA02_CHIP_PWD, 0);
++	switch (system_rev) {
++	case GTA02v1_SYSTEM_REV:
++		break;
++	default:
++		s3c2410_gpio_setpin(GTA02_GPIO_nWLAN_RESET, 0);
++		udelay(2000);
++		udelay(2000);
++		s3c2410_gpio_setpin(GTA02_GPIO_nWLAN_RESET, 1);
++		break;
++	}
++
 +	platform_device_register(&gta01_button_dev);
 +	platform_device_register(&gta01_pm_gsm_dev);
 +
@@ -624,10 +643,12 @@
 +	s3c2410_gpio_cfgpin(GTA01_GPIO_LCD_RESET, S3C2410_GPIO_OUTPUT);
 +	s3c2410_gpio_setpin(GTA01_GPIO_LCD_RESET, 1);
 +
++	/* Make sure the modem can wake us up */
 +	set_irq_type(GTA02_IRQ_MODEM, IRQT_RISING);
 +	request_irq(GTA02_IRQ_MODEM, gta02_modem_irq,
 +		    SA_INTERRUPT, "modem", NULL);
 +	enable_irq_wake(GTA02_IRQ_MODEM);
++
 +}
 +
 +MACHINE_START(NEO1973_GTA02, "GTA02")
@@ -1005,7 +1026,7 @@
 ===================================================================
 --- linux-2.6.22.5-moko.orig/drivers/leds/leds-gta01.c
 +++ linux-2.6.22.5-moko/drivers/leds/leds-gta01.c
-@@ -111,7 +110,7 @@
+@@ -110,7 +110,7 @@
  	struct gta01_vib_priv *vp;
  	struct resource *r;