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

laforge at sita.openmoko.org laforge at sita.openmoko.org
Tue Dec 18 11:24:04 CET 2007


Author: laforge
Date: 2007-12-18 11:24:02 +0100 (Tue, 18 Dec 2007)
New Revision: 3673

Modified:
   branches/src/target/kernel/2.6.24.x/patches/gta01-backlight.patch
   branches/src/target/kernel/2.6.24.x/patches/gta01-core.patch
   branches/src/target/kernel/2.6.24.x/patches/gta01-inputdevice.patch
   branches/src/target/kernel/2.6.24.x/patches/gta01-jbt6k74.patch
   branches/src/target/kernel/2.6.24.x/patches/gta01-pcf50606.patch
   branches/src/target/kernel/2.6.24.x/patches/gta01-power_control.patch
   branches/src/target/kernel/2.6.24.x/patches/gta01-vibrator.patch
   branches/src/target/kernel/2.6.24.x/patches/gta02-core.patch
   branches/src/target/kernel/2.6.24.x/patches/neo1973-soc-include-fix.patch
Log:
fix various coding style issues as discovered by checkpatch.pl


Modified: branches/src/target/kernel/2.6.24.x/patches/gta01-backlight.patch
===================================================================
--- branches/src/target/kernel/2.6.24.x/patches/gta01-backlight.patch	2007-12-18 09:49:36 UTC (rev 3672)
+++ branches/src/target/kernel/2.6.24.x/patches/gta01-backlight.patch	2007-12-18 10:24:02 UTC (rev 3673)
@@ -37,7 +37,7 @@
 ===================================================================
 --- /dev/null
 +++ linux-2.6/drivers/video/backlight/gta01_bl.c
-@@ -0,0 +1,257 @@
+@@ -0,0 +1,255 @@
 +/*
 + *  Backlight Driver for FIC GTA01 (Neo1973) GSM Phone
 + *
@@ -120,7 +120,7 @@
 +	if (gta01bl_flags & GTA01BL_BATTLOW)
 +		intensity &= bl_machinfo->limit_mask;
 +
-+ 	mutex_lock(&gta01bl.mutex);
++	mutex_lock(&gta01bl.mutex);
 +#ifdef GTA01_BACKLIGHT_ONOFF_ONLY
 +	if (intensity)
 +		s3c2410_gpio_setpin(GTA01_GPIO_BACKLIGHT, 1);
@@ -250,7 +250,6 @@
 +	       &gta01bl_prop, sizeof(gta01bl_prop));
 +	gta01bl_send_intensity(gta01_backlight_device);
 +
-+	printk("GTA01 Backlight Driver Initialized.\n");
 +	return 0;
 +}
 +
@@ -262,7 +261,6 @@
 +	backlight_device_unregister(gta01_backlight_device);
 +	mutex_destroy(&gta01bl.mutex);
 +
-+	printk("GTA01 Backlight Driver Unloaded, constant backlight\n");
 +	s3c2410_gpio_cfgpin(GTA01_GPIO_BACKLIGHT, S3C2410_GPIO_OUTPUT);
 +	s3c2410_gpio_setpin(GTA01_GPIO_BACKLIGHT, 1);
 +

Modified: branches/src/target/kernel/2.6.24.x/patches/gta01-core.patch
===================================================================
--- branches/src/target/kernel/2.6.24.x/patches/gta01-core.patch	2007-12-18 09:49:36 UTC (rev 3672)
+++ branches/src/target/kernel/2.6.24.x/patches/gta01-core.patch	2007-12-18 10:24:02 UTC (rev 3673)
@@ -385,7 +385,7 @@
 +static struct s3c2410fb_mach_info gta01_lcd_cfg __initdata = {
 +	.displays	= gta01_displays,
 +	.num_displays	= ARRAY_SIZE(gta01_displays),
-+	.default_display= 0,
++	.default_display = 0,
 +
 +	.lpcsel		= ((0xCE6) & ~7) | 1<<4,
 +};

Modified: branches/src/target/kernel/2.6.24.x/patches/gta01-inputdevice.patch
===================================================================
--- branches/src/target/kernel/2.6.24.x/patches/gta01-inputdevice.patch	2007-12-18 09:49:36 UTC (rev 3672)
+++ branches/src/target/kernel/2.6.24.x/patches/gta01-inputdevice.patch	2007-12-18 10:24:02 UTC (rev 3673)
@@ -39,7 +39,7 @@
 ===================================================================
 --- /dev/null
 +++ linux-2.6/drivers/input/keyboard/neo1973kbd.c
-@@ -0,0 +1,252 @@
+@@ -0,0 +1,236 @@
 +/*
 + * Keyboard driver for FIC Neo1973 GSM phone
 + *
@@ -47,6 +47,8 @@
 + * Author: Harald Welte <laforge at openmoko.org>
 + * All rights reserved.
 + *
++ * inspired by corkgbd.c by Richard Purdie
++ *
 + * This program is free software; you can redistribute it and/or modify
 + * it under the terms of the GNU General Public License version 2 as
 + * published by the Free Software Foundation.
@@ -107,9 +109,11 @@
 +
 +	/* FIXME: use GPIO from platform_dev resources */
 +	if (s3c2410_gpio_getpin(GTA01_GPIO_JACK_INSERT))
