r1037 - trunk/src/target/kernel/patches

[laforge at sita.openmoko.org]

Author: laforge
Date: 2007-02-17 15:10:10 +0100 (Sat, 17 Feb 2007)
New Revision: 1037

Modified:
   trunk/src/target/kernel/patches/gta01-core.patch
Log:
The udc_command field is checked by the udc driver for being non-null, so we
can use the revision passed in to set the ucd_command field at initialisation
time.

Also changed gta01_udc_pullup to gta01_udc_command

Signed-off-by: Ben Dooks <ben-linux at fluff.org>


Modified: trunk/src/target/kernel/patches/gta01-core.patch
===================================================================
--- trunk/src/target/kernel/patches/gta01-core.patch	2007-02-17 14:05:52 UTC (rev 1036)
+++ trunk/src/target/kernel/patches/gta01-core.patch	2007-02-17 14:10:10 UTC (rev 1037)
@@ -33,7 +33,7 @@
 Index: linux-2.6.20/arch/arm/mach-s3c2410/mach-gta01.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.20/arch/arm/mach-s3c2410/mach-gta01.c	2007-02-17 15:02:42.000000000 +0100
++++ linux-2.6.20/arch/arm/mach-s3c2410/mach-gta01.c	2007-02-17 15:05:54.000000000 +0100
 @@ -0,0 +1,516 @@
 +/*
 + * linux/arch/arm/mach-s3c2410/mach-gta01.c
@@ -299,26 +299,22 @@
 +			  MMC_VDD_30_31|MMC_VDD_31_32|MMC_VDD_32_33,
 +};
 +
-+static void gta01_udc_pullup(enum s3c2410_udc_cmd_e cmd)
++static void gta01_udc_command(enum s3c2410_udc_cmd_e cmd)
 +{
-+	printk(KERN_DEBUG "udc: pullup(%d)\n", cmd);
++	printk(KERN_DEBUG "%s(%d)\n", __func__, cmd);
 +
-+	if (system_rev == GTA01v4_SYSTEM_REV ||
-+	    system_rev == GTA01Bv2_SYSTEM_REV ||
-+	    system_rev == GTA01Bv3_SYSTEM_REV) {
-+		switch (cmd) {
-+		case S3C2410_UDC_P_ENABLE:
-+			s3c2410_gpio_setpin(GTA01_GPIO_USB_PULLUP, 1);
-+			break;
-+		case S3C2410_UDC_P_DISABLE:
-+			s3c2410_gpio_setpin(GTA01_GPIO_USB_PULLUP, 0);
-+			break;
-+		case S3C2410_UDC_P_RESET:
-+			/* FIXME! */
-+			break;
-+		default:
-+			break;
-+		}
++	switch (cmd) {
++	case S3C2410_UDC_P_ENABLE:
++		s3c2410_gpio_setpin(GTA01_GPIO_USB_PULLUP, 1);
++		break;
++	case S3C2410_UDC_P_DISABLE:
++		s3c2410_gpio_setpin(GTA01_GPIO_USB_PULLUP, 0);
++		break;
++	case S3C2410_UDC_P_RESET:
++		/* FIXME! */
++		break;
++	default:
++		break;
 +	}
 +}
 +
@@ -351,7 +347,6 @@
 +}
 +
 +static struct s3c2410_udc_mach_info gta01_udc_cfg = {
-+	.udc_command	= gta01_udc_pullup,
 +	.vbus_draw	= gta01_udc_vbus_draw,
 +};
 +
@@ -505,6 +500,11 @@
 +
 +static void __init gta01_machine_init(void)
 +{
++	if (system_rev == GTA01v4_SYSTEM_REV ||
++	    system_rev == GTA01Bv2_SYSTEM_REV ||
++	    system_rev == GTA01Bv3_SYSTEM_REV)
++		gta01_udc_cfg.udc_command = gta01_udc_command;
++
 +	s3c_device_usb.dev.platform_data = &gta01_usb_info;
 +	s3c_device_nand.dev.platform_data = &gta01_nand_info;
 +	s3c_device_sdi.dev.platform_data = &gta01_mmc_cfg;