r2402 - branches/src/target/kernel/2.6.22.x/patches

[shoragan at sita.openmoko.org]

Author: shoragan
Date: 2007-07-26 21:03:24 +0200 (Thu, 26 Jul 2007)
New Revision: 2402

Modified:
   branches/src/target/kernel/2.6.22.x/patches/gta02-core.patch
Log:
Update to 2.6.22.1


Modified: branches/src/target/kernel/2.6.22.x/patches/gta02-core.patch
===================================================================
--- branches/src/target/kernel/2.6.22.x/patches/gta02-core.patch	2007-07-26 18:45:55 UTC (rev 2401)
+++ branches/src/target/kernel/2.6.22.x/patches/gta02-core.patch	2007-07-26 19:03:24 UTC (rev 2402)
@@ -1,6 +1,8 @@
+Index: linux-2.6.22.1/arch/arm/mach-s3c2440/mach-gta02.c
+===================================================================
 --- /dev/null
 +++ linux-2.6.22.1/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -0,0 +1,625 @@
+@@ -0,0 +1,620 @@
 +/*
 + * linux/arch/arm/mach-s3c2440/mach-gta02.c
 + *
@@ -39,7 +41,6 @@
 +#include <linux/spi/spi.h>
 +#include <linux/spi/glamo.h>
 +#include <linux/spi/spi_bitbang.h>
-+#include <linux/mmc/protocol.h>
 +#include <linux/mmc/host.h>
 +
 +#include <linux/mtd/mtd.h>
@@ -283,11 +284,6 @@
 +	&s3c_device_ts,
 +};
 +
-+static struct s3c24xx_board gta02_board __initdata = {
-+	.devices       = gta02_devices,
-+	.devices_count = ARRAY_SIZE(gta02_devices)
-+};
-+
 +static struct s3c2410_nand_set gta02_nand_sets[] = {
 +	[0] = {
 +		.name		= "neo1973-nand",
@@ -578,7 +574,6 @@
 +	s3c24xx_init_io(gta02_iodesc, ARRAY_SIZE(gta02_iodesc));
 +	s3c24xx_init_clocks(12000000);
 +	s3c24xx_init_uarts(gta02_uartcfgs, ARRAY_SIZE(gta02_uartcfgs));
-+	s3c24xx_set_board(&gta02_board);
 +}
 +
 +static irqreturn_t gta02_modem_irq(int irq, void *param)
@@ -605,6 +600,8 @@
 +	platform_device_register(&gta02_led_dev);
 +	platform_device_register(&gta02_glamo_dev);
 +
++	platform_add_devices(gta02_devices, ARRAY_SIZE(gta02_devices));
++
 +	s3c2410_pm_init();
 +
 +	/* Set LCD_RESET / XRES to high */
@@ -626,6 +623,8 @@
 +	.init_machine	= gta02_machine_init,
 +	.timer		= &s3c24xx_timer,
 +MACHINE_END
+Index: linux-2.6.22.1/include/asm-arm/arch-s3c2410/gta02.h
+===================================================================
 --- /dev/null
 +++ linux-2.6.22.1/include/asm-arm/arch-s3c2410/gta02.h
 @@ -0,0 +1,24 @@
@@ -653,6 +652,8 @@
 +#define GTA02_IRQ_PCF50633	IRQ_EINT9
 +
 +#endif /* _GTA02_H */
+Index: linux-2.6.22.1/arch/arm/mach-s3c2440/Kconfig
+===================================================================
 --- linux-2.6.22.1.orig/arch/arm/mach-s3c2440/Kconfig
 +++ linux-2.6.22.1/arch/arm/mach-s3c2440/Kconfig
 @@ -73,5 +73,12 @@
@@ -668,6 +669,8 @@
 +
  endmenu
  
+Index: linux-2.6.22.1/arch/arm/mach-s3c2440/Makefile
+===================================================================
 --- linux-2.6.22.1.orig/arch/arm/mach-s3c2440/Makefile
 +++ linux-2.6.22.1/arch/arm/mach-s3c2440/Makefile
 @@ -22,3 +22,4 @@
@@ -675,6 +678,8 @@
  obj-$(CONFIG_MACH_NEXCODER_2440) += mach-nexcoder.o
  obj-$(CONFIG_MACH_HXD8)		+= mach-hxd8.o
 +obj-$(CONFIG_MACH_NEO1973_GTA02) += mach-gta02.o
+Index: linux-2.6.22.1/arch/arm/common/gta01_pm_bt.c
+===================================================================
 --- linux-2.6.22.1.orig/arch/arm/common/gta01_pm_bt.c
 +++ linux-2.6.22.1/arch/arm/common/gta01_pm_bt.c
 @@ -19,6 +19,7 @@
@@ -764,6 +769,8 @@
  	/* we pull reset to low to make sure that the chip doesn't
  	 * drain power through the reset line */
  	s3c2410_gpio_setpin(GTA01_GPIO_BT_EN, 0);
+Index: linux-2.6.22.1/arch/arm/common/gta01_pm_gsm.c
+===================================================================
 --- linux-2.6.22.1.orig/arch/arm/common/gta01_pm_gsm.c
 +++ linux-2.6.22.1/arch/arm/common/gta01_pm_gsm.c
 @@ -19,7 +19,9 @@