r3594 - branches/src/target/kernel/2.6.24.x/patches

laforge at sita.openmoko.org laforge at sita.openmoko.org
Thu Dec 6 11:50:47 CET 2007


Author: laforge
Date: 2007-12-06 11:50:42 +0100 (Thu, 06 Dec 2007)
New Revision: 3594

Modified:
   branches/src/target/kernel/2.6.24.x/patches/gta02-core.patch
Log:
sync with svn commit r3213 from 2.6.22.x patchset: 
* GTA02: work around a race condition between usb detection and pmu driver
* GTA02: add (untested) wifi power-up code statically at boot time


Modified: branches/src/target/kernel/2.6.24.x/patches/gta02-core.patch
===================================================================
--- branches/src/target/kernel/2.6.24.x/patches/gta02-core.patch	2007-12-06 10:42:10 UTC (rev 3593)
+++ branches/src/target/kernel/2.6.24.x/patches/gta02-core.patch	2007-12-06 10:50:42 UTC (rev 3594)
@@ -2,7 +2,7 @@
 ===================================================================
 --- /dev/null
 +++ linux-2.6/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -0,0 +1,643 @@
+@@ -0,0 +1,663 @@
 +/*
 + * 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);
 +}
 +
@@ -612,6 +618,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);
 +
@@ -631,6 +650,7 @@
 +	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, IRQF_DISABLED, "modem",
 +		    NULL);





More information about the commitlog mailing list