1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
|
diff -Nurp linux-2.6.21.4/drivers/mmc/at91_mci.c b/drivers/mmc/at91_mci.c
--- linux-2.6.21.4/drivers/mmc/at91_mci.c 2007-06-12 22:29:12.000000000 +0200
+++ b/drivers/mmc/at91_mci.c 2007-06-12 03:52:55.000000000 +0200
@@ -421,8 +421,11 @@ static unsigned int at91_mci_send_comman
if (cmd->opcode == MMC_STOP_TRANSMISSION)
cmdr |= AT91_MCI_TRCMD_STOP;
- if (host->bus_mode == MMC_BUSMODE_OPENDRAIN)
- cmdr |= AT91_MCI_OPDCMD;
+ //if (host->bus_mode == MMC_BUSMODE_OPENDRAIN)
+ // cmdr |= AT91_MCI_OPDCMD;
+
+ if (!(1/**machine_is_sarge*/) && host->bus_mode == MMC_BUSMODE_OPENDRAIN)
+ cmdr |= AT91_MCI_OPDCMD;
/*
* Set the arguments and send the command
@@ -739,7 +742,13 @@ static irqreturn_t at91_mci_irq(int irq,
at91_mci_write(host, AT91_MCI_IDR, 0xffffffff);
at91mci_completed_command(host);
} else
+// at91_mci_write(host, AT91_MCI_IDR, int_status);
+ {
+ if (1 /*machine_is_sarge()*/)
+ at91_mci_write(host, AT91_MCI_IDR, (int_status & ~AT91_MCI_TXRDY) );
+ else
at91_mci_write(host, AT91_MCI_IDR, int_status);
+ }
return IRQ_HANDLED;
}
diff -Nurp linux-2.6.21.4/drivers/mmc/mmc_block.c b/drivers/mmc/mmc_block.c
--- linux-2.6.21.4/drivers/mmc/mmc_block.c 2007-06-07 23:27:31.000000000 +0200
+++ b/drivers/mmc/mmc_block.c 2007-06-12 04:19:36.000000000 +0200
@@ -256,10 +256,24 @@ static int mmc_blk_issue_rq(struct mmc_q
* this rule as they support querying the number of
* successfully written sectors.
*/
- if (rq_data_dir(req) != READ &&
+// if (rq_data_dir(req) != READ &&
+ if ((1/**machine_is_sarge*/))
+ {
+ if (rq_data_dir(req) != READ)
+ brq.data.blocks = 1;
+ }
+ else if (rq_data_dir(req) != READ &&
+
!(card->host->caps & MMC_CAP_MULTIWRITE) &&
!mmc_card_sd(card))
brq.data.blocks = 1;
+
+
+
+
+
+
+
if (brq.data.blocks > 1) {
brq.data.flags |= MMC_DATA_MULTI;
diff -Nurp linux-2.6.21.4/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
--- linux-2.6.21.4/drivers/mmc/mmc.c 2007-06-07 23:27:31.000000000 +0200
+++ b/drivers/mmc/mmc.c 2007-06-12 04:10:05.000000000 +0200
@@ -1500,12 +1500,22 @@ static void mmc_setup(struct mmc_host *h
mmc_set_ios(host);
mmc_read_csds(host);
-
+ /*
if (host->mode == MMC_MODE_SD) {
mmc_read_scrs(host);
mmc_read_switch_caps(host);
} else
mmc_process_ext_csds(host);
+ */
+
+ if (!(1/*machine_is_sarge*/))
+ {
+ if (host->mode == MMC_MODE_SD) {
+ mmc_read_scrs(host);
+ mmc_read_switch_caps(host);
+ } else
+ mmc_process_ext_csds(host);
+ }
}
|
