projects
/
openwrt
/
staging
/
chunkeey.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
9f44b58
)
omap24xx: Update MMC fixes
author
Michael Büsch
<mb@bu3sch.de>
Sun, 27 Feb 2011 00:07:57 +0000
(
00:07
+0000)
committer
Michael Büsch
<mb@bu3sch.de>
Sun, 27 Feb 2011 00:07:57 +0000
(
00:07
+0000)
SVN-Revision: 25747
target/linux/omap24xx/patches-2.6.38/810-mmc-fixes.patch
patch
|
blob
|
history
diff --git
a/target/linux/omap24xx/patches-2.6.38/810-mmc-fixes.patch
b/target/linux/omap24xx/patches-2.6.38/810-mmc-fixes.patch
index 3142855409962d5447448f29bbdf792c637a9735..6abcf9823b8d875ac0cd645c2e966d514684919a 100644
(file)
--- a/
target/linux/omap24xx/patches-2.6.38/810-mmc-fixes.patch
+++ b/
target/linux/omap24xx/patches-2.6.38/810-mmc-fixes.patch
@@
-1,22
+1,7
@@
----
- drivers/mmc/core/core.c | 5 +++--
- drivers/mmc/host/omap.c | 7 +++++--
- include/linux/mmc/host.h | 2 ++
- 3 files changed, 10 insertions(+), 4 deletions(-)
-
Index: linux-2.6.38-rc6/drivers/mmc/host/omap.c
===================================================================
--- linux-2.6.38-rc6.orig/drivers/mmc/host/omap.c 2011-02-22 02:25:52.000000000 +0100
Index: linux-2.6.38-rc6/drivers/mmc/host/omap.c
===================================================================
--- linux-2.6.38-rc6.orig/drivers/mmc/host/omap.c 2011-02-22 02:25:52.000000000 +0100
-+++ linux-2.6.38-rc6/drivers/mmc/host/omap.c 2011-02-24 00:40:46.129908862 +0100
-@@ -389,7 +389,7 @@
-
- mod_timer(&host->cmd_abort_timer, jiffies + HZ/2);
-
-- OMAP_MMC_WRITE(host, CTO, 200);
-+// OMAP_MMC_WRITE(host, CTO, 200);
- OMAP_MMC_WRITE(host, ARGL, cmd->arg & 0xffff);
- OMAP_MMC_WRITE(host, ARGH, cmd->arg >> 16);
- OMAP_MMC_WRITE(host, IE,
++++ linux-2.6.38-rc6/drivers/mmc/host/omap.c 2011-02-27 00:58:54.735744872 +0100
@@ -1456,6 +1456,7 @@
host->dma_ch = -1;
@@ -1456,6 +1456,7 @@
host->dma_ch = -1;
@@
-39,7
+24,7
@@
Index: linux-2.6.38-rc6/drivers/mmc/host/omap.c
Index: linux-2.6.38-rc6/drivers/mmc/core/core.c
===================================================================
--- linux-2.6.38-rc6.orig/drivers/mmc/core/core.c 2011-02-22 02:25:52.000000000 +0100
Index: linux-2.6.38-rc6/drivers/mmc/core/core.c
===================================================================
--- linux-2.6.38-rc6.orig/drivers/mmc/core/core.c 2011-02-22 02:25:52.000000000 +0100
-+++ linux-2.6.38-rc6/drivers/mmc/core/core.c 2011-02-2
4 00:40:46.13190878
4 +0100
++++ linux-2.6.38-rc6/drivers/mmc/core/core.c 2011-02-2
7 00:57:32.63355699
4 +0100
@@ -75,12 +75,13 @@
}
@@ -75,12 +75,13 @@
}
@@
-59,7
+44,7
@@
Index: linux-2.6.38-rc6/drivers/mmc/core/core.c
Index: linux-2.6.38-rc6/include/linux/mmc/host.h
===================================================================
--- linux-2.6.38-rc6.orig/include/linux/mmc/host.h 2011-02-22 02:25:52.000000000 +0100
Index: linux-2.6.38-rc6/include/linux/mmc/host.h
===================================================================
--- linux-2.6.38-rc6.orig/include/linux/mmc/host.h 2011-02-22 02:25:52.000000000 +0100
-+++ linux-2.6.38-rc6/include/linux/mmc/host.h 2011-02-2
4 00:40:46.13190878
4 +0100
++++ linux-2.6.38-rc6/include/linux/mmc/host.h 2011-02-2
7 00:57:32.63355699
4 +0100
@@ -326,5 +326,7 @@
return host->pm_flags & MMC_PM_KEEP_POWER;
}
@@ -326,5 +326,7 @@
return host->pm_flags & MMC_PM_KEEP_POWER;
}