r3143 - trunk/src/target/kernel/patches

[laforge at sita.openmoko.org]

Author: laforge
Date: 2007-10-10 18:17:35 +0200 (Wed, 10 Oct 2007)
New Revision: 3143

Modified:
   trunk/src/target/kernel/patches/gta02-core.patch
   trunk/src/target/kernel/patches/lis302dl.patch
Log:
fix non-fatal kernel oops during gta02 boot (spi bus number 0 was used twice)


Modified: trunk/src/target/kernel/patches/gta02-core.patch
===================================================================
--- trunk/src/target/kernel/patches/gta02-core.patch	2007-10-10 15:52:10 UTC (rev 3142)
+++ trunk/src/target/kernel/patches/gta02-core.patch	2007-10-10 16:17:35 UTC (rev 3143)
@@ -2,7 +2,7 @@
 ===================================================================
 --- /dev/null
 +++ linux-2.6.22.5-moko/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -0,0 +1,658 @@
+@@ -0,0 +1,600 @@
 +/*
 + * linux/arch/arm/mach-s3c2440/mach-gta02.c
 + *
@@ -315,6 +315,8 @@
 +	&s3c_device_usbgadget,
 +	&s3c_device_nand,
 +	&s3c_device_ts,
++	&s3c_device_spi0,
++	&s3c_device_spi1,
 +};
 +
 +static struct s3c2410_nand_set gta02_nand_sets[] = {
@@ -415,7 +417,7 @@
 +		/* controller_data */
 +		/* irq */
 +		.max_speed_hz	= 10 * 1000 * 1000,
-+		.bus_num	= 1,
++		.bus_num	= 2,
 +		/* chip_select */
 +	},
 +};
@@ -434,66 +436,6 @@
 +	.board_info	= gta02_spi_board_info,
 +};
 +
-+#if 0
-+#ifdef SPI_HARD
-+static struct s3c2410_spi_info spi_cfg = {
-+	.pin_cs		= S3C2410_GPG3,
-+	.board_size	= ARRAY_SIZE(gta01_spi_board_info),
-+	.board_info	= gta01_spi_board_info,
-+};
-+#else
-+static void spi_gpio_cs(struct s3c2410_spigpio_info *spi, int cs)
-+{
-+	switch (cs) {
-+	case BITBANG_CS_ACTIVE:
-+		s3c2410_gpio_setpin(S3C2410_GPG3, 0);
-+		break;
-+	case BITBANG_CS_INACTIVE:
-+		s3c2410_gpio_setpin(S3C2410_GPG3, 1);
-+		break;
-+	}
-+}
-+
-+static struct s3c2410_spigpio_info spi_gpio_cfg = {
-+	.pin_clk	= S3C2410_GPG7,
-+	.pin_mosi	= S3C2410_GPG6,
-+	.pin_miso	= S3C2410_GPG5,
-+	.board_size	= ARRAY_SIZE(gta01_spi_board_info),
-+	.board_info	= gta01_spi_board_info,
-+	.chip_select	= &spi_gpio_cs,
-+};
-+
-+static struct resource s3c_spi_lcm_resource[] = {
-+	[0] = {
-+		.start = S3C2410_GPG3,
-+		.end   = S3C2410_GPG3,
-+	},
-+	[1] = {
-+		.start = S3C2410_GPG5,
-+		.end   = S3C2410_GPG5,
-+	},
-+	[2] = {
-+		.start = S3C2410_GPG6,
-+		.end   = S3C2410_GPG6,
-+	},
-+	[3] = {
-+		.start = S3C2410_GPG7,
-+		.end   = S3C2410_GPG7,
-+	},
-+};
-+
-+struct platform_device s3c_device_spi_lcm = {
-+	.name		  = "s3c24xx-spi-gpio",
-+	.id		  = 1,
-+	.num_resources	  = ARRAY_SIZE(s3c_spi_lcm_resource),
-+	.resource	  = s3c_spi_lcm_resource,
-+	.dev = {
-+		.platform_data = &spi_gpio_cfg,
-+	},
-+};
-+#endif
-+#endif
-+
 +static struct resource gta02_led_resources[] = {
 +	[0] = {
 +		.start	= GTA02_GPIO_VIBRATOR_ON,

Modified: trunk/src/target/kernel/patches/lis302dl.patch
===================================================================
--- trunk/src/target/kernel/patches/lis302dl.patch	2007-10-10 15:52:10 UTC (rev 3142)
+++ trunk/src/target/kernel/patches/lis302dl.patch	2007-10-10 16:17:35 UTC (rev 3143)
@@ -14,15 +14,7 @@
  
  #include <asm/mach/arch.h>
  #include <asm/mach/map.h>
-@@ -310,6 +311,7 @@
- 	&s3c_device_usbgadget,
- 	&s3c_device_nand,
- 	&s3c_device_ts,
-+	&s3c_device_spi1,
- };
- 
- static struct s3c2410_nand_set gta02_nand_sets[] = {
-@@ -437,6 +439,47 @@
+@@ -429,6 +430,47 @@
  	.board_info	= gta02_spi_board_info,
  };
  
@@ -70,7 +62,7 @@
  #if 0
  #ifdef SPI_HARD
  static struct s3c2410_spi_info spi_cfg = {
-@@ -626,6 +669,7 @@
+@@ -618,6 +660,7 @@
  	s3c_device_usb.dev.platform_data = &gta02_usb_info;
  	s3c_device_nand.dev.platform_data = &gta02_nand_info;
  	s3c_device_sdi.dev.platform_data = &gta02_mmc_cfg;