-+		input_report_switch(neo1973kbd_data->input, SW_HEADPHONE_INSERT, 1);
++		input_report_switch(neo1973kbd_data->input,
++				    SW_HEADPHONE_INSERT, 1);
 +	else
-+		input_report_switch(neo1973kbd_data->input, SW_HEADPHONE_INSERT, 0);
++		input_report_switch(neo1973kbd_data->input,
++				    SW_HEADPHONE_INSERT, 0);
 +
 +	input_sync(neo1973kbd_data->input);
 +
@@ -172,21 +176,6 @@
 +
 +	neo1973kbd->input = input_dev;
 +
-+#if 0
-+	spin_lock_init(&neo1973kbd->lock);
-+	/* Init Keyboard rescan timer */
-+	init_timer(&corgikbd->timer);
-+	corgikbd->timer.function = corgikbd_timer_callback;
-+	corgikbd->timer.data = (unsigned long) corgikbd;
-+
-+	/* Init Hinge Timer */
-+	init_timer(&corgikbd->htimer);
-+	corgikbd->htimer.function = corgikbd_hinge_timer;
-+	corgikbd->htimer.data = (unsigned long) corgikbd;
-+
-+	corgikbd->suspend_jiffies=jiffies;
-+#endif
-+
 +	input_dev->name = "Neo1973 Buttons";
 +	input_dev->phys = "neo1973kbd/input0";
 +	input_dev->id.bustype = BUS_HOST;
@@ -228,9 +217,7 @@
 +		goto out_jack;
 +	}
 +	enable_irq_wake(irq_jack);
-+#if 0
-+	mod_timer(&corgikbd->htimer, jiffies + msecs_to_jiffies(HINGE_SCAN_INTERVAL));
-+#endif
++
 +	return 0;
 +
 +out_jack:
@@ -254,10 +241,7 @@
 +	free_irq(s3c2410_gpio_getirq(pdev->resource[2].start), neo1973kbd);
 +	free_irq(s3c2410_gpio_getirq(pdev->resource[1].start), neo1973kbd);
 +	free_irq(s3c2410_gpio_getirq(pdev->resource[0].start), neo1973kbd);
-+#if 0
-+	del_timer_sync(&corgikbd->htimer);
-+	del_timer_sync(&corgikbd->timer);
-+#endif
++
 +	input_unregister_device(neo1973kbd->input);
 +	input_free_device(neo1973kbd->input);
 +	platform_set_drvdata(pdev, NULL);

