Changeset 25747


Ignore:
Timestamp:
2011-02-27T01:07:57+01:00 (7 years ago)
Author:
mb
Message:

omap24xx: Update MMC fixes

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/omap24xx/patches-2.6.38/810-mmc-fixes.patch

    r25746 r25747  
    1 --- 
    2  drivers/mmc/core/core.c  |    5 +++-- 
    3  drivers/mmc/host/omap.c  |    7 +++++-- 
    4  include/linux/mmc/host.h |    2 ++ 
    5  3 files changed, 10 insertions(+), 4 deletions(-) 
    6  
    71Index: linux-2.6.38-rc6/drivers/mmc/host/omap.c 
    82=================================================================== 
    93--- linux-2.6.38-rc6.orig/drivers/mmc/host/omap.c       2011-02-22 02:25:52.000000000 +0100 
    10 +++ linux-2.6.38-rc6/drivers/mmc/host/omap.c    2011-02-24 00:40:46.129908862 +0100 
    11 @@ -389,7 +389,7 @@ 
    12   
    13         mod_timer(&host->cmd_abort_timer, jiffies + HZ/2); 
    14   
    15 -       OMAP_MMC_WRITE(host, CTO, 200); 
    16 +//     OMAP_MMC_WRITE(host, CTO, 200); 
    17         OMAP_MMC_WRITE(host, ARGL, cmd->arg & 0xffff); 
    18         OMAP_MMC_WRITE(host, ARGH, cmd->arg >> 16); 
    19         OMAP_MMC_WRITE(host, IE, 
     4+++ linux-2.6.38-rc6/drivers/mmc/host/omap.c    2011-02-27 00:58:54.735744872 +0100 
    205@@ -1456,6 +1456,7 @@ 
    216        host->dma_ch = -1; 
     
    4025=================================================================== 
    4126--- linux-2.6.38-rc6.orig/drivers/mmc/core/core.c       2011-02-22 02:25:52.000000000 +0100 
    42 +++ linux-2.6.38-rc6/drivers/mmc/core/core.c    2011-02-24 00:40:46.131908784 +0100 
     27+++ linux-2.6.38-rc6/drivers/mmc/core/core.c    2011-02-27 00:57:32.633556994 +0100 
    4328@@ -75,12 +75,13 @@ 
    4429 } 
     
    6045=================================================================== 
    6146--- linux-2.6.38-rc6.orig/include/linux/mmc/host.h      2011-02-22 02:25:52.000000000 +0100 
    62 +++ linux-2.6.38-rc6/include/linux/mmc/host.h   2011-02-24 00:40:46.131908784 +0100 
     47+++ linux-2.6.38-rc6/include/linux/mmc/host.h   2011-02-27 00:57:32.633556994 +0100 
    6348@@ -326,5 +326,7 @@ 
    6449        return host->pm_flags & MMC_PM_KEEP_POWER; 
Note: See TracChangeset for help on using the changeset viewer.