diff options
Diffstat (limited to 'drivers/mmc')
-rw-r--r-- | drivers/mmc/host/Kconfig | 10 | ||||
-rw-r--r-- | drivers/mmc/host/Makefile | 1 | ||||
-rw-r--r-- | drivers/mmc/host/mmci.c | 37 | ||||
-rw-r--r-- | drivers/mmc/host/mmci.h | 28 | ||||
-rw-r--r-- | drivers/mmc/host/mxcmmc.c | 880 | ||||
-rw-r--r-- | drivers/mmc/host/pxamci.c | 25 | ||||
-rw-r--r-- | drivers/mmc/host/ricoh_mmc.c | 8 |
7 files changed, 975 insertions, 14 deletions
diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig index 0efa390978bd..99d4b28d52ed 100644 --- a/drivers/mmc/host/Kconfig +++ b/drivers/mmc/host/Kconfig | |||
@@ -145,6 +145,16 @@ config MMC_IMX | |||
145 | 145 | ||
146 | If unsure, say N. | 146 | If unsure, say N. |
147 | 147 | ||
148 | config MMC_MXC | ||
149 | tristate "Freescale i.MX2/3 Multimedia Card Interface support" | ||
150 | depends on ARCH_MXC | ||
151 | help | ||
152 | This selects the Freescale i.MX2/3 Multimedia card Interface. | ||
153 | If you have a i.MX platform with a Multimedia Card slot, | ||
154 | say Y or M here. | ||
155 | |||
156 | If unsure, say N. | ||
157 | |||
148 | config MMC_TIFM_SD | 158 | config MMC_TIFM_SD |
149 | tristate "TI Flash Media MMC/SD Interface support (EXPERIMENTAL)" | 159 | tristate "TI Flash Media MMC/SD Interface support (EXPERIMENTAL)" |
150 | depends on EXPERIMENTAL && PCI | 160 | depends on EXPERIMENTAL && PCI |
diff --git a/drivers/mmc/host/Makefile b/drivers/mmc/host/Makefile index 98cab84829b8..dedec55861d9 100644 --- a/drivers/mmc/host/Makefile +++ b/drivers/mmc/host/Makefile | |||
@@ -9,6 +9,7 @@ endif | |||
9 | obj-$(CONFIG_MMC_ARMMMCI) += mmci.o | 9 | obj-$(CONFIG_MMC_ARMMMCI) += mmci.o |
10 | obj-$(CONFIG_MMC_PXA) += pxamci.o | 10 | obj-$(CONFIG_MMC_PXA) += pxamci.o |
11 | obj-$(CONFIG_MMC_IMX) += imxmmc.o | 11 | obj-$(CONFIG_MMC_IMX) += imxmmc.o |
12 | obj-$(CONFIG_MMC_MXC) += mxcmmc.o | ||
12 | obj-$(CONFIG_MMC_SDHCI) += sdhci.o | 13 | obj-$(CONFIG_MMC_SDHCI) += sdhci.o |
13 | obj-$(CONFIG_MMC_SDHCI_PCI) += sdhci-pci.o | 14 | obj-$(CONFIG_MMC_SDHCI_PCI) += sdhci-pci.o |
14 | obj-$(CONFIG_MMC_RICOH_MMC) += ricoh_mmc.o | 15 | obj-$(CONFIG_MMC_RICOH_MMC) += ricoh_mmc.o |
diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c index 1bcbdd6763ac..2909bbc8ad00 100644 --- a/drivers/mmc/host/mmci.c +++ b/drivers/mmc/host/mmci.c | |||
@@ -430,6 +430,8 @@ static void mmci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) | |||
430 | clk = 255; | 430 | clk = 255; |
431 | host->cclk = host->mclk / (2 * (clk + 1)); | 431 | host->cclk = host->mclk / (2 * (clk + 1)); |
432 | } | 432 | } |
433 | if (host->hw_designer == 0x80) | ||
434 | clk |= MCI_FCEN; /* Bug fix in ST IP block */ | ||
433 | clk |= MCI_CLK_ENABLE; | 435 | clk |= MCI_CLK_ENABLE; |
434 | } | 436 | } |
435 | 437 | ||
@@ -440,15 +442,27 @@ static void mmci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) | |||
440 | case MMC_POWER_OFF: | 442 | case MMC_POWER_OFF: |
441 | break; | 443 | break; |
442 | case MMC_POWER_UP: | 444 | case MMC_POWER_UP: |
443 | pwr |= MCI_PWR_UP; | 445 | /* The ST version does not have this, fall through to POWER_ON */ |
444 | break; | 446 | if (host->hw_designer != 0x80) { |
447 | pwr |= MCI_PWR_UP; | ||
448 | break; | ||
449 | } | ||
445 | case MMC_POWER_ON: | 450 | case MMC_POWER_ON: |
446 | pwr |= MCI_PWR_ON; | 451 | pwr |= MCI_PWR_ON; |
447 | break; | 452 | break; |
448 | } | 453 | } |
449 | 454 | ||
450 | if (ios->bus_mode == MMC_BUSMODE_OPENDRAIN) | 455 | if (ios->bus_mode == MMC_BUSMODE_OPENDRAIN) { |
451 | pwr |= MCI_ROD; | 456 | if (host->hw_designer != 0x80) |
457 | pwr |= MCI_ROD; | ||
458 | else { | ||
459 | /* | ||
460 | * The ST Micro variant use the ROD bit for something | ||
461 | * else and only has OD (Open Drain). | ||
462 | */ | ||
463 | pwr |= MCI_OD; | ||
464 | } | ||
465 | } | ||
452 | 466 | ||
453 | writel(clk, host->base + MMCICLOCK); | 467 | writel(clk, host->base + MMCICLOCK); |
454 | 468 | ||
@@ -500,6 +514,12 @@ static int mmci_probe(struct amba_device *dev, void *id) | |||
500 | } | 514 | } |
501 | 515 | ||
502 | host = mmc_priv(mmc); | 516 | host = mmc_priv(mmc); |
517 | /* Bits 12 thru 19 is the designer */ | ||
518 | host->hw_designer = (dev->periphid >> 12) & 0xff; | ||
519 | /* Bits 20 thru 23 is the revison */ | ||
520 | host->hw_revision = (dev->periphid >> 20) & 0xf; | ||
521 | DBG(host, "designer ID = 0x%02x\n", host->hw_designer); | ||
522 | DBG(host, "revision = 0x%01x\n", host->hw_revision); | ||
503 | host->clk = clk_get(&dev->dev, NULL); | 523 | host->clk = clk_get(&dev->dev, NULL); |
504 | if (IS_ERR(host->clk)) { | 524 | if (IS_ERR(host->clk)) { |
505 | ret = PTR_ERR(host->clk); | 525 | ret = PTR_ERR(host->clk); |
@@ -693,6 +713,15 @@ static struct amba_id mmci_ids[] = { | |||
693 | .id = 0x00041181, | 713 | .id = 0x00041181, |
694 | .mask = 0x000fffff, | 714 | .mask = 0x000fffff, |
695 | }, | 715 | }, |
716 | /* ST Micro variants */ | ||
717 | { | ||
718 | .id = 0x00180180, | ||
719 | .mask = 0x00ffffff, | ||
720 | }, | ||
721 | { | ||
722 | .id = 0x00280180, | ||
723 | .mask = 0x00ffffff, | ||
724 | }, | ||
696 | { 0, 0 }, | 725 | { 0, 0 }, |
697 | }; | 726 | }; |
698 | 727 | ||
diff --git a/drivers/mmc/host/mmci.h b/drivers/mmc/host/mmci.h index 0f39c490f022..0441bac1c0ec 100644 --- a/drivers/mmc/host/mmci.h +++ b/drivers/mmc/host/mmci.h | |||
@@ -11,13 +11,23 @@ | |||
11 | #define MCI_PWR_OFF 0x00 | 11 | #define MCI_PWR_OFF 0x00 |
12 | #define MCI_PWR_UP 0x02 | 12 | #define MCI_PWR_UP 0x02 |
13 | #define MCI_PWR_ON 0x03 | 13 | #define MCI_PWR_ON 0x03 |
14 | #define MCI_DATA2DIREN (1 << 2) | ||
15 | #define MCI_CMDDIREN (1 << 3) | ||
16 | #define MCI_DATA0DIREN (1 << 4) | ||
17 | #define MCI_DATA31DIREN (1 << 5) | ||
14 | #define MCI_OD (1 << 6) | 18 | #define MCI_OD (1 << 6) |
15 | #define MCI_ROD (1 << 7) | 19 | #define MCI_ROD (1 << 7) |
20 | /* The ST Micro version does not have ROD */ | ||
21 | #define MCI_FBCLKEN (1 << 7) | ||
22 | #define MCI_DATA74DIREN (1 << 8) | ||
16 | 23 | ||
17 | #define MMCICLOCK 0x004 | 24 | #define MMCICLOCK 0x004 |
18 | #define MCI_CLK_ENABLE (1 << 8) | 25 | #define MCI_CLK_ENABLE (1 << 8) |
19 | #define MCI_CLK_PWRSAVE (1 << 9) | 26 | #define MCI_CLK_PWRSAVE (1 << 9) |
20 | #define MCI_CLK_BYPASS (1 << 10) | 27 | #define MCI_CLK_BYPASS (1 << 10) |
28 | #define MCI_WIDE_BUS (1 << 11) | ||
29 | /* HW flow control on the ST Micro version */ | ||
30 | #define MCI_FCEN (1 << 13) | ||
21 | 31 | ||
22 | #define MMCIARGUMENT 0x008 | 32 | #define MMCIARGUMENT 0x008 |
23 | #define MMCICOMMAND 0x00c | 33 | #define MMCICOMMAND 0x00c |
@@ -26,6 +36,10 @@ | |||
26 | #define MCI_CPSM_INTERRUPT (1 << 8) | 36 | #define MCI_CPSM_INTERRUPT (1 << 8) |
27 | #define MCI_CPSM_PENDING (1 << 9) | 37 | #define MCI_CPSM_PENDING (1 << 9) |
28 | #define MCI_CPSM_ENABLE (1 << 10) | 38 | #define MCI_CPSM_ENABLE (1 << 10) |
39 | #define MCI_SDIO_SUSP (1 << 11) | ||
40 | #define MCI_ENCMD_COMPL (1 << 12) | ||
41 | #define MCI_NIEN (1 << 13) | ||
42 | #define MCI_CE_ATACMD (1 << 14) | ||
29 | 43 | ||
30 | #define MMCIRESPCMD 0x010 | 44 | #define MMCIRESPCMD 0x010 |
31 | #define MMCIRESPONSE0 0x014 | 45 | #define MMCIRESPONSE0 0x014 |
@@ -39,6 +53,11 @@ | |||
39 | #define MCI_DPSM_DIRECTION (1 << 1) | 53 | #define MCI_DPSM_DIRECTION (1 << 1) |
40 | #define MCI_DPSM_MODE (1 << 2) | 54 | #define MCI_DPSM_MODE (1 << 2) |
41 | #define MCI_DPSM_DMAENABLE (1 << 3) | 55 | #define MCI_DPSM_DMAENABLE (1 << 3) |
56 | #define MCI_DPSM_BLOCKSIZE (1 << 4) | ||
57 | #define MCI_DPSM_RWSTART (1 << 8) | ||
58 | #define MCI_DPSM_RWSTOP (1 << 9) | ||
59 | #define MCI_DPSM_RWMOD (1 << 10) | ||
60 | #define MCI_DPSM_SDIOEN (1 << 11) | ||
42 | 61 | ||
43 | #define MMCIDATACNT 0x030 | 62 | #define MMCIDATACNT 0x030 |
44 | #define MMCISTATUS 0x034 | 63 | #define MMCISTATUS 0x034 |
@@ -63,6 +82,8 @@ | |||
63 | #define MCI_RXFIFOEMPTY (1 << 19) | 82 | #define MCI_RXFIFOEMPTY (1 << 19) |
64 | #define MCI_TXDATAAVLBL (1 << 20) | 83 | #define MCI_TXDATAAVLBL (1 << 20) |
65 | #define MCI_RXDATAAVLBL (1 << 21) | 84 | #define MCI_RXDATAAVLBL (1 << 21) |
85 | #define MCI_SDIOIT (1 << 22) | ||
86 | #define MCI_CEATAEND (1 << 23) | ||
66 | 87 | ||
67 | #define MMCICLEAR 0x038 | 88 | #define MMCICLEAR 0x038 |
68 | #define MCI_CMDCRCFAILCLR (1 << 0) | 89 | #define MCI_CMDCRCFAILCLR (1 << 0) |
@@ -75,6 +96,8 @@ | |||
75 | #define MCI_CMDSENTCLR (1 << 7) | 96 | #define MCI_CMDSENTCLR (1 << 7) |
76 | #define MCI_DATAENDCLR (1 << 8) | 97 | #define MCI_DATAENDCLR (1 << 8) |
77 | #define MCI_DATABLOCKENDCLR (1 << 10) | 98 | #define MCI_DATABLOCKENDCLR (1 << 10) |
99 | #define MCI_SDIOITC (1 << 22) | ||
100 | #define MCI_CEATAENDC (1 << 23) | ||
78 | 101 | ||
79 | #define MMCIMASK0 0x03c | 102 | #define MMCIMASK0 0x03c |
80 | #define MCI_CMDCRCFAILMASK (1 << 0) | 103 | #define MCI_CMDCRCFAILMASK (1 << 0) |
@@ -98,6 +121,8 @@ | |||
98 | #define MCI_RXFIFOEMPTYMASK (1 << 19) | 121 | #define MCI_RXFIFOEMPTYMASK (1 << 19) |
99 | #define MCI_TXDATAAVLBLMASK (1 << 20) | 122 | #define MCI_TXDATAAVLBLMASK (1 << 20) |
100 | #define MCI_RXDATAAVLBLMASK (1 << 21) | 123 | #define MCI_RXDATAAVLBLMASK (1 << 21) |
124 | #define MCI_SDIOITMASK (1 << 22) | ||
125 | #define MCI_CEATAENDMASK (1 << 23) | ||
101 | 126 | ||
102 | #define MMCIMASK1 0x040 | 127 | #define MMCIMASK1 0x040 |
103 | #define MMCIFIFOCNT 0x048 | 128 | #define MMCIFIFOCNT 0x048 |
@@ -136,6 +161,9 @@ struct mmci_host { | |||
136 | u32 pwr; | 161 | u32 pwr; |
137 | struct mmc_platform_data *plat; | 162 | struct mmc_platform_data *plat; |
138 | 163 | ||
164 | u8 hw_designer; | ||
165 | u8 hw_revision:4; | ||
166 | |||
139 | struct timer_list timer; | 167 | struct timer_list timer; |
140 | unsigned int oldstat; | 168 | unsigned int oldstat; |
141 | 169 | ||
diff --git a/drivers/mmc/host/mxcmmc.c b/drivers/mmc/host/mxcmmc.c new file mode 100644 index 000000000000..dda0be4e25dc --- /dev/null +++ b/drivers/mmc/host/mxcmmc.c | |||
@@ -0,0 +1,880 @@ | |||
1 | /* | ||
2 | * linux/drivers/mmc/host/mxcmmc.c - Freescale i.MX MMCI driver | ||
3 | * | ||
4 | * This is a driver for the SDHC controller found in Freescale MX2/MX3 | ||
5 | * SoCs. It is basically the same hardware as found on MX1 (imxmmc.c). | ||
6 | * Unlike the hardware found on MX1, this hardware just works and does | ||
7 | * not need all the quirks found in imxmmc.c, hence the seperate driver. | ||
8 | * | ||
9 | * Copyright (C) 2008 Sascha Hauer, Pengutronix <s.hauer@pengutronix.de> | ||
10 | * Copyright (C) 2006 Pavel Pisa, PiKRON <ppisa@pikron.com> | ||
11 | * | ||
12 | * derived from pxamci.c by Russell King | ||
13 | * | ||
14 | * This program is free software; you can redistribute it and/or modify | ||
15 | * it under the terms of the GNU General Public License version 2 as | ||
16 | * published by the Free Software Foundation. | ||
17 | * | ||
18 | */ | ||
19 | |||
20 | #include <linux/module.h> | ||
21 | #include <linux/init.h> | ||
22 | #include <linux/ioport.h> | ||
23 | #include <linux/platform_device.h> | ||
24 | #include <linux/interrupt.h> | ||
25 | #include <linux/irq.h> | ||
26 | #include <linux/blkdev.h> | ||
27 | #include <linux/dma-mapping.h> | ||
28 | #include <linux/mmc/host.h> | ||
29 | #include <linux/mmc/card.h> | ||
30 | #include <linux/delay.h> | ||
31 | #include <linux/clk.h> | ||
32 | #include <linux/io.h> | ||
33 | #include <linux/gpio.h> | ||
34 | |||
35 | #include <asm/dma.h> | ||
36 | #include <asm/irq.h> | ||
37 | #include <asm/sizes.h> | ||
38 | #include <mach/mmc.h> | ||
39 | |||
40 | #ifdef CONFIG_ARCH_MX2 | ||
41 | #include <mach/dma-mx1-mx2.h> | ||
42 | #define HAS_DMA | ||
43 | #endif | ||
44 | |||
45 | #define DRIVER_NAME "imx-mmc" | ||
46 | |||
47 | #define MMC_REG_STR_STP_CLK 0x00 | ||
48 | #define MMC_REG_STATUS 0x04 | ||
49 | #define MMC_REG_CLK_RATE 0x08 | ||
50 | #define MMC_REG_CMD_DAT_CONT 0x0C | ||
51 | #define MMC_REG_RES_TO 0x10 | ||
52 | #define MMC_REG_READ_TO 0x14 | ||
53 | #define MMC_REG_BLK_LEN 0x18 | ||
54 | #define MMC_REG_NOB 0x1C | ||
55 | #define MMC_REG_REV_NO 0x20 | ||
56 | #define MMC_REG_INT_CNTR 0x24 | ||
57 | #define MMC_REG_CMD 0x28 | ||
58 | #define MMC_REG_ARG 0x2C | ||
59 | #define MMC_REG_RES_FIFO 0x34 | ||
60 | #define MMC_REG_BUFFER_ACCESS 0x38 | ||
61 | |||
62 | #define STR_STP_CLK_RESET (1 << 3) | ||
63 | #define STR_STP_CLK_START_CLK (1 << 1) | ||
64 | #define STR_STP_CLK_STOP_CLK (1 << 0) | ||
65 | |||
66 | #define STATUS_CARD_INSERTION (1 << 31) | ||
67 | #define STATUS_CARD_REMOVAL (1 << 30) | ||
68 | #define STATUS_YBUF_EMPTY (1 << 29) | ||
69 | #define STATUS_XBUF_EMPTY (1 << 28) | ||
70 | #define STATUS_YBUF_FULL (1 << 27) | ||
71 | #define STATUS_XBUF_FULL (1 << 26) | ||
72 | #define STATUS_BUF_UND_RUN (1 << 25) | ||
73 | #define STATUS_BUF_OVFL (1 << 24) | ||
74 | #define STATUS_SDIO_INT_ACTIVE (1 << 14) | ||
75 | #define STATUS_END_CMD_RESP (1 << 13) | ||
76 | #define STATUS_WRITE_OP_DONE (1 << 12) | ||
77 | #define STATUS_DATA_TRANS_DONE (1 << 11) | ||
78 | #define STATUS_READ_OP_DONE (1 << 11) | ||
79 | #define STATUS_WR_CRC_ERROR_CODE_MASK (3 << 10) | ||
80 | #define STATUS_CARD_BUS_CLK_RUN (1 << 8) | ||
81 | #define STATUS_BUF_READ_RDY (1 << 7) | ||
82 | #define STATUS_BUF_WRITE_RDY (1 << 6) | ||
83 | #define STATUS_RESP_CRC_ERR (1 << 5) | ||
84 | #define STATUS_CRC_READ_ERR (1 << 3) | ||
85 | #define STATUS_CRC_WRITE_ERR (1 << 2) | ||
86 | #define STATUS_TIME_OUT_RESP (1 << 1) | ||
87 | #define STATUS_TIME_OUT_READ (1 << 0) | ||
88 | #define STATUS_ERR_MASK 0x2f | ||
89 | |||
90 | #define CMD_DAT_CONT_CMD_RESP_LONG_OFF (1 << 12) | ||
91 | #define CMD_DAT_CONT_STOP_READWAIT (1 << 11) | ||
92 | #define CMD_DAT_CONT_START_READWAIT (1 << 10) | ||
93 | #define CMD_DAT_CONT_BUS_WIDTH_4 (2 << 8) | ||
94 | #define CMD_DAT_CONT_INIT (1 << 7) | ||
95 | #define CMD_DAT_CONT_WRITE (1 << 4) | ||
96 | #define CMD_DAT_CONT_DATA_ENABLE (1 << 3) | ||
97 | #define CMD_DAT_CONT_RESPONSE_48BIT_CRC (1 << 0) | ||
98 | #define CMD_DAT_CONT_RESPONSE_136BIT (2 << 0) | ||
99 | #define CMD_DAT_CONT_RESPONSE_48BIT (3 << 0) | ||
100 | |||
101 | #define INT_SDIO_INT_WKP_EN (1 << 18) | ||
102 | #define INT_CARD_INSERTION_WKP_EN (1 << 17) | ||
103 | #define INT_CARD_REMOVAL_WKP_EN (1 << 16) | ||
104 | #define INT_CARD_INSERTION_EN (1 << 15) | ||
105 | #define INT_CARD_REMOVAL_EN (1 << 14) | ||
106 | #define INT_SDIO_IRQ_EN (1 << 13) | ||
107 | #define INT_DAT0_EN (1 << 12) | ||
108 | #define INT_BUF_READ_EN (1 << 4) | ||
109 | #define INT_BUF_WRITE_EN (1 << 3) | ||
110 | #define INT_END_CMD_RES_EN (1 << 2) | ||
111 | #define INT_WRITE_OP_DONE_EN (1 << 1) | ||
112 | #define INT_READ_OP_EN (1 << 0) | ||
113 | |||
114 | struct mxcmci_host { | ||
115 | struct mmc_host *mmc; | ||
116 | struct resource *res; | ||
117 | void __iomem *base; | ||
118 | int irq; | ||
119 | int detect_irq; | ||
120 | int dma; | ||
121 | int do_dma; | ||
122 | unsigned int power_mode; | ||
123 | struct imxmmc_platform_data *pdata; | ||
124 | |||
125 | struct mmc_request *req; | ||
126 | struct mmc_command *cmd; | ||
127 | struct mmc_data *data; | ||
128 | |||
129 | unsigned int dma_nents; | ||
130 | unsigned int datasize; | ||
131 | unsigned int dma_dir; | ||
132 | |||
133 | u16 rev_no; | ||
134 | unsigned int cmdat; | ||
135 | |||
136 | struct clk *clk; | ||
137 | |||
138 | int clock; | ||
139 | |||
140 | struct work_struct datawork; | ||
141 | }; | ||
142 | |||
143 | static inline int mxcmci_use_dma(struct mxcmci_host *host) | ||
144 | { | ||
145 | return host->do_dma; | ||
146 | } | ||
147 | |||
148 | static void mxcmci_softreset(struct mxcmci_host *host) | ||
149 | { | ||
150 | int i; | ||
151 | |||
152 | /* reset sequence */ | ||
153 | writew(STR_STP_CLK_RESET, host->base + MMC_REG_STR_STP_CLK); | ||
154 | writew(STR_STP_CLK_RESET | STR_STP_CLK_START_CLK, | ||
155 | host->base + MMC_REG_STR_STP_CLK); | ||
156 | |||
157 | for (i = 0; i < 8; i++) | ||
158 | writew(STR_STP_CLK_START_CLK, host->base + MMC_REG_STR_STP_CLK); | ||
159 | |||
160 | writew(0xff, host->base + MMC_REG_RES_TO); | ||
161 | } | ||
162 | |||
163 | static void mxcmci_setup_data(struct mxcmci_host *host, struct mmc_data *data) | ||
164 | { | ||
165 | unsigned int nob = data->blocks; | ||
166 | unsigned int blksz = data->blksz; | ||
167 | unsigned int datasize = nob * blksz; | ||
168 | #ifdef HAS_DMA | ||
169 | struct scatterlist *sg; | ||
170 | int i; | ||
171 | #endif | ||
172 | if (data->flags & MMC_DATA_STREAM) | ||
173 | nob = 0xffff; | ||
174 | |||
175 | host->data = data; | ||
176 | data->bytes_xfered = 0; | ||
177 | |||
178 | writew(nob, host->base + MMC_REG_NOB); | ||
179 | writew(blksz, host->base + MMC_REG_BLK_LEN); | ||
180 | host->datasize = datasize; | ||
181 | |||
182 | #ifdef HAS_DMA | ||
183 | for_each_sg(data->sg, sg, data->sg_len, i) { | ||
184 | if (sg->offset & 3 || sg->length & 3) { | ||
185 | host->do_dma = 0; | ||
186 | return; | ||
187 | } | ||
188 | } | ||
189 | |||
190 | if (data->flags & MMC_DATA_READ) { | ||
191 | host->dma_dir = DMA_FROM_DEVICE; | ||
192 | host->dma_nents = dma_map_sg(mmc_dev(host->mmc), data->sg, | ||
193 | data->sg_len, host->dma_dir); | ||
194 | |||
195 | imx_dma_setup_sg(host->dma, data->sg, host->dma_nents, datasize, | ||
196 | host->res->start + MMC_REG_BUFFER_ACCESS, | ||
197 | DMA_MODE_READ); | ||
198 | } else { | ||
199 | host->dma_dir = DMA_TO_DEVICE; | ||
200 | host->dma_nents = dma_map_sg(mmc_dev(host->mmc), data->sg, | ||
201 | data->sg_len, host->dma_dir); | ||
202 | |||
203 | imx_dma_setup_sg(host->dma, data->sg, host->dma_nents, datasize, | ||
204 | host->res->start + MMC_REG_BUFFER_ACCESS, | ||
205 | DMA_MODE_WRITE); | ||
206 | } | ||
207 | |||
208 | wmb(); | ||
209 | |||
210 | imx_dma_enable(host->dma); | ||
211 | #endif /* HAS_DMA */ | ||
212 | } | ||
213 | |||
214 | static int mxcmci_start_cmd(struct mxcmci_host *host, struct mmc_command *cmd, | ||
215 | unsigned int cmdat) | ||
216 | { | ||
217 | WARN_ON(host->cmd != NULL); | ||
218 | host->cmd = cmd; | ||
219 | |||
220 | switch (mmc_resp_type(cmd)) { | ||
221 | case MMC_RSP_R1: /* short CRC, OPCODE */ | ||
222 | case MMC_RSP_R1B:/* short CRC, OPCODE, BUSY */ | ||
223 | cmdat |= CMD_DAT_CONT_RESPONSE_48BIT_CRC; | ||
224 | break; | ||
225 | case MMC_RSP_R2: /* long 136 bit + CRC */ | ||
226 | cmdat |= CMD_DAT_CONT_RESPONSE_136BIT; | ||
227 | break; | ||
228 | case MMC_RSP_R3: /* short */ | ||
229 | cmdat |= CMD_DAT_CONT_RESPONSE_48BIT; | ||
230 | break; | ||
231 | case MMC_RSP_NONE: | ||
232 | break; | ||
233 | default: | ||
234 | dev_err(mmc_dev(host->mmc), "unhandled response type 0x%x\n", | ||
235 | mmc_resp_type(cmd)); | ||
236 | cmd->error = -EINVAL; | ||
237 | return -EINVAL; | ||
238 | } | ||
239 | |||
240 | if (mxcmci_use_dma(host)) | ||
241 | writel(INT_READ_OP_EN | INT_WRITE_OP_DONE_EN | | ||
242 | INT_END_CMD_RES_EN, | ||
243 | host->base + MMC_REG_INT_CNTR); | ||
244 | else | ||
245 | writel(INT_END_CMD_RES_EN, host->base + MMC_REG_INT_CNTR); | ||
246 | |||
247 | writew(cmd->opcode, host->base + MMC_REG_CMD); | ||
248 | writel(cmd->arg, host->base + MMC_REG_ARG); | ||
249 | writew(cmdat, host->base + MMC_REG_CMD_DAT_CONT); | ||
250 | |||
251 | return 0; | ||
252 | } | ||
253 | |||
254 | static void mxcmci_finish_request(struct mxcmci_host *host, | ||
255 | struct mmc_request *req) | ||
256 | { | ||
257 | writel(0, host->base + MMC_REG_INT_CNTR); | ||
258 | |||
259 | host->req = NULL; | ||
260 | host->cmd = NULL; | ||
261 | host->data = NULL; | ||
262 | |||
263 | mmc_request_done(host->mmc, req); | ||
264 | } | ||
265 | |||
266 | static int mxcmci_finish_data(struct mxcmci_host *host, unsigned int stat) | ||
267 | { | ||
268 | struct mmc_data *data = host->data; | ||
269 | int data_error; | ||
270 | |||
271 | #ifdef HAS_DMA | ||
272 | if (mxcmci_use_dma(host)) { | ||
273 | imx_dma_disable(host->dma); | ||
274 | dma_unmap_sg(mmc_dev(host->mmc), data->sg, host->dma_nents, | ||
275 | host->dma_dir); | ||
276 | } | ||
277 | #endif | ||
278 | |||
279 | if (stat & STATUS_ERR_MASK) { | ||
280 | dev_dbg(mmc_dev(host->mmc), "request failed. status: 0x%08x\n", | ||
281 | stat); | ||
282 | if (stat & STATUS_CRC_READ_ERR) { | ||
283 | data->error = -EILSEQ; | ||
284 | } else if (stat & STATUS_CRC_WRITE_ERR) { | ||
285 | u32 err_code = (stat >> 9) & 0x3; | ||
286 | if (err_code == 2) /* No CRC response */ | ||
287 | data->error = -ETIMEDOUT; | ||
288 | else | ||
289 | data->error = -EILSEQ; | ||
290 | } else if (stat & STATUS_TIME_OUT_READ) { | ||
291 | data->error = -ETIMEDOUT; | ||
292 | } else { | ||
293 | data->error = -EIO; | ||
294 | } | ||
295 | } else { | ||
296 | data->bytes_xfered = host->datasize; | ||
297 | } | ||
298 | |||
299 | data_error = data->error; | ||
300 | |||
301 | host->data = NULL; | ||
302 | |||
303 | return data_error; | ||
304 | } | ||
305 | |||
306 | static void mxcmci_read_response(struct mxcmci_host *host, unsigned int stat) | ||
307 | { | ||
308 | struct mmc_command *cmd = host->cmd; | ||
309 | int i; | ||
310 | u32 a, b, c; | ||
311 | |||
312 | if (!cmd) | ||
313 | return; | ||
314 | |||
315 | if (stat & STATUS_TIME_OUT_RESP) { | ||
316 | dev_dbg(mmc_dev(host->mmc), "CMD TIMEOUT\n"); | ||
317 | cmd->error = -ETIMEDOUT; | ||
318 | } else if (stat & STATUS_RESP_CRC_ERR && cmd->flags & MMC_RSP_CRC) { | ||
319 | dev_dbg(mmc_dev(host->mmc), "cmd crc error\n"); | ||
320 | cmd->error = -EILSEQ; | ||
321 | } | ||
322 | |||
323 | if (cmd->flags & MMC_RSP_PRESENT) { | ||
324 | if (cmd->flags & MMC_RSP_136) { | ||
325 | for (i = 0; i < 4; i++) { | ||
326 | a = readw(host->base + MMC_REG_RES_FIFO); | ||
327 | b = readw(host->base + MMC_REG_RES_FIFO); | ||
328 | cmd->resp[i] = a << 16 | b; | ||
329 | } | ||
330 | } else { | ||
331 | a = readw(host->base + MMC_REG_RES_FIFO); | ||
332 | b = readw(host->base + MMC_REG_RES_FIFO); | ||
333 | c = readw(host->base + MMC_REG_RES_FIFO); | ||
334 | cmd->resp[0] = a << 24 | b << 8 | c >> 8; | ||
335 | } | ||
336 | } | ||
337 | } | ||
338 | |||
339 | static int mxcmci_poll_status(struct mxcmci_host *host, u32 mask) | ||
340 | { | ||
341 | u32 stat; | ||
342 | unsigned long timeout = jiffies + HZ; | ||
343 | |||
344 | do { | ||
345 | stat = readl(host->base + MMC_REG_STATUS); | ||
346 | if (stat & STATUS_ERR_MASK) | ||
347 | return stat; | ||
348 | if (time_after(jiffies, timeout)) | ||
349 | return STATUS_TIME_OUT_READ; | ||
350 | if (stat & mask) | ||
351 | return 0; | ||
352 | cpu_relax(); | ||
353 | } while (1); | ||
354 | } | ||
355 | |||
356 | static int mxcmci_pull(struct mxcmci_host *host, void *_buf, int bytes) | ||
357 | { | ||
358 | unsigned int stat; | ||
359 | u32 *buf = _buf; | ||
360 | |||
361 | while (bytes > 3) { | ||
362 | stat = mxcmci_poll_status(host, | ||
363 | STATUS_BUF_READ_RDY | STATUS_READ_OP_DONE); | ||
364 | if (stat) | ||
365 | return stat; | ||
366 | *buf++ = readl(host->base + MMC_REG_BUFFER_ACCESS); | ||
367 | bytes -= 4; | ||
368 | } | ||
369 | |||
370 | if (bytes) { | ||
371 | u8 *b = (u8 *)buf; | ||
372 | u32 tmp; | ||
373 | |||
374 | stat = mxcmci_poll_status(host, | ||
375 | STATUS_BUF_READ_RDY | STATUS_READ_OP_DONE); | ||
376 | if (stat) | ||
377 | return stat; | ||
378 | tmp = readl(host->base + MMC_REG_BUFFER_ACCESS); | ||
379 | memcpy(b, &tmp, bytes); | ||
380 | } | ||
381 | |||
382 | return 0; | ||
383 | } | ||
384 | |||
385 | static int mxcmci_push(struct mxcmci_host *host, void *_buf, int bytes) | ||
386 | { | ||
387 | unsigned int stat; | ||
388 | u32 *buf = _buf; | ||
389 | |||
390 | while (bytes > 3) { | ||
391 | stat = mxcmci_poll_status(host, STATUS_BUF_WRITE_RDY); | ||
392 | if (stat) | ||
393 | return stat; | ||
394 | writel(*buf++, host->base + MMC_REG_BUFFER_ACCESS); | ||
395 | bytes -= 4; | ||
396 | } | ||
397 | |||
398 | if (bytes) { | ||
399 | u8 *b = (u8 *)buf; | ||
400 | u32 tmp; | ||
401 | |||
402 | stat = mxcmci_poll_status(host, STATUS_BUF_WRITE_RDY); | ||
403 | if (stat) | ||
404 | return stat; | ||
405 | |||
406 | memcpy(&tmp, b, bytes); | ||
407 | writel(tmp, host->base + MMC_REG_BUFFER_ACCESS); | ||
408 | } | ||
409 | |||
410 | stat = mxcmci_poll_status(host, STATUS_BUF_WRITE_RDY); | ||
411 | if (stat) | ||
412 | return stat; | ||
413 | |||
414 | return 0; | ||
415 | } | ||
416 | |||
417 | static int mxcmci_transfer_data(struct mxcmci_host *host) | ||
418 | { | ||
419 | struct mmc_data *data = host->req->data; | ||
420 | struct scatterlist *sg; | ||
421 | int stat, i; | ||
422 | |||
423 | host->datasize = 0; | ||
424 | |||
425 | host->data = data; | ||
426 | host->datasize = 0; | ||
427 | |||
428 | if (data->flags & MMC_DATA_READ) { | ||
429 | for_each_sg(data->sg, sg, data->sg_len, i) { | ||
430 | stat = mxcmci_pull(host, sg_virt(sg), sg->length); | ||
431 | if (stat) | ||
432 | return stat; | ||
433 | host->datasize += sg->length; | ||
434 | } | ||
435 | } else { | ||
436 | for_each_sg(data->sg, sg, data->sg_len, i) { | ||
437 | stat = mxcmci_push(host, sg_virt(sg), sg->length); | ||
438 | if (stat) | ||
439 | return stat; | ||
440 | host->datasize += sg->length; | ||
441 | } | ||
442 | stat = mxcmci_poll_status(host, STATUS_WRITE_OP_DONE); | ||
443 | if (stat) | ||
444 | return stat; | ||
445 | } | ||
446 | return 0; | ||
447 | } | ||
448 | |||
449 | static void mxcmci_datawork(struct work_struct *work) | ||
450 | { | ||
451 | struct mxcmci_host *host = container_of(work, struct mxcmci_host, | ||
452 | datawork); | ||
453 | int datastat = mxcmci_transfer_data(host); | ||
454 | mxcmci_finish_data(host, datastat); | ||
455 | |||
456 | if (host->req->stop) { | ||
457 | if (mxcmci_start_cmd(host, host->req->stop, 0)) { | ||
458 | mxcmci_finish_request(host, host->req); | ||
459 | return; | ||
460 | } | ||
461 | } else { | ||
462 | mxcmci_finish_request(host, host->req); | ||
463 | } | ||
464 | } | ||
465 | |||
466 | #ifdef HAS_DMA | ||
467 | static void mxcmci_data_done(struct mxcmci_host *host, unsigned int stat) | ||
468 | { | ||
469 | struct mmc_data *data = host->data; | ||
470 | int data_error; | ||
471 | |||
472 | if (!data) | ||
473 | return; | ||
474 | |||
475 | data_error = mxcmci_finish_data(host, stat); | ||
476 | |||
477 | mxcmci_read_response(host, stat); | ||
478 | host->cmd = NULL; | ||
479 | |||
480 | if (host->req->stop) { | ||
481 | if (mxcmci_start_cmd(host, host->req->stop, 0)) { | ||
482 | mxcmci_finish_request(host, host->req); | ||
483 | return; | ||
484 | } | ||
485 | } else { | ||
486 | mxcmci_finish_request(host, host->req); | ||
487 | } | ||
488 | } | ||
489 | #endif /* HAS_DMA */ | ||
490 | |||
491 | static void mxcmci_cmd_done(struct mxcmci_host *host, unsigned int stat) | ||
492 | { | ||
493 | mxcmci_read_response(host, stat); | ||
494 | host->cmd = NULL; | ||
495 | |||
496 | if (!host->data && host->req) { | ||
497 | mxcmci_finish_request(host, host->req); | ||
498 | return; | ||
499 | } | ||
500 | |||
501 | /* For the DMA case the DMA engine handles the data transfer | ||
502 | * automatically. For non DMA we have to to it ourselves. | ||
503 | * Don't do it in interrupt context though. | ||
504 | */ | ||
505 | if (!mxcmci_use_dma(host) && host->data) | ||
506 | schedule_work(&host->datawork); | ||
507 | |||
508 | } | ||
509 | |||
510 | static irqreturn_t mxcmci_irq(int irq, void *devid) | ||
511 | { | ||
512 | struct mxcmci_host *host = devid; | ||
513 | u32 stat; | ||
514 | |||
515 | stat = readl(host->base + MMC_REG_STATUS); | ||
516 | writel(stat, host->base + MMC_REG_STATUS); | ||
517 | |||
518 | dev_dbg(mmc_dev(host->mmc), "%s: 0x%08x\n", __func__, stat); | ||
519 | |||
520 | if (stat & STATUS_END_CMD_RESP) | ||
521 | mxcmci_cmd_done(host, stat); | ||
522 | #ifdef HAS_DMA | ||
523 | if (mxcmci_use_dma(host) && | ||
524 | (stat & (STATUS_DATA_TRANS_DONE | STATUS_WRITE_OP_DONE))) | ||
525 | mxcmci_data_done(host, stat); | ||
526 | #endif | ||
527 | return IRQ_HANDLED; | ||
528 | } | ||
529 | |||
530 | static void mxcmci_request(struct mmc_host *mmc, struct mmc_request *req) | ||
531 | { | ||
532 | struct mxcmci_host *host = mmc_priv(mmc); | ||
533 | unsigned int cmdat = host->cmdat; | ||
534 | |||
535 | WARN_ON(host->req != NULL); | ||
536 | |||
537 | host->req = req; | ||
538 | host->cmdat &= ~CMD_DAT_CONT_INIT; | ||
539 | #ifdef HAS_DMA | ||
540 | host->do_dma = 1; | ||
541 | #endif | ||
542 | if (req->data) { | ||
543 | mxcmci_setup_data(host, req->data); | ||
544 | |||
545 | cmdat |= CMD_DAT_CONT_DATA_ENABLE; | ||
546 | |||
547 | if (req->data->flags & MMC_DATA_WRITE) | ||
548 | cmdat |= CMD_DAT_CONT_WRITE; | ||
549 | } | ||
550 | |||
551 | if (mxcmci_start_cmd(host, req->cmd, cmdat)) | ||
552 | mxcmci_finish_request(host, req); | ||
553 | } | ||
554 | |||
555 | static void mxcmci_set_clk_rate(struct mxcmci_host *host, unsigned int clk_ios) | ||
556 | { | ||
557 | unsigned int divider; | ||
558 | int prescaler = 0; | ||
559 | unsigned int clk_in = clk_get_rate(host->clk); | ||
560 | |||
561 | while (prescaler <= 0x800) { | ||
562 | for (divider = 1; divider <= 0xF; divider++) { | ||
563 | int x; | ||
564 | |||
565 | x = (clk_in / (divider + 1)); | ||
566 | |||
567 | if (prescaler) | ||
568 | x /= (prescaler * 2); | ||
569 | |||
570 | if (x <= clk_ios) | ||
571 | break; | ||
572 | } | ||
573 | if (divider < 0x10) | ||
574 | break; | ||
575 | |||
576 | if (prescaler == 0) | ||
577 | prescaler = 1; | ||
578 | else | ||
579 | prescaler <<= 1; | ||
580 | } | ||
581 | |||
582 | writew((prescaler << 4) | divider, host->base + MMC_REG_CLK_RATE); | ||
583 | |||
584 | dev_dbg(mmc_dev(host->mmc), "scaler: %d divider: %d in: %d out: %d\n", | ||
585 | prescaler, divider, clk_in, clk_ios); | ||
586 | } | ||
587 | |||
588 | static void mxcmci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) | ||
589 | { | ||
590 | struct mxcmci_host *host = mmc_priv(mmc); | ||
591 | #ifdef HAS_DMA | ||
592 | unsigned int blen; | ||
593 | /* | ||
594 | * use burstlen of 64 in 4 bit mode (--> reg value 0) | ||
595 | * use burstlen of 16 in 1 bit mode (--> reg value 16) | ||
596 | */ | ||
597 | if (ios->bus_width == MMC_BUS_WIDTH_4) | ||
598 | blen = 0; | ||
599 | else | ||
600 | blen = 16; | ||
601 | |||
602 | imx_dma_config_burstlen(host->dma, blen); | ||
603 | #endif | ||
604 | if (ios->bus_width == MMC_BUS_WIDTH_4) | ||
605 | host->cmdat |= CMD_DAT_CONT_BUS_WIDTH_4; | ||
606 | else | ||
607 | host->cmdat &= ~CMD_DAT_CONT_BUS_WIDTH_4; | ||
608 | |||
609 | if (host->power_mode != ios->power_mode) { | ||
610 | if (host->pdata && host->pdata->setpower) | ||
611 | host->pdata->setpower(mmc_dev(mmc), ios->vdd); | ||
612 | host->power_mode = ios->power_mode; | ||
613 | if (ios->power_mode == MMC_POWER_ON) | ||
614 | host->cmdat |= CMD_DAT_CONT_INIT; | ||
615 | } | ||
616 | |||
617 | if (ios->clock) { | ||
618 | mxcmci_set_clk_rate(host, ios->clock); | ||
619 | writew(STR_STP_CLK_START_CLK, host->base + MMC_REG_STR_STP_CLK); | ||
620 | } else { | ||
621 | writew(STR_STP_CLK_STOP_CLK, host->base + MMC_REG_STR_STP_CLK); | ||
622 | } | ||
623 | |||
624 | host->clock = ios->clock; | ||
625 | } | ||
626 | |||
627 | static irqreturn_t mxcmci_detect_irq(int irq, void *data) | ||
628 | { | ||
629 | struct mmc_host *mmc = data; | ||
630 | |||
631 | dev_dbg(mmc_dev(mmc), "%s\n", __func__); | ||
632 | |||
633 | mmc_detect_change(mmc, msecs_to_jiffies(250)); | ||
634 | return IRQ_HANDLED; | ||
635 | } | ||
636 | |||
637 | static int mxcmci_get_ro(struct mmc_host *mmc) | ||
638 | { | ||
639 | struct mxcmci_host *host = mmc_priv(mmc); | ||
640 | |||
641 | if (host->pdata && host->pdata->get_ro) | ||
642 | return !!host->pdata->get_ro(mmc_dev(mmc)); | ||
643 | /* | ||
644 | * Board doesn't support read only detection; let the mmc core | ||
645 | * decide what to do. | ||
646 | */ | ||
647 | return -ENOSYS; | ||
648 | } | ||
649 | |||
650 | |||
651 | static const struct mmc_host_ops mxcmci_ops = { | ||
652 | .request = mxcmci_request, | ||
653 | .set_ios = mxcmci_set_ios, | ||
654 | .get_ro = mxcmci_get_ro, | ||
655 | }; | ||
656 | |||
657 | static int mxcmci_probe(struct platform_device *pdev) | ||
658 | { | ||
659 | struct mmc_host *mmc; | ||
660 | struct mxcmci_host *host = NULL; | ||
661 | struct resource *r; | ||
662 | int ret = 0, irq; | ||
663 | |||
664 | printk(KERN_INFO "i.MX SDHC driver\n"); | ||
665 | |||
666 | r = platform_get_resource(pdev, IORESOURCE_MEM, 0); | ||
667 | irq = platform_get_irq(pdev, 0); | ||
668 | if (!r || irq < 0) | ||
669 | return -EINVAL; | ||
670 | |||
671 | r = request_mem_region(r->start, resource_size(r), pdev->name); | ||
672 | if (!r) | ||
673 | return -EBUSY; | ||
674 | |||
675 | mmc = mmc_alloc_host(sizeof(struct mxcmci_host), &pdev->dev); | ||
676 | if (!mmc) { | ||
677 | ret = -ENOMEM; | ||
678 | goto out_release_mem; | ||
679 | } | ||
680 | |||
681 | mmc->ops = &mxcmci_ops; | ||
682 | mmc->caps = MMC_CAP_4_BIT_DATA; | ||
683 | |||
684 | /* MMC core transfer sizes tunable parameters */ | ||
685 | mmc->max_hw_segs = 64; | ||
686 | mmc->max_phys_segs = 64; | ||
687 | mmc->max_blk_size = 2048; | ||
688 | mmc->max_blk_count = 65535; | ||
689 | mmc->max_req_size = mmc->max_blk_size * mmc->max_blk_count; | ||
690 | mmc->max_seg_size = mmc->max_seg_size; | ||
691 | |||
692 | host = mmc_priv(mmc); | ||
693 | host->base = ioremap(r->start, resource_size(r)); | ||
694 | if (!host->base) { | ||
695 | ret = -ENOMEM; | ||
696 | goto out_free; | ||
697 | } | ||
698 | |||
699 | host->mmc = mmc; | ||
700 | host->pdata = pdev->dev.platform_data; | ||
701 | |||
702 | if (host->pdata && host->pdata->ocr_avail) | ||
703 | mmc->ocr_avail = host->pdata->ocr_avail; | ||
704 | else | ||
705 | mmc->ocr_avail = MMC_VDD_32_33 | MMC_VDD_33_34; | ||
706 | |||
707 | host->res = r; | ||
708 | host->irq = irq; | ||
709 | |||
710 | host->clk = clk_get(&pdev->dev, "sdhc_clk"); | ||
711 | if (IS_ERR(host->clk)) { | ||
712 | ret = PTR_ERR(host->clk); | ||
713 | goto out_iounmap; | ||
714 | } | ||
715 | clk_enable(host->clk); | ||
716 | |||
717 | mxcmci_softreset(host); | ||
718 | |||
719 | host->rev_no = readw(host->base + MMC_REG_REV_NO); | ||
720 | if (host->rev_no != 0x400) { | ||
721 | ret = -ENODEV; | ||
722 | dev_err(mmc_dev(host->mmc), "wrong rev.no. 0x%08x. aborting.\n", | ||
723 | host->rev_no); | ||
724 | goto out_clk_put; | ||
725 | } | ||
726 | |||
727 | mmc->f_min = clk_get_rate(host->clk) >> 7; | ||
728 | mmc->f_max = clk_get_rate(host->clk) >> 1; | ||
729 | |||
730 | /* recommended in data sheet */ | ||
731 | writew(0x2db4, host->base + MMC_REG_READ_TO); | ||
732 | |||
733 | writel(0, host->base + MMC_REG_INT_CNTR); | ||
734 | |||
735 | #ifdef HAS_DMA | ||
736 | host->dma = imx_dma_request_by_prio(DRIVER_NAME, DMA_PRIO_LOW); | ||
737 | if (host->dma < 0) { | ||
738 | dev_err(mmc_dev(host->mmc), "imx_dma_request_by_prio failed\n"); | ||
739 | ret = -EBUSY; | ||
740 | goto out_clk_put; | ||
741 | } | ||
742 | |||
743 | r = platform_get_resource(pdev, IORESOURCE_DMA, 0); | ||
744 | if (!r) { | ||
745 | ret = -EINVAL; | ||
746 | goto out_free_dma; | ||
747 | } | ||
748 | |||
749 | ret = imx_dma_config_channel(host->dma, | ||
750 | IMX_DMA_MEMSIZE_32 | IMX_DMA_TYPE_FIFO, | ||
751 | IMX_DMA_MEMSIZE_32 | IMX_DMA_TYPE_LINEAR, | ||
752 | r->start, 0); | ||
753 | if (ret) { | ||
754 | dev_err(mmc_dev(host->mmc), "failed to config DMA channel\n"); | ||
755 | goto out_free_dma; | ||
756 | } | ||
757 | #endif | ||
758 | INIT_WORK(&host->datawork, mxcmci_datawork); | ||
759 | |||
760 | ret = request_irq(host->irq, mxcmci_irq, 0, DRIVER_NAME, host); | ||
761 | if (ret) | ||
762 | goto out_free_dma; | ||
763 | |||
764 | platform_set_drvdata(pdev, mmc); | ||
765 | |||
766 | if (host->pdata && host->pdata->init) { | ||
767 | ret = host->pdata->init(&pdev->dev, mxcmci_detect_irq, | ||
768 | host->mmc); | ||
769 | if (ret) | ||
770 | goto out_free_irq; | ||
771 | } | ||
772 | |||
773 | mmc_add_host(mmc); | ||
774 | |||
775 | return 0; | ||
776 | |||
777 | out_free_irq: | ||
778 | free_irq(host->irq, host); | ||
779 | out_free_dma: | ||
780 | #ifdef HAS_DMA | ||
781 | imx_dma_free(host->dma); | ||
782 | #endif | ||
783 | out_clk_put: | ||
784 | clk_disable(host->clk); | ||
785 | clk_put(host->clk); | ||
786 | out_iounmap: | ||
787 | iounmap(host->base); | ||
788 | out_free: | ||
789 | mmc_free_host(mmc); | ||
790 | out_release_mem: | ||
791 | release_mem_region(host->res->start, resource_size(host->res)); | ||
792 | return ret; | ||
793 | } | ||
794 | |||
795 | static int mxcmci_remove(struct platform_device *pdev) | ||
796 | { | ||
797 | struct mmc_host *mmc = platform_get_drvdata(pdev); | ||
798 | struct mxcmci_host *host = mmc_priv(mmc); | ||
799 | |||
800 | platform_set_drvdata(pdev, NULL); | ||
801 | |||
802 | mmc_remove_host(mmc); | ||
803 | |||
804 | if (host->pdata && host->pdata->exit) | ||
805 | host->pdata->exit(&pdev->dev, mmc); | ||
806 | |||
807 | free_irq(host->irq, host); | ||
808 | iounmap(host->base); | ||
809 | #ifdef HAS_DMA | ||
810 | imx_dma_free(host->dma); | ||
811 | #endif | ||
812 | clk_disable(host->clk); | ||
813 | clk_put(host->clk); | ||
814 | |||
815 | release_mem_region(host->res->start, resource_size(host->res)); | ||
816 | release_resource(host->res); | ||
817 | |||
818 | mmc_free_host(mmc); | ||
819 | |||
820 | return 0; | ||
821 | } | ||
822 | |||
823 | #ifdef CONFIG_PM | ||
824 | static int mxcmci_suspend(struct platform_device *dev, pm_message_t state) | ||
825 | { | ||
826 | struct mmc_host *mmc = platform_get_drvdata(dev); | ||
827 | int ret = 0; | ||
828 | |||
829 | if (mmc) | ||
830 | ret = mmc_suspend_host(mmc, state); | ||
831 | |||
832 | return ret; | ||
833 | } | ||
834 | |||
835 | static int mxcmci_resume(struct platform_device *dev) | ||
836 | { | ||
837 | struct mmc_host *mmc = platform_get_drvdata(dev); | ||
838 | struct mxcmci_host *host; | ||
839 | int ret = 0; | ||
840 | |||
841 | if (mmc) { | ||
842 | host = mmc_priv(mmc); | ||
843 | ret = mmc_resume_host(mmc); | ||
844 | } | ||
845 | |||
846 | return ret; | ||
847 | } | ||
848 | #else | ||
849 | #define mxcmci_suspend NULL | ||
850 | #define mxcmci_resume NULL | ||
851 | #endif /* CONFIG_PM */ | ||
852 | |||
853 | static struct platform_driver mxcmci_driver = { | ||
854 | .probe = mxcmci_probe, | ||
855 | .remove = mxcmci_remove, | ||
856 | .suspend = mxcmci_suspend, | ||
857 | .resume = mxcmci_resume, | ||
858 | .driver = { | ||
859 | .name = DRIVER_NAME, | ||
860 | .owner = THIS_MODULE, | ||
861 | } | ||
862 | }; | ||
863 | |||
864 | static int __init mxcmci_init(void) | ||
865 | { | ||
866 | return platform_driver_register(&mxcmci_driver); | ||
867 | } | ||
868 | |||
869 | static void __exit mxcmci_exit(void) | ||
870 | { | ||
871 | platform_driver_unregister(&mxcmci_driver); | ||
872 | } | ||
873 | |||
874 | module_init(mxcmci_init); | ||
875 | module_exit(mxcmci_exit); | ||
876 | |||
877 | MODULE_DESCRIPTION("i.MX Multimedia Card Interface Driver"); | ||
878 | MODULE_AUTHOR("Sascha Hauer, Pengutronix"); | ||
879 | MODULE_LICENSE("GPL"); | ||
880 | MODULE_ALIAS("platform:imx-mmc"); | ||
diff --git a/drivers/mmc/host/pxamci.c b/drivers/mmc/host/pxamci.c index 3c5483b75da4..9702ad3774cf 100644 --- a/drivers/mmc/host/pxamci.c +++ b/drivers/mmc/host/pxamci.c | |||
@@ -180,7 +180,15 @@ static void pxamci_setup_data(struct pxamci_host *host, struct mmc_data *data) | |||
180 | else | 180 | else |
181 | DALGN &= ~(1 << host->dma); | 181 | DALGN &= ~(1 << host->dma); |
182 | DDADR(host->dma) = host->sg_dma; | 182 | DDADR(host->dma) = host->sg_dma; |
183 | DCSR(host->dma) = DCSR_RUN; | 183 | |
184 | /* | ||
185 | * workaround for erratum #91: | ||
186 | * only start DMA now if we are doing a read, | ||
187 | * otherwise we wait until CMD/RESP has finished | ||
188 | * before starting DMA. | ||
189 | */ | ||
190 | if (!cpu_is_pxa27x() || data->flags & MMC_DATA_READ) | ||
191 | DCSR(host->dma) = DCSR_RUN; | ||
184 | } | 192 | } |
185 | 193 | ||
186 | static void pxamci_start_cmd(struct pxamci_host *host, struct mmc_command *cmd, unsigned int cmdat) | 194 | static void pxamci_start_cmd(struct pxamci_host *host, struct mmc_command *cmd, unsigned int cmdat) |
@@ -251,23 +259,28 @@ static int pxamci_cmd_done(struct pxamci_host *host, unsigned int stat) | |||
251 | if (stat & STAT_TIME_OUT_RESPONSE) { | 259 | if (stat & STAT_TIME_OUT_RESPONSE) { |
252 | cmd->error = -ETIMEDOUT; | 260 | cmd->error = -ETIMEDOUT; |
253 | } else if (stat & STAT_RES_CRC_ERR && cmd->flags & MMC_RSP_CRC) { | 261 | } else if (stat & STAT_RES_CRC_ERR && cmd->flags & MMC_RSP_CRC) { |
254 | #ifdef CONFIG_PXA27x | ||
255 | /* | 262 | /* |
256 | * workaround for erratum #42: | 263 | * workaround for erratum #42: |
257 | * Intel PXA27x Family Processor Specification Update Rev 001 | 264 | * Intel PXA27x Family Processor Specification Update Rev 001 |
258 | * A bogus CRC error can appear if the msb of a 136 bit | 265 | * A bogus CRC error can appear if the msb of a 136 bit |
259 | * response is a one. | 266 | * response is a one. |
260 | */ | 267 | */ |
261 | if (cmd->flags & MMC_RSP_136 && cmd->resp[0] & 0x80000000) { | 268 | if (cpu_is_pxa27x() && |
269 | (cmd->flags & MMC_RSP_136 && cmd->resp[0] & 0x80000000)) | ||
262 | pr_debug("ignoring CRC from command %d - *risky*\n", cmd->opcode); | 270 | pr_debug("ignoring CRC from command %d - *risky*\n", cmd->opcode); |
263 | } else | 271 | else |
264 | #endif | 272 | cmd->error = -EILSEQ; |
265 | cmd->error = -EILSEQ; | ||
266 | } | 273 | } |
267 | 274 | ||
268 | pxamci_disable_irq(host, END_CMD_RES); | 275 | pxamci_disable_irq(host, END_CMD_RES); |
269 | if (host->data && !cmd->error) { | 276 | if (host->data && !cmd->error) { |
270 | pxamci_enable_irq(host, DATA_TRAN_DONE); | 277 | pxamci_enable_irq(host, DATA_TRAN_DONE); |
278 | /* | ||
279 | * workaround for erratum #91, if doing write | ||
280 | * enable DMA late | ||
281 | */ | ||
282 | if (cpu_is_pxa27x() && host->data->flags & MMC_DATA_WRITE) | ||
283 | DCSR(host->dma) = DCSR_RUN; | ||
271 | } else { | 284 | } else { |
272 | pxamci_finish_request(host, host->mrq); | 285 | pxamci_finish_request(host, host->mrq); |
273 | } | 286 | } |
diff --git a/drivers/mmc/host/ricoh_mmc.c b/drivers/mmc/host/ricoh_mmc.c index be9e7b32b34e..f62790513322 100644 --- a/drivers/mmc/host/ricoh_mmc.c +++ b/drivers/mmc/host/ricoh_mmc.c | |||
@@ -196,7 +196,7 @@ static void __devexit ricoh_mmc_remove(struct pci_dev *pdev) | |||
196 | pci_set_drvdata(pdev, NULL); | 196 | pci_set_drvdata(pdev, NULL); |
197 | } | 197 | } |
198 | 198 | ||
199 | static int ricoh_mmc_suspend(struct pci_dev *pdev, pm_message_t state) | 199 | static int ricoh_mmc_suspend_late(struct pci_dev *pdev, pm_message_t state) |
200 | { | 200 | { |
201 | struct pci_dev *fw_dev = NULL; | 201 | struct pci_dev *fw_dev = NULL; |
202 | 202 | ||
@@ -210,7 +210,7 @@ static int ricoh_mmc_suspend(struct pci_dev *pdev, pm_message_t state) | |||
210 | return 0; | 210 | return 0; |
211 | } | 211 | } |
212 | 212 | ||
213 | static int ricoh_mmc_resume(struct pci_dev *pdev) | 213 | static int ricoh_mmc_resume_early(struct pci_dev *pdev) |
214 | { | 214 | { |
215 | struct pci_dev *fw_dev = NULL; | 215 | struct pci_dev *fw_dev = NULL; |
216 | 216 | ||
@@ -229,8 +229,8 @@ static struct pci_driver ricoh_mmc_driver = { | |||
229 | .id_table = pci_ids, | 229 | .id_table = pci_ids, |
230 | .probe = ricoh_mmc_probe, | 230 | .probe = ricoh_mmc_probe, |
231 | .remove = __devexit_p(ricoh_mmc_remove), | 231 | .remove = __devexit_p(ricoh_mmc_remove), |
232 | .suspend = ricoh_mmc_suspend, | 232 | .suspend_late = ricoh_mmc_suspend_late, |
233 | .resume = ricoh_mmc_resume, | 233 | .resume_early = ricoh_mmc_resume_early, |
234 | }; | 234 | }; |
235 | 235 | ||
236 | /*****************************************************************************\ | 236 | /*****************************************************************************\ |