Modified: branches/src/target/kernel/2.6.24.x/patches/gta01-jbt6k74.patch
===================================================================
--- branches/src/target/kernel/2.6.24.x/patches/gta01-jbt6k74.patch	2007-12-18 09:49:36 UTC (rev 3672)
+++ branches/src/target/kernel/2.6.24.x/patches/gta01-jbt6k74.patch	2007-12-18 10:24:02 UTC (rev 3673)
@@ -33,7 +33,7 @@
 ===================================================================
 --- /dev/null
 +++ linux-2.6/drivers/spi/jbt6k74.c
-@@ -0,0 +1,626 @@
+@@ -0,0 +1,628 @@
 +/* Linux kernel driver for the tpo JBT6K74-AS LCM ASIC
 + *
 + * Copyright (C) 2006-2007 by OpenMoko, Inc.
@@ -160,7 +160,8 @@
 +
 +	jbt->tx_buf[0] = JBT_COMMAND | reg;
 +
-+	rc = spi_write(jbt->spi_dev, (u_int8_t *)jbt->tx_buf, 1*sizeof(u_int16_t));
++	rc = spi_write(jbt->spi_dev, (u_int8_t *)jbt->tx_buf,
++		       1*sizeof(u_int16_t));
 +	if (rc == 0)
 +		jbt->reg_cache[reg] = 0;
 +
@@ -175,7 +176,8 @@
 +	jbt->tx_buf[0] = JBT_COMMAND | reg;
 +	jbt->tx_buf[1] = JBT_DATA | data;
 +
-+	rc = spi_write(jbt->spi_dev, (u_int8_t *)jbt->tx_buf, 2*sizeof(u_int16_t));
++	rc = spi_write(jbt->spi_dev, (u_int8_t *)jbt->tx_buf,
++		       2*sizeof(u_int16_t));
 +	if (rc == 0)
 +		jbt->reg_cache[reg] = data;
 +
@@ -190,7 +192,8 @@
 +	jbt->tx_buf[1] = JBT_DATA | (data >> 8);
 +	jbt->tx_buf[2] = JBT_DATA | (data & 0xff);
 +
-+	rc = spi_write(jbt->spi_dev, (u_int8_t *)jbt->tx_buf, 3*sizeof(u_int16_t));
++	rc = spi_write(jbt->spi_dev, (u_int8_t *)jbt->tx_buf,
++		       3*sizeof(u_int16_t));
 +	if (rc == 0)
 +		jbt->reg_cache[reg] = data;
 +
@@ -242,8 +245,7 @@
 +		rc |= jbt_reg_write16(jbt, JBT_REG_OEV_TIMING, 0x0d0e);
 +		rc |= jbt_reg_write16(jbt, JBT_REG_ASW_TIMING_1, 0x11a4);
 +		rc |= jbt_reg_write(jbt, JBT_REG_ASW_TIMING_2, 0x0e);
-+	}
-+	else {
++	} else {
 +		rc |= jbt_reg_write16(jbt, JBT_REG_HCLOCK_QVGA, 0x00ff);
 +		rc |= jbt_reg_write(jbt, JBT_REG_BLANK_CONTROL_QVGA, 0x02);
 +		rc |= jbt_reg_write16(jbt, JBT_REG_BLANK_TH_TV_QVGA, 0x0804);
@@ -664,7 +666,7 @@
 ===================================================================
 --- linux-2.6.orig/arch/arm/mach-s3c2410/Kconfig
 +++ linux-2.6/arch/arm/mach-s3c2410/Kconfig
-@@ -113,6 +113,7 @@
+@@ -107,6 +107,7 @@
  config MACH_QT2410
  	bool "QT2410"
  	select CPU_S3C2410

Modified: branches/src/target/kernel/2.6.24.x/patches/gta01-pcf50606.patch
===================================================================
--- branches/src/target/kernel/2.6.24.x/patches/gta01-pcf50606.patch	2007-12-18 09:49:36 UTC (rev 3672)
+++ branches/src/target/kernel/2.6.24.x/patches/gta01-pcf50606.patch	2007-12-18 10:24:02 UTC (rev 3673)
@@ -8,7 +8,7 @@
 ===================================================================
 --- /dev/null
 +++ linux-2.6/drivers/i2c/chips/pcf50606.c
-@@ -0,0 +1,1943 @@
+@@ -0,0 +1,1946 @@
 +/* Philips/NXP PCF50606 Power Management Unit (PMU) driver
 + *
 + * (C) 2006-2007 by OpenMoko, Inc.
@@ -158,7 +158,8 @@
 + * Low-Level routines
 + ***********************************************************************/
 +
