aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2011-03-30 10:00:39 -0400
committerLinus Walleij <linus.walleij@linaro.org>2011-06-21 04:57:41 -0400
commit02a734373b998efdcb9d28d8c3aa77e549bb38c0 (patch)
treee3f9db9d9888c9072a070a3fce8ff082f7b09dbe
parentf727a05a2c90cfe44749004718bc5a4ef3569b34 (diff)
mach-ux500: correct MMC/SDI parameters
We cannot clock the MMCI blocks more than 50 MHz. A bug prevented us from seeing the effect of actually driving them to 100 MHz, which indeed resulted failure, on the external SD card. Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
-rw-r--r--arch/arm/mach-ux500/board-mop500-sdi.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/arch/arm/mach-ux500/board-mop500-sdi.c b/arch/arm/mach-ux500/board-mop500-sdi.c
index f8b195063b62..5fbd6bc63cb1 100644
--- a/arch/arm/mach-ux500/board-mop500-sdi.c
+++ b/arch/arm/mach-ux500/board-mop500-sdi.c
@@ -86,8 +86,10 @@ static struct stedma40_chan_cfg mop500_sdi0_dma_cfg_tx = {
86static struct mmci_platform_data mop500_sdi0_data = { 86static struct mmci_platform_data mop500_sdi0_data = {
87 .vdd_handler = mop500_sdi0_vdd_handler, 87 .vdd_handler = mop500_sdi0_vdd_handler,
88 .ocr_mask = MMC_VDD_29_30, 88 .ocr_mask = MMC_VDD_29_30,
89 .f_max = 100000000, 89 .f_max = 50000000,
90 .capabilities = MMC_CAP_4_BIT_DATA, 90 .capabilities = MMC_CAP_4_BIT_DATA |
91 MMC_CAP_SD_HIGHSPEED |
92 MMC_CAP_MMC_HIGHSPEED,
91 .gpio_wp = -1, 93 .gpio_wp = -1,
92#ifdef CONFIG_STE_DMA40 94#ifdef CONFIG_STE_DMA40
93 .dma_filter = stedma40_filter, 95 .dma_filter = stedma40_filter,
@@ -155,7 +157,7 @@ static struct stedma40_chan_cfg mop500_sdi2_dma_cfg_tx = {
155 157
156static struct mmci_platform_data mop500_sdi2_data = { 158static struct mmci_platform_data mop500_sdi2_data = {
157 .ocr_mask = MMC_VDD_165_195, 159 .ocr_mask = MMC_VDD_165_195,
158 .f_max = 100000000, 160 .f_max = 50000000,
159 .capabilities = MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA, 161 .capabilities = MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA,
160 .gpio_cd = -1, 162 .gpio_cd = -1,
161 .gpio_wp = -1, 163 .gpio_wp = -1,
@@ -192,7 +194,7 @@ static struct stedma40_chan_cfg mop500_sdi4_dma_cfg_tx = {
192 194
193static struct mmci_platform_data mop500_sdi4_data = { 195static struct mmci_platform_data mop500_sdi4_data = {
194 .ocr_mask = MMC_VDD_29_30, 196 .ocr_mask = MMC_VDD_29_30,
195 .f_max = 100000000, 197 .f_max = 50000000,
196 .capabilities = MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA | 198 .capabilities = MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA |
197 MMC_CAP_MMC_HIGHSPEED, 199 MMC_CAP_MMC_HIGHSPEED,
198 .gpio_cd = -1, 200 .gpio_cd = -1,