r4733 - developers/werner/wlan-spi/patches-tracking
werner at docs.openmoko.org
werner at docs.openmoko.org
Thu Oct 30 03:08:11 CET 2008
Author: werner
Date: 2008-10-30 03:08:10 +0100 (Thu, 30 Oct 2008)
New Revision: 4733
Removed:
developers/werner/wlan-spi/patches-tracking/s3c-mmc-hdrmig-fix.patch
Modified:
developers/werner/wlan-spi/patches-tracking/ar6k-without-sdio.patch
developers/werner/wlan-spi/patches-tracking/gta02-mmc-mci.patch
developers/werner/wlan-spi/patches-tracking/gta02-mmc-spi-bitbang.patch
developers/werner/wlan-spi/patches-tracking/gta02-mmc-spi.patch
developers/werner/wlan-spi/patches-tracking/gta02-remove-sdio.patch
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/hif-direct-interrupt.patch
developers/werner/wlan-spi/patches-tracking/s3c-mmc-sdio-int.patch
developers/werner/wlan-spi/patches-tracking/s3c-spi-from-int-to-poll.patch
developers/werner/wlan-spi/patches-tracking/series
Log:
Rebase to latest stable-tracking.
Modified: developers/werner/wlan-spi/patches-tracking/ar6k-without-sdio.patch
===================================================================
--- developers/werner/wlan-spi/patches-tracking/ar6k-without-sdio.patch 2008-10-28 10:15:19 UTC (rev 4732)
+++ developers/werner/wlan-spi/patches-tracking/ar6k-without-sdio.patch 2008-10-30 02:08:10 UTC (rev 4733)
@@ -13,11 +13,11 @@
Index: ktrack/arch/arm/Kconfig
===================================================================
---- ktrack.orig/arch/arm/Kconfig 2008-10-15 11:12:12.000000000 -0200
-+++ ktrack/arch/arm/Kconfig 2008-10-15 21:49:07.000000000 -0200
-@@ -1220,7 +1220,7 @@
+--- ktrack.orig/arch/arm/Kconfig 2008-10-29 03:31:30.000000000 -0200
++++ ktrack/arch/arm/Kconfig 2008-10-29 03:31:36.000000000 -0200
+@@ -1270,7 +1270,7 @@
- source "drivers/usb/Kconfig"
+ source "drivers/uwb/Kconfig"
-source "drivers/sdio/Kconfig"
+source "drivers/ar6000/Kconfig"
@@ -26,9 +26,9 @@
Index: ktrack/drivers/Makefile
===================================================================
---- ktrack.orig/drivers/Makefile 2008-10-15 11:12:12.000000000 -0200
-+++ ktrack/drivers/Makefile 2008-10-15 21:49:36.000000000 -0200
-@@ -85,6 +85,7 @@
+--- ktrack.orig/drivers/Makefile 2008-10-29 03:31:30.000000000 -0200
++++ ktrack/drivers/Makefile 2008-10-29 03:31:36.000000000 -0200
+@@ -86,6 +86,7 @@
obj-$(CONFIG_MMC) += mmc/
obj-$(CONFIG_MEMSTICK) += memstick/
obj-$(CONFIG_SDIO) += sdio/
@@ -39,7 +39,7 @@
Index: ktrack/drivers/ar6000/Kconfig
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ ktrack/drivers/ar6000/Kconfig 2008-10-15 21:49:07.000000000 -0200
++++ ktrack/drivers/ar6000/Kconfig 2008-10-29 03:31:36.000000000 -0200
@@ -0,0 +1,7 @@
+config AR6000_WLAN
+ tristate "ar6000 wireless networking over sdio"
@@ -50,8 +50,8 @@
+ good luck.
Index: ktrack/drivers/ar6000/Makefile
===================================================================
---- ktrack.orig/drivers/ar6000/Makefile 2008-10-15 11:12:12.000000000 -0200
-+++ ktrack/drivers/ar6000/Makefile 2008-10-15 21:49:07.000000000 -0200
+--- ktrack.orig/drivers/ar6000/Makefile 2008-10-29 03:31:30.000000000 -0200
++++ ktrack/drivers/ar6000/Makefile 2008-10-29 03:31:36.000000000 -0200
@@ -13,7 +13,7 @@
EXTRA_CFLAGS += -DKERNEL_2_6
Modified: developers/werner/wlan-spi/patches-tracking/gta02-mmc-mci.patch
===================================================================
--- developers/werner/wlan-spi/patches-tracking/gta02-mmc-mci.patch 2008-10-28 10:15:19 UTC (rev 4732)
+++ developers/werner/wlan-spi/patches-tracking/gta02-mmc-mci.patch 2008-10-30 02:08:10 UTC (rev 4733)
@@ -5,9 +5,9 @@
Index: ktrack/arch/arm/mach-s3c2440/Kconfig
===================================================================
---- ktrack.orig/arch/arm/mach-s3c2440/Kconfig 2008-10-15 23:10:08.000000000 -0200
-+++ ktrack/arch/arm/mach-s3c2440/Kconfig 2008-10-16 01:31:08.000000000 -0200
-@@ -120,6 +120,10 @@
+--- ktrack.orig/arch/arm/mach-s3c2440/Kconfig 2008-10-29 03:47:18.000000000 -0200
++++ ktrack/arch/arm/mach-s3c2440/Kconfig 2008-10-29 03:47:21.000000000 -0200
+@@ -122,6 +122,10 @@
This functionality requires that SPI0 is wired to
the WLAN SDIO interface.
@@ -20,12 +20,12 @@
endmenu
Index: ktrack/arch/arm/mach-s3c2440/mach-gta02.c
===================================================================
---- ktrack.orig/arch/arm/mach-s3c2440/mach-gta02.c 2008-10-15 23:10:08.000000000 -0200
-+++ ktrack/arch/arm/mach-s3c2440/mach-gta02.c 2008-10-16 01:31:08.000000000 -0200
-@@ -1693,6 +1693,11 @@
- mangle_glamo_res_by_system_rev();
- platform_device_register(>a02_glamo_dev);
+--- ktrack.orig/arch/arm/mach-s3c2440/mach-gta02.c 2008-10-29 03:47:18.000000000 -0200
++++ ktrack/arch/arm/mach-s3c2440/mach-gta02.c 2008-10-29 03:47:21.000000000 -0200
+@@ -1723,6 +1723,11 @@
+ mangle_pmu_pdata_by_system_rev();
+
+#ifdef CONFIG_AR6K_S3CMCI
+ s3c_device_sdi.dev.platform_data = NULL;
+ platform_device_register(&s3c_device_sdi); /* @@@ just for testing */
Modified: developers/werner/wlan-spi/patches-tracking/gta02-mmc-spi-bitbang.patch
===================================================================
--- developers/werner/wlan-spi/patches-tracking/gta02-mmc-spi-bitbang.patch 2008-10-28 10:15:19 UTC (rev 4732)
+++ developers/werner/wlan-spi/patches-tracking/gta02-mmc-spi-bitbang.patch 2008-10-30 02:08:10 UTC (rev 4733)
@@ -13,9 +13,9 @@
Index: ktrack/arch/arm/mach-s3c2440/Kconfig
===================================================================
---- ktrack.orig/arch/arm/mach-s3c2440/Kconfig 2008-10-15 22:30:39.000000000 -0200
-+++ ktrack/arch/arm/mach-s3c2440/Kconfig 2008-10-15 23:09:15.000000000 -0200
-@@ -99,6 +99,20 @@
+--- ktrack.orig/arch/arm/mach-s3c2440/Kconfig 2008-10-29 00:57:06.000000000 -0200
++++ ktrack/arch/arm/mach-s3c2440/Kconfig 2008-10-29 03:39:59.000000000 -0200
+@@ -101,6 +101,20 @@
Say Y here if you are using an early hardware revision
of the FIC/Openmoko Neo1973 GTA02 GSM Phone.
@@ -38,8 +38,8 @@
#source "arch/arm/mach-s3c2440/camera/Kconfig"
Index: ktrack/arch/arm/mach-s3c2440/mach-gta02.c
===================================================================
---- ktrack.orig/arch/arm/mach-s3c2440/mach-gta02.c 2008-10-15 22:30:39.000000000 -0200
-+++ ktrack/arch/arm/mach-s3c2440/mach-gta02.c 2008-10-15 23:09:56.000000000 -0200
+--- ktrack.orig/arch/arm/mach-s3c2440/mach-gta02.c 2008-10-29 03:33:37.000000000 -0200
++++ ktrack/arch/arm/mach-s3c2440/mach-gta02.c 2008-10-29 03:41:13.000000000 -0200
@@ -37,6 +37,7 @@
#include <linux/spi/spi.h>
#include <linux/spi/glamo.h>
@@ -48,7 +48,7 @@
#include <linux/mmc/host.h>
#include <linux/mtd/mtd.h>
-@@ -1223,6 +1224,87 @@
+@@ -1238,6 +1239,87 @@
},
};
@@ -136,18 +136,16 @@
static struct resource gta02_led_resources[] = {
{
.name = "gta02-power:orange",
-@@ -1638,7 +1720,13 @@
+@@ -1668,6 +1750,12 @@
s3c2410_gpio_pullup(S3C2410_GPF3, 1);
s3c2410_gpio_pullup(S3C2410_GPG2, 1);
-- platform_device_register(&s3c_device_spi_acc);
+#ifdef CONFIG_AR6K_SPI_S3C24XX_GPIO
+ s3c2410_gpio_setpin(S3C2410_GPE10, 1); /* nSS */
+ s3c2410_gpio_cfgpin(S3C2410_GPE10, S3C2410_GPIO_OUTPUT);
+ platform_device_register(>a02_spi_wlan);
+#endif /* CONFIG_AR6K_SPI_S3C24XX_GPIO */
+
-+// platform_device_register(&s3c_device_spi_acc);
- platform_device_register(>a02_button_dev);
- platform_device_register(>a02_pm_gsm_dev);
- platform_device_register(>a02_pm_usbhost_dev);
+ platform_add_devices(gta02_devices, ARRAY_SIZE(gta02_devices));
+
+ s3c2410_pm_init();
Modified: developers/werner/wlan-spi/patches-tracking/gta02-mmc-spi.patch
===================================================================
--- developers/werner/wlan-spi/patches-tracking/gta02-mmc-spi.patch 2008-10-28 10:15:19 UTC (rev 4732)
+++ developers/werner/wlan-spi/patches-tracking/gta02-mmc-spi.patch 2008-10-30 02:08:10 UTC (rev 4733)
@@ -12,9 +12,9 @@
Index: ktrack/arch/arm/mach-s3c2440/Kconfig
===================================================================
---- ktrack.orig/arch/arm/mach-s3c2440/Kconfig 2008-10-15 23:09:15.000000000 -0200
-+++ ktrack/arch/arm/mach-s3c2440/Kconfig 2008-10-15 23:10:08.000000000 -0200
-@@ -111,6 +111,15 @@
+--- ktrack.orig/arch/arm/mach-s3c2440/Kconfig 2008-10-29 03:39:59.000000000 -0200
++++ ktrack/arch/arm/mach-s3c2440/Kconfig 2008-10-29 03:42:30.000000000 -0200
+@@ -113,6 +113,15 @@
bool "GPIO bit-banging SPI"
select MMC_SPI
select SPI_S3C24XX_GPIO
@@ -32,9 +32,9 @@
endmenu
Index: ktrack/arch/arm/mach-s3c2440/mach-gta02.c
===================================================================
---- ktrack.orig/arch/arm/mach-s3c2440/mach-gta02.c 2008-10-15 23:09:56.000000000 -0200
-+++ ktrack/arch/arm/mach-s3c2440/mach-gta02.c 2008-10-15 23:10:08.000000000 -0200
-@@ -1228,9 +1228,7 @@
+--- ktrack.orig/arch/arm/mach-s3c2440/mach-gta02.c 2008-10-29 03:41:13.000000000 -0200
++++ ktrack/arch/arm/mach-s3c2440/mach-gta02.c 2008-10-29 03:44:38.000000000 -0200
+@@ -1243,9 +1243,7 @@
/* ----- AR6000 WLAN interface --------------------------------------------- */
@@ -45,7 +45,7 @@
static struct spi_board_info gta02_spi_mmc_bdinfo[] = {
{
-@@ -1243,7 +1241,18 @@
+@@ -1258,7 +1256,18 @@
}
};
@@ -65,9 +65,9 @@
#ifdef CONFIG_AR6K_SPI_S3C24XX_GPIO
-@@ -1750,6 +1759,13 @@
- }
- #endif
+@@ -1756,6 +1765,13 @@
+ platform_device_register(>a02_spi_wlan);
+ #endif /* CONFIG_AR6K_SPI_S3C24XX_GPIO */
+#ifdef CONFIG_AR6K_SPI_S3C24XX
+ spi_register_board_info(gta02_spi_mmc_bdinfo,
@@ -76,6 +76,6 @@
+ platform_device_register(&s3c_device_spi0);
+#endif /* CONFIG_AR6K_SPI_S3C24XX */
+
- i2c_register_board_info(0, gta02_i2c_devs,
- ARRAY_SIZE(gta02_i2c_devs));
+ platform_add_devices(gta02_devices, ARRAY_SIZE(gta02_devices));
+ s3c2410_pm_init();
Modified: developers/werner/wlan-spi/patches-tracking/gta02-remove-sdio.patch
===================================================================
--- developers/werner/wlan-spi/patches-tracking/gta02-remove-sdio.patch 2008-10-28 10:15:19 UTC (rev 4732)
+++ developers/werner/wlan-spi/patches-tracking/gta02-remove-sdio.patch 2008-10-30 02:08:10 UTC (rev 4733)
@@ -8,9 +8,9 @@
Index: ktrack/arch/arm/mach-s3c2440/mach-gta02.c
===================================================================
---- ktrack.orig/arch/arm/mach-s3c2440/mach-gta02.c 2008-10-15 21:35:29.000000000 -0200
-+++ ktrack/arch/arm/mach-s3c2440/mach-gta02.c 2008-10-15 21:51:04.000000000 -0200
-@@ -813,36 +813,6 @@
+--- ktrack.orig/arch/arm/mach-s3c2440/mach-gta02.c 2008-10-29 03:31:14.000000000 -0200
++++ ktrack/arch/arm/mach-s3c2440/mach-gta02.c 2008-10-29 03:33:37.000000000 -0200
+@@ -876,36 +876,6 @@
};
@@ -47,13 +47,11 @@
struct platform_device s3c24xx_pwm_device = {
.name = "s3c24xx_pwm",
.num_resources = 0,
-@@ -1678,9 +1648,6 @@
- platform_device_register(>a02_vibrator_dev);
- platform_device_register(>a02_led_dev);
-
--
-- platform_device_register(>a02_sdio_dev);
--
- platform_add_devices(gta02_devices, ARRAY_SIZE(gta02_devices));
-
- #ifdef CONFIG_GTA02_HDQ
+@@ -1582,7 +1552,6 @@
+ >a01_pm_gps_dev,
+ >a01_pm_bt_dev,
+ >a02_pm_gsm_dev,
+- >a02_sdio_dev,
+ >a02_pm_usbhost_dev,
+ &s3c_device_spi_acc1, /* input 2 */
+ &s3c_device_spi_acc2, /* input 3 */
Modified: developers/werner/wlan-spi/patches-tracking/hack-disable-ecc.patch
===================================================================
--- developers/werner/wlan-spi/patches-tracking/hack-disable-ecc.patch 2008-10-28 10:15:19 UTC (rev 4732)
+++ developers/werner/wlan-spi/patches-tracking/hack-disable-ecc.patch 2008-10-30 02:08:10 UTC (rev 4733)
@@ -1,7 +1,7 @@
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
+--- ktrack.orig/drivers/mtd/nand/nand_base.c 2008-10-29 00:57:08.000000000 -0200
++++ ktrack/drivers/mtd/nand/nand_base.c 2008-10-29 03:17:39.000000000 -0200
@@ -775,6 +775,7 @@
uint32_t *eccpos = chip->ecc.layout->eccpos;
@@ -20,13 +20,13 @@
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;
+--- ktrack.orig/drivers/mtd/nand/nand_ecc.c 2008-10-29 00:57:08.000000000 -0200
++++ ktrack/drivers/mtd/nand/nand_ecc.c 2008-10-29 03:17:56.000000000 -0200
+@@ -434,6 +434,7 @@
+ const uint32_t eccsize_mult =
+ (((struct nand_chip *)mtd->priv)->ecc.size) >> 8;
+ return 0;
- #ifdef CONFIG_MTD_NAND_ECC_SMC
- s0 = calc_ecc[0] ^ read_ecc[0];
- s1 = calc_ecc[1] ^ read_ecc[1];
+ /*
+ * b0 to b2 indicate which bit is faulty (if any)
+ * we might need the xor result more than once,
Modified: developers/werner/wlan-spi/patches-tracking/hack-mmc-spi-coexistence.patch
===================================================================
--- developers/werner/wlan-spi/patches-tracking/hack-mmc-spi-coexistence.patch 2008-10-28 10:15:19 UTC (rev 4732)
+++ developers/werner/wlan-spi/patches-tracking/hack-mmc-spi-coexistence.patch 2008-10-30 02:08:10 UTC (rev 4733)
@@ -9,12 +9,12 @@
Index: ktrack/arch/arm/mach-s3c2440/mach-gta02.c
===================================================================
---- ktrack.orig/arch/arm/mach-s3c2440/mach-gta02.c 2008-10-15 13:23:37.000000000 -0200
-+++ ktrack/arch/arm/mach-s3c2440/mach-gta02.c 2008-10-15 22:04:28.000000000 -0200
-@@ -1632,6 +1632,42 @@
- mangle_glamo_res_by_system_rev();
- platform_device_register(>a02_glamo_dev);
+--- ktrack.orig/arch/arm/mach-s3c2440/mach-gta02.c 2008-10-29 00:57:06.000000000 -0200
++++ ktrack/arch/arm/mach-s3c2440/mach-gta02.c 2008-10-29 03:21:52.000000000 -0200
+@@ -1663,6 +1663,42 @@
+ mangle_pmu_pdata_by_system_rev();
+
+#ifdef CONFIG_AR6K_SPI_S3C24XX
+
+ printk(KERN_INFO "SPI/MMC co-existence: disabling SD/MMC\n");
@@ -38,19 +38,19 @@
+
+ /* disable all pull-downs on SD/MMC and SPI */
+
-+ s3c2410_gpio_pullup(S3C2410_GPE5, 1); /* SD/MMC block */
++ 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_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(>a02_button_dev);
- platform_device_register(>a02_pm_gsm_dev);
+ platform_add_devices(gta02_devices, ARRAY_SIZE(gta02_devices));
+
+ s3c2410_pm_init();
Modified: developers/werner/wlan-spi/patches-tracking/hif-direct-interrupt.patch
===================================================================
--- developers/werner/wlan-spi/patches-tracking/hif-direct-interrupt.patch 2008-10-28 10:15:19 UTC (rev 4732)
+++ developers/werner/wlan-spi/patches-tracking/hif-direct-interrupt.patch 2008-10-30 02:08:10 UTC (rev 4733)
@@ -9,8 +9,8 @@
Index: ktrack/drivers/ar6000/hif/hif2.c
===================================================================
---- ktrack.orig/drivers/ar6000/hif/hif2.c 2008-10-16 01:13:51.000000000 -0200
-+++ ktrack/drivers/ar6000/hif/hif2.c 2008-10-16 01:21:50.000000000 -0200
+--- ktrack.orig/drivers/ar6000/hif/hif2.c 2008-10-29 23:48:33.000000000 -0200
++++ ktrack/drivers/ar6000/hif/hif2.c 2008-10-29 23:50:44.000000000 -0200
@@ -21,9 +21,13 @@
#include <linux/list.h>
#include <linux/wait.h>
@@ -187,10 +187,11 @@
/* ========================================================================= */
-@@ -521,11 +540,31 @@
+@@ -521,11 +540,32 @@
dev_err(dev, "sdio_set_block_size returns %d\n", ret);
/* @@@ cleanup */
}
++
+#ifndef CONFIG_AR6000_GTA02_DIRECT_IRQ
ret = sdio_claim_irq(func, sdio_ar6000_irq);
if (ret) {
@@ -216,13 +217,13 @@
+ }
+#endif /* CONFIG_AR6000_GTA02_DIRECT_IRQ */
+
- #if 0 /* only for hw SDIO */
- sdio_f0_writeb(func, SDIO_BUS_CD_DISABLE | SDIO_BUS_WIDTH_4BIT,
- SDIO_CCCR_IF, &ret);
+ /* Set SDIO_BUS_CD_DISABLE in SDIO_CCCR_IF ? */
+ #if 0
+ sdio_f0_writeb(func, SDIO_CCCR_CAP_E4MI, SDIO_CCCR_CAPS, &ret);
Index: ktrack/drivers/spi/spi_bitbang.c
===================================================================
---- ktrack.orig/drivers/spi/spi_bitbang.c 2008-10-16 01:13:51.000000000 -0200
-+++ ktrack/drivers/spi/spi_bitbang.c 2008-10-16 01:15:26.000000000 -0200
+--- ktrack.orig/drivers/spi/spi_bitbang.c 2008-10-29 23:48:33.000000000 -0200
++++ ktrack/drivers/spi/spi_bitbang.c 2008-10-29 23:49:18.000000000 -0200
@@ -323,6 +323,9 @@
* selected ...)
*/
@@ -245,8 +246,8 @@
ndelay(nsecs);
Index: ktrack/drivers/ar6000/Kconfig
===================================================================
---- ktrack.orig/drivers/ar6000/Kconfig 2008-10-16 01:13:51.000000000 -0200
-+++ ktrack/drivers/ar6000/Kconfig 2008-10-16 01:15:26.000000000 -0200
+--- ktrack.orig/drivers/ar6000/Kconfig 2008-10-29 23:48:33.000000000 -0200
++++ ktrack/drivers/ar6000/Kconfig 2008-10-29 23:49:18.000000000 -0200
@@ -5,3 +5,8 @@
default m
help
Deleted: developers/werner/wlan-spi/patches-tracking/s3c-mmc-hdrmig-fix.patch
===================================================================
--- developers/werner/wlan-spi/patches-tracking/s3c-mmc-hdrmig-fix.patch 2008-10-28 10:15:19 UTC (rev 4732)
+++ developers/werner/wlan-spi/patches-tracking/s3c-mmc-hdrmig-fix.patch 2008-10-30 02:08:10 UTC (rev 4733)
@@ -1,18 +0,0 @@
-Build fix after header migration. Drop when we catch it from upstream.
-
-Index: ktrack/drivers/mmc/host/s3cmci.c
-===================================================================
---- ktrack.orig/drivers/mmc/host/s3cmci.c 2008-10-17 05:58:11.000000000 -0200
-+++ ktrack/drivers/mmc/host/s3cmci.c 2008-10-17 05:59:45.000000000 -0200
-@@ -28,9 +28,9 @@
- #include <asm/dma-mapping.h>
-
- #include <asm/io.h>
--#include <asm/arch/regs-sdi.h>
-+#include <asm/arch-s3c2410/regs-sdi.h>
- #include <mach/regs-gpio.h>
--#include <asm/arch/mci.h>
-+#include <asm/arch-s3c2410/mci.h>
- #include <mach/dma.h>
-
- #include "s3cmci.h"
Modified: developers/werner/wlan-spi/patches-tracking/s3c-mmc-sdio-int.patch
===================================================================
--- developers/werner/wlan-spi/patches-tracking/s3c-mmc-sdio-int.patch 2008-10-28 10:15:19 UTC (rev 4732)
+++ developers/werner/wlan-spi/patches-tracking/s3c-mmc-sdio-int.patch 2008-10-30 02:08:10 UTC (rev 4733)
@@ -18,9 +18,9 @@
Index: ktrack/drivers/mmc/host/s3cmci.c
===================================================================
---- ktrack.orig/drivers/mmc/host/s3cmci.c 2008-10-17 05:32:34.000000000 -0200
-+++ ktrack/drivers/mmc/host/s3cmci.c 2008-10-17 05:46:43.000000000 -0200
-@@ -195,7 +195,11 @@
+--- ktrack.orig/drivers/mmc/host/s3cmci.c 2008-10-29 00:57:08.000000000 -0200
++++ ktrack/drivers/mmc/host/s3cmci.c 2008-10-29 03:48:44.000000000 -0200
+@@ -198,7 +198,11 @@
static inline void clear_imask(struct s3cmci_host *host)
{
@@ -33,7 +33,7 @@
}
static inline int get_data_buffer(struct s3cmci_host *host,
-@@ -347,6 +351,7 @@
+@@ -383,6 +387,7 @@
struct s3cmci_host *host = (struct s3cmci_host *) data;
disable_irq(host->irq);
@@ -41,7 +41,7 @@
if (host->pio_active == XFER_WRITE)
do_pio_write(host);
-@@ -367,8 +372,12 @@
+@@ -403,8 +408,12 @@
}
finalize_request(host);
@@ -55,7 +55,7 @@
}
/*
-@@ -405,6 +414,7 @@
+@@ -441,6 +450,7 @@
u32 mci_csta, mci_dsta, mci_fsta, mci_dcnt, mci_imsk;
u32 mci_cclear, mci_dclear;
unsigned long iflags;
@@ -63,7 +63,7 @@
spin_lock_irqsave(&host->complete_lock, iflags);
-@@ -416,6 +426,13 @@
+@@ -452,6 +462,13 @@
mci_cclear = 0;
mci_dclear = 0;
@@ -77,7 +77,7 @@
if ((host->complete_what == COMPLETION_NONE) ||
(host->complete_what == COMPLETION_FINALIZE)) {
host->status = "nothing to complete";
-@@ -585,6 +602,11 @@
+@@ -621,6 +638,11 @@
mci_csta, mci_dsta, mci_fsta, mci_dcnt, host->status);
spin_unlock_irqrestore(&host->complete_lock, iflags);
@@ -89,7 +89,7 @@
return IRQ_HANDLED;
}
-@@ -653,7 +675,7 @@
+@@ -689,7 +711,7 @@
fail_request:
host->mrq->data->error = -EINVAL;
host->complete_what = COMPLETION_FINALIZE;
@@ -98,7 +98,7 @@
goto out;
}
-@@ -698,7 +720,7 @@
+@@ -734,7 +756,7 @@
writel(0, host->base + S3C2410_SDICMDARG);
writel(S3C2410_SDIDCON_STOP, host->base + S3C2410_SDIDCON);
writel(0, host->base + S3C2410_SDICMDCON);
@@ -107,7 +107,7 @@
if (cmd->data && cmd->error)
cmd->data->error = cmd->error;
-@@ -1010,7 +1032,10 @@
+@@ -1045,7 +1067,10 @@
s3cmci_send_command(host, cmd);
/* Enable Interrupt */
@@ -119,7 +119,7 @@
}
static int s3cmci_card_present(struct mmc_host *mmc)
-@@ -1103,9 +1128,9 @@
+@@ -1145,9 +1170,9 @@
/* Set CLOCK_ENABLE */
if (ios->clock)
@@ -131,7 +131,7 @@
writel(mci_con, host->base + S3C2410_SDICON);
-@@ -1145,11 +1170,27 @@
+@@ -1187,11 +1212,27 @@
return ret;
}
@@ -159,7 +159,7 @@
};
static struct s3c24xx_mci_pdata s3cmci_def_pdata = {
-@@ -1242,6 +1283,7 @@
+@@ -1339,6 +1380,7 @@
* ensure we don't lock the system with un-serviceable requests. */
disable_irq(host->irq);
@@ -167,7 +167,7 @@
host->irq_cd = s3c2410_gpio_getirq(host->pdata->gpio_detect);
-@@ -1287,7 +1329,7 @@
+@@ -1384,7 +1426,7 @@
mmc->ops = &s3cmci_ops;
mmc->ocr_avail = MMC_VDD_32_33 | MMC_VDD_33_34;
@@ -178,12 +178,14 @@
Index: ktrack/drivers/mmc/host/s3cmci.h
===================================================================
---- ktrack.orig/drivers/mmc/host/s3cmci.h 2008-10-17 05:46:53.000000000 -0200
-+++ ktrack/drivers/mmc/host/s3cmci.h 2008-10-17 05:47:06.000000000 -0200
-@@ -67,4 +67,6 @@
-
+--- ktrack.orig/drivers/mmc/host/s3cmci.h 2008-10-29 00:57:08.000000000 -0200
++++ ktrack/drivers/mmc/host/s3cmci.h 2008-10-29 03:49:21.000000000 -0200
+@@ -68,6 +68,8 @@
unsigned int ccnt, dcnt;
struct tasklet_struct pio_tasklet;
+
++ int irq_disabled;
+
-+ int irq_disabled;
- };
+ #ifdef CONFIG_CPU_FREQ
+ struct notifier_block freq_transition;
+ #endif
Modified: developers/werner/wlan-spi/patches-tracking/s3c-spi-from-int-to-poll.patch
===================================================================
--- developers/werner/wlan-spi/patches-tracking/s3c-spi-from-int-to-poll.patch 2008-10-28 10:15:19 UTC (rev 4732)
+++ developers/werner/wlan-spi/patches-tracking/s3c-spi-from-int-to-poll.patch 2008-10-30 02:08:10 UTC (rev 4733)
@@ -6,8 +6,8 @@
Index: ktrack/drivers/spi/spi_s3c24xx.c
===================================================================
---- ktrack.orig/drivers/spi/spi_s3c24xx.c 2008-10-15 23:14:27.000000000 -0200
-+++ ktrack/drivers/spi/spi_s3c24xx.c 2008-10-16 00:36:32.000000000 -0200
+--- ktrack.orig/drivers/spi/spi_s3c24xx.c 2008-10-29 03:47:03.000000000 -0200
++++ ktrack/drivers/spi/spi_s3c24xx.c 2008-10-29 03:47:04.000000000 -0200
@@ -56,7 +56,7 @@
struct s3c2410_spi_info *pdata;
};
@@ -69,7 +69,7 @@
}
static irqreturn_t s3c24xx_spi_irq(int irq, void *dev)
-@@ -352,6 +362,7 @@
+@@ -355,6 +365,7 @@
goto err_no_iomap;
}
@@ -77,7 +77,7 @@
hw->irq = platform_get_irq(pdev, 0);
if (hw->irq < 0) {
dev_err(&pdev->dev, "No IRQ specified\n");
-@@ -364,6 +375,7 @@
+@@ -367,6 +378,7 @@
dev_err(&pdev->dev, "Cannot claim IRQ\n");
goto err_no_irq;
}
@@ -85,7 +85,7 @@
hw->clk = clk_get(&pdev->dev, "spi");
if (IS_ERR(hw->clk)) {
-@@ -399,7 +411,7 @@
+@@ -402,7 +414,7 @@
clk_put(hw->clk);
err_no_clk:
@@ -94,7 +94,7 @@
err_no_irq:
iounmap(hw->regs);
-@@ -427,7 +439,7 @@
+@@ -430,7 +442,7 @@
clk_disable(hw->clk);
clk_put(hw->clk);
Modified: developers/werner/wlan-spi/patches-tracking/series
===================================================================
--- developers/werner/wlan-spi/patches-tracking/series 2008-10-28 10:15:19 UTC (rev 4732)
+++ developers/werner/wlan-spi/patches-tracking/series 2008-10-30 02:08:10 UTC (rev 4733)
@@ -6,6 +6,14 @@
# mv sdio/function/wlan/ar6000 .
# rm -rf sdio ../include/linux/sdio
#
+# Alternative procedure:
+#
+# rm -rf drivers/ar6000 # in case this operation is repeated
+# git mv drivers/sdio/function/wlan/ar6000 drivers/ar6000
+# git rm -r drivers/sdio include/linux/sdio
+# git commit -m "Remove Atheros SDIO stack."
+# rm -rf drivers/sdio
+#
hack-disable-ecc.patch
hack-mmc-spi-coexistence.patch
@@ -16,13 +24,17 @@
gta02-mmc-spi.patch
s3c-spi-fix-int-mode.patch
s3c-spi-from-int-to-poll.patch
+
+# broken in recent stable-tracking
+
gta02-mmc-mci.patch
# dirty experimental stuff follows
# didn't survive the move to 2.6.27 :-(
-#hack-dont-poll-irq.patch
-#hif-direct-interrupt.patch
-#hif-can-do-async.patch
-s3c-mmc-hdrmig-fix.patch
+hack-dont-poll-irq.patch
+hif-direct-interrupt.patch
+hif-can-do-async.patch
+
+# still needs a bit more love ...
s3c-mmc-sdio-int.patch
More information about the commitlog
mailing list