r2360 - trunk/src/target/kernel/patches
laforge at sita.openmoko.org
laforge at sita.openmoko.org
Thu Jul 5 17:02:39 CEST 2007
Author: laforge
Date: 2007-07-05 17:02:38 +0200 (Thu, 05 Jul 2007)
New Revision: 2360
Modified:
trunk/src/target/kernel/patches/s3c_mci.patch
Log:
* fix 'unfinished read' problems due to missing max_blk_count/max_blk_size (Roman Moravcik)
Modified: trunk/src/target/kernel/patches/s3c_mci.patch
===================================================================
--- trunk/src/target/kernel/patches/s3c_mci.patch 2007-07-04 20:55:44 UTC (rev 2359)
+++ trunk/src/target/kernel/patches/s3c_mci.patch 2007-07-05 15:02:38 UTC (rev 2360)
@@ -1,9 +1,9 @@
This is the latest S3C MMC/SD driver by Thomas Kleffel
-Index: linux-2.6.21-moko/drivers/mmc/Kconfig
+Index: linux-2.6.21.3-moko/drivers/mmc/Kconfig
===================================================================
---- linux-2.6.21-moko.orig/drivers/mmc/Kconfig
-+++ linux-2.6.21-moko/drivers/mmc/Kconfig
+--- linux-2.6.21.3-moko.orig/drivers/mmc/Kconfig
++++ linux-2.6.21.3-moko/drivers/mmc/Kconfig
@@ -125,4 +125,16 @@
To compile this driver as a module, choose M here: the
module will be called tifm_sd.
@@ -21,10 +21,10 @@
+
+
endmenu
-Index: linux-2.6.21-moko/drivers/mmc/mmc_debug.c
+Index: linux-2.6.21.3-moko/drivers/mmc/mmc_debug.c
===================================================================
--- /dev/null
-+++ linux-2.6.21-moko/drivers/mmc/mmc_debug.c
++++ linux-2.6.21.3-moko/drivers/mmc/mmc_debug.c
@@ -0,0 +1,59 @@
+/*
+ * linux/drivers/mmc/mmc_debug.c
@@ -85,10 +85,10 @@
+ }
+}
+EXPORT_SYMBOL(mmc_err2str);
-Index: linux-2.6.21-moko/drivers/mmc/mmc_debug.h
+Index: linux-2.6.21.3-moko/drivers/mmc/mmc_debug.h
===================================================================
--- /dev/null
-+++ linux-2.6.21-moko/drivers/mmc/mmc_debug.h
++++ linux-2.6.21.3-moko/drivers/mmc/mmc_debug.h
@@ -0,0 +1,7 @@
+#ifndef MMC_DEBUG_H
+#define MMC_DEBUG_H
@@ -97,11 +97,11 @@
+char *mmc_err2str(int err);
+
+#endif /* MMC_DEBUG_H */
-Index: linux-2.6.21-moko/drivers/mmc/s3cmci.c
+Index: linux-2.6.21.3-moko/drivers/mmc/s3cmci.c
===================================================================
--- /dev/null
-+++ linux-2.6.21-moko/drivers/mmc/s3cmci.c
-@@ -0,0 +1,1339 @@
++++ linux-2.6.21.3-moko/drivers/mmc/s3cmci.c
+@@ -0,0 +1,1341 @@
+/*
+ * linux/drivers/mmc/s3cmci.h - Samsung S3C MCI driver
+ *
@@ -1293,6 +1293,8 @@
+ mmc->f_min = host->clk_rate / (host->clk_div * 256);
+ mmc->f_max = host->clk_rate / host->clk_div;
+
++ mmc->max_blk_count = 4095;
++ mmc->max_blk_size = 4095;
+ mmc->max_req_size = 4095 * 512;
+ mmc->max_seg_size = mmc->max_req_size;
+
@@ -1441,10 +1443,10 @@
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Thomas Kleffel <tk at maintech.de>");
+
-Index: linux-2.6.21-moko/drivers/mmc/s3cmci.h
+Index: linux-2.6.21.3-moko/drivers/mmc/s3cmci.h
===================================================================
--- /dev/null
-+++ linux-2.6.21-moko/drivers/mmc/s3cmci.h
++++ linux-2.6.21.3-moko/drivers/mmc/s3cmci.h
@@ -0,0 +1,71 @@
+/*
+ * linux/drivers/mmc/s3cmci.h - Samsung S3C MCI driver
@@ -1517,10 +1519,10 @@
+ unsigned int ccnt, dcnt;
+ struct tasklet_struct pio_tasklet;
+};
-Index: linux-2.6.21-moko/include/asm-arm/arch-s3c2410/regs-sdi.h
+Index: linux-2.6.21.3-moko/include/asm-arm/arch-s3c2410/regs-sdi.h
===================================================================
---- linux-2.6.21-moko.orig/include/asm-arm/arch-s3c2410/regs-sdi.h
-+++ linux-2.6.21-moko/include/asm-arm/arch-s3c2410/regs-sdi.h
+--- linux-2.6.21.3-moko.orig/include/asm-arm/arch-s3c2410/regs-sdi.h
++++ linux-2.6.21.3-moko/include/asm-arm/arch-s3c2410/regs-sdi.h
@@ -28,9 +28,15 @@
#define S3C2410_SDIDCNT (0x30)
#define S3C2410_SDIDSTA (0x34)
@@ -1588,10 +1590,10 @@
#define S3C2410_SDIFSTA_RFLAST (1<<9)
#define S3C2410_SDIFSTA_RFFULL (1<<8)
#define S3C2410_SDIFSTA_RFHALF (1<<7)
-Index: linux-2.6.21-moko/include/linux/mmc/mmc.h
+Index: linux-2.6.21.3-moko/include/linux/mmc/mmc.h
===================================================================
---- linux-2.6.21-moko.orig/include/linux/mmc/mmc.h
-+++ linux-2.6.21-moko/include/linux/mmc/mmc.h
+--- linux-2.6.21.3-moko.orig/include/linux/mmc/mmc.h
++++ linux-2.6.21.3-moko/include/linux/mmc/mmc.h
@@ -55,12 +55,15 @@
unsigned int retries; /* max number of retries */
unsigned int error; /* command error */
@@ -1614,10 +1616,10 @@
struct mmc_data *data; /* data segment associated with cmd */
struct mmc_request *mrq; /* associated request */
-Index: linux-2.6.21-moko/drivers/mmc/Makefile
+Index: linux-2.6.21.3-moko/drivers/mmc/Makefile
===================================================================
---- linux-2.6.21-moko.orig/drivers/mmc/Makefile
-+++ linux-2.6.21-moko/drivers/mmc/Makefile
+--- linux-2.6.21.3-moko.orig/drivers/mmc/Makefile
++++ linux-2.6.21.3-moko/drivers/mmc/Makefile
@@ -24,10 +24,12 @@
obj-$(CONFIG_MMC_OMAP) += omap.o
obj-$(CONFIG_MMC_AT91) += at91_mci.o
More information about the commitlog
mailing list