-+static inline int __reg_write(struct pcf50606_data *pcf, u_int8_t reg, u_int8_t val)
++static inline int __reg_write(struct pcf50606_data *pcf, u_int8_t reg,
++			      u_int8_t val)
 +{
 +	return i2c_smbus_write_byte_data(&pcf->client, reg, val);
 +}
@@ -407,11 +408,11 @@
 +
 +	/* PWREN1 = 1, PWREN2 = 1, see table 16 of datasheet */
 +	switch (val) {
-+		case 0:
-+		case 5:
-+			return 0;
-+		default:
-+			return 1;
++	case 0:
++	case 5:
++		return 0;
++	default:
++		return 1;
 +	}
 +}
 +EXPORT_SYMBOL_GPL(pcf50606_onoff_get);
@@ -630,7 +631,8 @@
 +				/* Ask init to do 'ctrlaltdel' */
 +				DEBUGPC("SIGINT(init) ");
 +				kill_proc(1, SIGINT, 1);
-+				/* FIXME: what if userspace doesn't shut down? */
++				/* FIXME: what to do if userspace doesn't
++				 * shut down? Do we want to force it? */
 +			}
 +		}
 +	}
@@ -1071,11 +1073,9 @@
 + * APM emulation
 + ***********************************************************************/
 +
-+extern void (*apm_get_power_status)(struct apm_power_info *);
-+
 +static void pcf50606_get_power_status(struct apm_power_info *info)
 +{
-+        struct pcf50606_data *pcf = pcf50606_global;
++	struct pcf50606_data *pcf = pcf50606_global;
 +	u_int8_t mbcc1 = reg_read(pcf, PCF50606_REG_MBCC1);
 +	u_int8_t chgmod = mbcc1 & PCF50606_MBCC1_CHGMOD_MASK;
 +	u_int16_t battvolt = pcf50606_battvolt(pcf);
@@ -1408,7 +1408,7 @@
 +static const char *pwm_dc_table[] = {
 +	"0/16", "1/16", "2/16", "3/16",
 +	"4/16", "5/16", "6/16", "7/16",
-+	"8/16", "9/16", "10/16","11/16",
++	"8/16", "9/16", "10/16", "11/16",
 +	"12/16", "13/16", "14/16", "15/16",
 +};
 +
@@ -1596,7 +1596,8 @@
 +		return -EBUSY;
 +	}
 +
-+	if (!(data = kzalloc(sizeof(*data), GFP_KERNEL)))
++	data = kzalloc(sizeof(*data), GFP_KERNEL);
++	if (!data)
 +		return -ENOMEM;
 +
 +	mutex_init(&data->lock);
@@ -1617,7 +1618,8 @@
 +	/* now we try to detect the chip */
 +
 +	/* register with i2c core */
