r4713 - in developers/werner/wlan-spi: . patches-tracking

[werner at docs.openmoko.org]

Author: werner
Date: 2008-10-15 17:26:47 +0200 (Wed, 15 Oct 2008)
New Revision: 4713

Added:
   developers/werner/wlan-spi/patches-tracking/
   developers/werner/wlan-spi/patches-tracking/hack-disable-ecc.patch
   developers/werner/wlan-spi/patches-tracking/hack-mmc-spi-coexistence.patch
   developers/werner/wlan-spi/patches-tracking/series
Log:
Rebasing the WLAN patches and cleaning out old crud ...



Added: developers/werner/wlan-spi/patches-tracking/hack-disable-ecc.patch
===================================================================
--- developers/werner/wlan-spi/patches-tracking/hack-disable-ecc.patch	                        (rev 0)
+++ developers/werner/wlan-spi/patches-tracking/hack-disable-ecc.patch	2008-10-15 15:26:47 UTC (rev 4713)
@@ -0,0 +1,32 @@
+Index: ktrack/drivers/mtd/nand/nand_base.c
+===================================================================
+--- ktrack.orig/drivers/mtd/nand/nand_base.c	2008-10-15 11:47:50.000000000 -0200
++++ ktrack/drivers/mtd/nand/nand_base.c	2008-10-15 11:58:06.000000000 -0200
+@@ -775,6 +775,7 @@
+ 	uint32_t *eccpos = chip->ecc.layout->eccpos;
+ 
+ 	chip->ecc.read_page_raw(mtd, chip, buf);
++	return 0;
+ 
+ 	for (i = 0; eccsteps; eccsteps--, i += eccbytes, p += eccsize)
+ 		chip->ecc.calculate(mtd, p, &ecc_calc[i]);
+@@ -830,6 +831,7 @@
+ 
+ 	p = bufpoi + data_col_addr;
+ 	chip->read_buf(mtd, p, datafrag_len);
++	return 0;
+ 
+ 	/* Calculate  ECC */
+ 	for (i = 0; i < eccfrag_len ; i += chip->ecc.bytes, p += chip->ecc.size)
+Index: ktrack/drivers/mtd/nand/nand_ecc.c
+===================================================================
+--- ktrack.orig/drivers/mtd/nand/nand_ecc.c	2008-10-15 11:48:20.000000000 -0200
++++ ktrack/drivers/mtd/nand/nand_ecc.c	2008-10-15 11:55:50.000000000 -0200
+@@ -146,6 +146,7 @@
+ {
+ 	uint8_t s0, s1, s2;
+ 
++	return 0;
+ #ifdef CONFIG_MTD_NAND_ECC_SMC
+ 	s0 = calc_ecc[0] ^ read_ecc[0];
+ 	s1 = calc_ecc[1] ^ read_ecc[1];

Added: developers/werner/wlan-spi/patches-tracking/hack-mmc-spi-coexistence.patch
===================================================================
--- developers/werner/wlan-spi/patches-tracking/hack-mmc-spi-coexistence.patch	                        (rev 0)
+++ developers/werner/wlan-spi/patches-tracking/hack-mmc-spi-coexistence.patch	2008-10-15 15:26:47 UTC (rev 4713)
@@ -0,0 +1,47 @@
+Index: ktrack/arch/arm/mach-s3c2440/mach-gta02.c
+===================================================================
+--- ktrack.orig/arch/arm/mach-s3c2440/mach-gta02.c	2008-10-15 13:13:26.000000000 -0200
++++ ktrack/arch/arm/mach-s3c2440/mach-gta02.c	2008-10-15 13:17:28.000000000 -0200
+@@ -1632,6 +1632,42 @@
+ 	mangle_glamo_res_by_system_rev();
+ 	platform_device_register(&gta02_glamo_dev);
+ 
++#ifdef CONFIG_AR6K_SPI_S3C24XX
++
++	printk(KERN_INFO "SPI/MMC co-existence: disabling SD/MMC\n");
++	s3c2410_gpio_cfgpin(S3C2410_GPE5, S3C2410_GPIO_INPUT);	/* CLK */
++	s3c2410_gpio_cfgpin(S3C2410_GPE6, S3C2410_GPIO_INPUT);	/* CMD */
++	s3c2410_gpio_cfgpin(S3C2410_GPE7, S3C2410_GPIO_INPUT);	/* DATA0 */
++	s3c2410_gpio_cfgpin(S3C2410_GPE8, S3C2410_GPIO_INPUT);	/* DATA1 */
++	s3c2410_gpio_cfgpin(S3C2410_GPE9, S3C2410_GPIO_INPUT);	/* DATA2 */
++	s3c2410_gpio_cfgpin(S3C2410_GPE10, S3C2410_GPIO_INPUT);	/* DATA3 */
++
++#else /* CONFIG_AR6K_SPI_S3C24XX */
++
++	printk(KERN_INFO "SPI/MMC co-existence: disabling SPI\n");
++	s3c2410_gpio_cfgpin(S3C2410_GPE11, S3C2410_GPIO_INPUT);	/* MISO */
++	s3c2410_gpio_cfgpin(S3C2410_GPE12, S3C2410_GPIO_INPUT);	/* MOSI */
++	s3c2410_gpio_cfgpin(S3C2410_GPE13, S3C2410_GPIO_INPUT);	/* CLK */
++	s3c2410_gpio_cfgpin(S3C2410_GPF3, S3C2410_GPIO_INPUT);	/* EINT3 */
++	s3c2410_gpio_cfgpin(S3C2410_GPG2, S3C2410_GPIO_INPUT);	/* SS */
++
++#endif /* !CONFIG_AR6K_SPI_S3C24XX */
++
++	/* disable all pull-downs on SD/MMC and SPI  */
++
++	s3c2410_gpio_pullup(S3C2410_GPE5, 1);	/* SD/MMC block */
++	s3c2410_gpio_pullup(S3C2410_GPE6, 1);
++	s3c2410_gpio_pullup(S3C2410_GPE7, 1);
++	s3c2410_gpio_pullup(S3C2410_GPE8, 1);
++	s3c2410_gpio_pullup(S3C2410_GPE9, 1);
++	s3c2410_gpio_pullup(S3C2410_GPE10, 1);
++
++	s3c2410_gpio_pullup(S3C2410_GPE11, 1);	/* SPI block */
++	s3c2410_gpio_pullup(S3C2410_GPE12, 1);
++	s3c2410_gpio_pullup(S3C2410_GPE13, 1);
++	s3c2410_gpio_pullup(S3C2410_GPF3, 1);
++	s3c2410_gpio_pullup(S3C2410_GPG2, 1);
++
+ 	platform_device_register(&s3c_device_spi_acc);
+ 	platform_device_register(&gta02_button_dev);
+ 	platform_device_register(&gta02_pm_gsm_dev);

Added: developers/werner/wlan-spi/patches-tracking/series
===================================================================
--- developers/werner/wlan-spi/patches-tracking/series	                        (rev 0)
+++ developers/werner/wlan-spi/patches-tracking/series	2008-10-15 15:26:47 UTC (rev 4713)
@@ -0,0 +1,2 @@
+hack-disable-ecc.patch
+hack-mmc-spi-coexistence.patch