-+	if ((err = i2c_attach_client(new_client))) {
++	err = i2c_attach_client(new_client);
++	if (err) {
 +		dev_err(&new_client->dev,
 +			"error during i2c_attach_client()\n");
 +		goto exit_free;
@@ -1669,7 +1671,7 @@
 +
 +	if (enable_irq_wake(irq) < 0)
 +		dev_err(&new_client->dev, "IRQ %u cannot be enabled as wake-up"
-+		        "source in this hardware revision!", irq);
++			"source in this hardware revision!", irq);
 +
 +	pcf50606_global = data;
 +
@@ -1894,9 +1896,9 @@
 +
 +static struct i2c_driver pcf50606_driver = {
 +	.driver = {
-+		.name	= "pcf50606",
-+		.suspend= pcf50606_suspend,
-+		.resume	= pcf50606_resume,
++		.name	 = "pcf50606",
++		.suspend = pcf50606_suspend,
++		.resume	 = pcf50606_resume,
 +	},
 +	.id		= I2C_DRIVERID_PCF50606,
 +	.attach_adapter	= pcf50606_attach_adapter,
@@ -1934,7 +1936,8 @@
 +{
 +	int rc;
 +
-+	if (!(rc = platform_driver_register(&pcf50606_plat_driver)))
++	rc = platform_driver_register(&pcf50606_plat_driver)
++	if (!rc)
 +		rc = i2c_add_driver(&pcf50606_driver);
 +
 +	return rc;

Modified: branches/src/target/kernel/2.6.24.x/patches/gta01-power_control.patch
===================================================================
--- branches/src/target/kernel/2.6.24.x/patches/gta01-power_control.patch	2007-12-18 09:49:36 UTC (rev 3672)
+++ branches/src/target/kernel/2.6.24.x/patches/gta01-power_control.patch	2007-12-18 10:24:02 UTC (rev 3673)
@@ -1,3 +1,7 @@
+[PATCH] Neo1973 GPS / GSM / Bluetooth power control via sysfs
+
+Signed-off-by: Harald Welte <laforge at openmoko.org>
+
 Index: linux-2.6/arch/arm/plat-s3c24xx/Makefile
 ===================================================================
 --- linux-2.6.orig/arch/arm/plat-s3c24xx/Makefile
@@ -11,7 +15,7 @@
 ===================================================================
 --- /dev/null
 +++ linux-2.6/arch/arm/plat-s3c24xx/neo1973_pm_gps.c
-@@ -0,0 +1,558 @@
+@@ -0,0 +1,560 @@
 +/*
 + * GPS Power Management code for the FIC Neo1973 GSM Phone
 + *
@@ -448,10 +452,12 @@
 +static DEVICE_ATTR(power_pll_core_2v5, 0644, power_gps_read, power_gps_write);
 +static DEVICE_ATTR(power_core_1v5, 0644, power_gps_read, power_gps_write);
 +static DEVICE_ATTR(power_vdd_core_1v5, 0644, power_gps_read, power_gps_write);
-+static DEVICE_ATTR(power_sequence, 0644, power_sequence_read, power_sequence_write);
++static DEVICE_ATTR(power_sequence, 0644, power_sequence_read,
++		   power_sequence_write);
 +
 +#ifdef CONFIG_PM
-+static int gta01_pm_gps_suspend(struct platform_device *pdev, pm_message_t state)
++static int gta01_pm_gps_suspend(struct platform_device *pdev,
++				pm_message_t state)
 +{
 +	/* FIXME */
 +	gps_power_sequence_down();
@@ -522,14 +528,14 @@
 +	case GTA01v4_SYSTEM_REV:
 +	case GTA01Bv2_SYSTEM_REV:
 +		gta01_gps_sysfs_entries[ARRAY_SIZE(gta01_gps_sysfs_entries)-3] =
-+							&dev_attr_power_tcxo_2v8.attr;
++					&dev_attr_power_tcxo_2v8.attr;
 +		break;
 +	case GTA01Bv3_SYSTEM_REV:
 +	case GTA01Bv4_SYSTEM_REV:
 +		gta01_gps_sysfs_entries[ARRAY_SIZE(gta01_gps_sysfs_entries)-3] =
-+							&dev_attr_power_core_1v5.attr;
++					&dev_attr_power_core_1v5.attr;
 +		gta01_gps_sysfs_entries[ARRAY_SIZE(gta01_gps_sysfs_entries)-2] =
-+							&dev_attr_power_vdd_core_1v5.attr;
++					&dev_attr_power_vdd_core_1v5.attr;
 +		break;
 +	}
 +
@@ -723,23 +729,23 @@
 +static int __init gta01_gsm_probe(struct platform_device *pdev)
 +{
 +	switch (system_rev) {
-+		case GTA01v3_SYSTEM_REV:
-+			gta01_gsm.gpio_ngsm_en = GTA01v3_GPIO_nGSM_EN;
-+			break;
-+		case GTA01v4_SYSTEM_REV:
-+			gta01_gsm.gpio_ngsm_en = 0;
-+			break;
-+		case GTA01Bv2_SYSTEM_REV:
-+		case GTA01Bv3_SYSTEM_REV:
-+		case GTA01Bv4_SYSTEM_REV:
-+			gta01_gsm.gpio_ngsm_en = GTA01Bv2_GPIO_nGSM_EN;
-+			s3c2410_gpio_setpin(GTA01v3_GPIO_nGSM_EN, 0);
-+			break;
-+		default:
-+			dev_warn(&pdev->dev, "Unknown GTA01 Revision 0x%x, "
-+				 "some PM features not available!!!\n",
-+				 system_rev);
-+			break;
++	case GTA01v3_SYSTEM_REV:
++		gta01_gsm.gpio_ngsm_en = GTA01v3_GPIO_nGSM_EN;
++		break;
++	case GTA01v4_SYSTEM_REV:
++		gta01_gsm.gpio_ngsm_en = 0;
++		break;
++	case GTA01Bv2_SYSTEM_REV:
++	case GTA01Bv3_SYSTEM_REV:
++	case GTA01Bv4_SYSTEM_REV:
++		gta01_gsm.gpio_ngsm_en = GTA01Bv2_GPIO_nGSM_EN;
++		s3c2410_gpio_setpin(GTA01v3_GPIO_nGSM_EN, 0);
++		break;
++	default:
++		dev_warn(&pdev->dev, "Unknown GTA01 Revision 0x%x, "
++			 "some PM features not available!!!\n",
++			 system_rev);
++		break;
 +	}
 +
 +	switch (system_rev) {
@@ -860,7 +866,7 @@
 +		s3c2410_gpio_setpin(GTA01_GPIO_BT_EN, on);
 +	} else if (!strcmp(attr->attr.name, "reset")) {
 +		/* reset is low-active, so we need to invert */
-+		s3c2410_gpio_setpin(GTA01_GPIO_BT_EN, on ? 0 : 1 );
++		s3c2410_gpio_setpin(GTA01_GPIO_BT_EN, on ? 0 : 1);
 +	}
 +
 +	return count;

Modified: branches/src/target/kernel/2.6.24.x/patches/gta01-vibrator.patch
===================================================================
--- branches/src/target/kernel/2.6.24.x/patches/gta01-vibrator.patch	2007-12-18 09:49:36 UTC (rev 3672)
+++ branches/src/target/kernel/2.6.24.x/patches/gta01-vibrator.patch	2007-12-18 10:24:02 UTC (rev 3673)
@@ -46,7 +46,7 @@
 ===================================================================
 --- /dev/null
 +++ linux-2.6/drivers/leds/leds-neo1973-vibrator.c
-@@ -0,0 +1,178 @@
+@@ -0,0 +1,174 @@
 +/*
 + * LED driver for the vibrator of the FIC Neo1973 GSM Phone
 + *
@@ -74,8 +74,7 @@
 +
 +#define COUNTER 64
 +
-+struct gta01_vib_priv
-+{
++struct gta01_vib_priv {
 +	struct led_classdev cdev;
 +	unsigned int gpio;
 +	struct mutex mutex;
@@ -90,14 +89,14 @@
 +		container_of(led_cdev, struct gta01_vib_priv, cdev);
 +
 +	/*
-+ 	 * value == 255 -> 99% duty cycle (full power)
-+ 	 * value == 128 -> 50% duty cycle (medium power)
-+ 	 * value == 0 -> 0% duty cycle (zero power)
-+ 	 */
-+ 	mutex_lock(&vp->mutex);
-+	if (vp->has_pwm) {
++	 * value == 255 -> 99% duty cycle (full power)
++	 * value == 128 -> 50% duty cycle (medium power)
++	 * value == 0 -> 0% duty cycle (zero power)
++	 */
++	mutex_lock(&vp->mutex);
++	if (vp->has_pwm)
 +		s3c2410_pwm_duty_cycle(value/4, &vp->pwm);
-+	} else {
++	else {
 +		if (value)
 +			s3c2410_gpio_setpin(vp->gpio, 1);
 +		else
@@ -133,9 +132,8 @@
 +	int rc;
 +
 +	rc = s3c2410_pwm_init(&vp->pwm);
-+	if (rc) {
++	if (rc)
 +		return rc;
-+	}
 +
 +	vp->pwm.timerid = PWM3;
 +	/* use same prescaler as arch/arm/plat-s3c24xx/time.c */
@@ -145,9 +143,8 @@
 +	vp->pwm.comparer = COUNTER;
 +
 +	rc = s3c2410_pwm_enable(&vp->pwm);
-+	if (rc) {
++	if (rc)
 +		return rc;
-+	}
 +
 +	s3c2410_pwm_start(&vp->pwm);
 +
@@ -171,9 +168,8 @@
 +	/* TOUT3 */
 +	if (gta01_vib_led.gpio == S3C2410_GPB3) {
 +		rc = gta01vib_init_hw(&gta01_vib_led);
-+		if (rc) {
++		if (rc)
 +			return rc;
-+		}
 +
 +		s3c2410_pwm_duty_cycle(0, &gta01_vib_led.pwm);
 +		s3c2410_gpio_cfgpin(gta01_vib_led.gpio, S3C2410_GPB3_TOUT3);
@@ -216,7 +212,7 @@
 +
 +static void __exit gta01vib_exit(void)
 +{
-+ 	platform_driver_unregister(&gta01vib_driver);
++	platform_driver_unregister(&gta01vib_driver);
 +}
 +
 +module_init(gta01vib_init);

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-18 09:49:36 UTC (rev 3672)
+++ branches/src/target/kernel/2.6.24.x/patches/gta02-core.patch	2007-12-18 10:24:02 UTC (rev 3673)
@@ -871,8 +871,8 @@
 -					     3100);
 +		switch (machine_arch_type) {
 +		case MACH_TYPE_NEO1973_GTA01:
-+			/* if we are powering up, assert reset, then power, then
-+			 * release reset */
++			/* if we are powering up, assert reset, then power,
++			 * then release reset */
 +			if (on) {
 +				s3c2410_gpio_setpin(GTA01_GPIO_BT_EN, 0);
 +				pcf50606_voltage_set(pcf50606_global,
@@ -895,13 +895,13 @@
 -		s3c2410_gpio_setpin(GTA01_GPIO_BT_EN, on);
  	} else if (!strcmp(attr->attr.name, "reset")) {
  		/* reset is low-active, so we need to invert */
--		s3c2410_gpio_setpin(GTA01_GPIO_BT_EN, on ? 0 : 1 );
+-		s3c2410_gpio_setpin(GTA01_GPIO_BT_EN, on ? 0 : 1);
 +		switch (machine_arch_type) {
 +		case MACH_TYPE_NEO1973_GTA01:
-+			s3c2410_gpio_setpin(GTA01_GPIO_BT_EN, on ? 0 : 1 );
++			s3c2410_gpio_setpin(GTA01_GPIO_BT_EN, on ? 0 : 1);
 +			break;
 +		case MACH_TYPE_NEO1973_GTA02:
-+			s3c2410_gpio_setpin(GTA02_GPIO_BT_EN, on ? 0 : 1 );
++			s3c2410_gpio_setpin(GTA02_GPIO_BT_EN, on ? 0 : 1);
 +			break;
 +		}
  	}
@@ -1001,21 +1001,21 @@
  	} else if (!strcmp(attr->attr.name, "reset")) {
  		s3c2410_gpio_setpin(GTA01_GPIO_MODEM_RST, on);
 @@ -158,8 +184,14 @@
- 			gta01_gsm.gpio_ngsm_en = GTA01Bv2_GPIO_nGSM_EN;
- 			s3c2410_gpio_setpin(GTA01v3_GPIO_nGSM_EN, 0);
- 			break;
+ 		gta01_gsm.gpio_ngsm_en = GTA01Bv2_GPIO_nGSM_EN;
+ 		s3c2410_gpio_setpin(GTA01v3_GPIO_nGSM_EN, 0);
+ 		break;
 +#ifdef CONFIG_MACH_NEO1973_GTA02
-+		case GTA02v1_SYSTEM_REV:
-+		case GTA02v2_SYSTEM_REV:
-+			gta01_gsm.gpio_ngsm_en = 0;
-+			break;
++	case GTA02v1_SYSTEM_REV:
++	case GTA02v2_SYSTEM_REV:
++		gta01_gsm.gpio_ngsm_en = 0;
++		break;
 +#endif
- 		default:
--			dev_warn(&pdev->dev, "Unknown GTA01 Revision 0x%x, "
-+			dev_warn(&pdev->dev, "Unknown Neo1973 Revision 0x%x, "
- 				 "some PM features not available!!!\n",
- 				 system_rev);
- 			break;
+ 	default:
+-		dev_warn(&pdev->dev, "Unknown GTA01 Revision 0x%x, "
++		dev_warn(&pdev->dev, "Unknown Neo1973 Revision 0x%x, "
+ 			 "some PM features not available!!!\n",
+ 			 system_rev);
+ 		break;
 @@ -175,9 +207,13 @@
  		break;
  	}
@@ -1037,7 +1037,7 @@
 ===================================================================
 --- linux-2.6.orig/drivers/leds/leds-neo1973-vibrator.c
 +++ linux-2.6/drivers/leds/leds-neo1973-vibrator.c
-@@ -110,7 +110,7 @@
+@@ -107,7 +107,7 @@
  	struct resource *r;
  	int rc;
  
@@ -1050,7 +1050,7 @@
 ===================================================================
 --- linux-2.6.orig/sound/soc/s3c24xx/neo1973_wm8753.c
 +++ linux-2.6/sound/soc/s3c24xx/neo1973_wm8753.c
-@@ -670,6 +670,12 @@
+@@ -672,6 +672,12 @@
  {
  	int ret;
  
@@ -1063,7 +1063,7 @@
  	neo1973_snd_device = platform_device_alloc("soc-audio", -1);
  	if (!neo1973_snd_device)
  		return -ENOMEM;
-@@ -698,5 +704,5 @@
+@@ -700,5 +706,5 @@
  
  /* Module information */
  MODULE_AUTHOR("Graeme Gregory, graeme.gregory at wolfsonmicro.com, www.wolfsonmicro.com");

Modified: branches/src/target/kernel/2.6.24.x/patches/neo1973-soc-include-fix.patch
===================================================================
--- branches/src/target/kernel/2.6.24.x/patches/neo1973-soc-include-fix.patch	2007-12-18 09:49:36 UTC (rev 3672)
+++ branches/src/target/kernel/2.6.24.x/patches/neo1973-soc-include-fix.patch	2007-12-18 10:24:02 UTC (rev 3673)
@@ -1,3 +1,7 @@
+[PATCH] Fix s3c24xx include file path changes in asoc driver
+
+Signed-off-by: Harald Welte <laforge at openmoko.org>
+
 Index: linux-2.6.22/sound/soc/s3c24xx/neo1973_wm8753.c
 ===================================================================
 --- linux-2.6.22.orig/sound/soc/s3c24xx/neo1973_wm8753.c





More information about the commitlog mailing list