diff options
author | Paul Mundt <lethal@linux-sh.org> | 2011-01-12 00:47:21 -0500 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2011-01-12 00:47:21 -0500 |
commit | 53582c4c508a95ece9f7c907edef9911c7eb79eb (patch) | |
tree | c099e9880f7bf7d60e87dfa6a19cb4e8780ec860 /arch/arm/mach-shmobile/board-mackerel.c | |
parent | 6ae1e19dbb43ff0d429a9f45087c513212686836 (diff) | |
parent | da97da73d418533187a8390cf6541f48bed653e8 (diff) |
Merge branch 'rmobile/sdio' into rmobile-latest
Diffstat (limited to 'arch/arm/mach-shmobile/board-mackerel.c')
-rw-r--r-- | arch/arm/mach-shmobile/board-mackerel.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-shmobile/board-mackerel.c b/arch/arm/mach-shmobile/board-mackerel.c index 6601c595b1e0..ad7e14aba164 100644 --- a/arch/arm/mach-shmobile/board-mackerel.c +++ b/arch/arm/mach-shmobile/board-mackerel.c | |||
@@ -667,7 +667,7 @@ static int slot_cn7_get_cd(struct platform_device *pdev) | |||
667 | static struct sh_mobile_sdhi_info sdhi0_info = { | 667 | static struct sh_mobile_sdhi_info sdhi0_info = { |
668 | .dma_slave_tx = SHDMA_SLAVE_SDHI0_TX, | 668 | .dma_slave_tx = SHDMA_SLAVE_SDHI0_TX, |
669 | .dma_slave_rx = SHDMA_SLAVE_SDHI0_RX, | 669 | .dma_slave_rx = SHDMA_SLAVE_SDHI0_RX, |
670 | .tmio_caps = MMC_CAP_SD_HIGHSPEED, | 670 | .tmio_caps = MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ, |
671 | }; | 671 | }; |
672 | 672 | ||
673 | static struct resource sdhi0_resources[] = { | 673 | static struct resource sdhi0_resources[] = { |
@@ -700,7 +700,7 @@ static struct sh_mobile_sdhi_info sdhi1_info = { | |||
700 | .dma_slave_rx = SHDMA_SLAVE_SDHI1_RX, | 700 | .dma_slave_rx = SHDMA_SLAVE_SDHI1_RX, |
701 | .tmio_ocr_mask = MMC_VDD_165_195, | 701 | .tmio_ocr_mask = MMC_VDD_165_195, |
702 | .tmio_flags = TMIO_MMC_WRPROTECT_DISABLE, | 702 | .tmio_flags = TMIO_MMC_WRPROTECT_DISABLE, |
703 | .tmio_caps = MMC_CAP_SD_HIGHSPEED | | 703 | .tmio_caps = MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ | |
704 | MMC_CAP_NEEDS_POLL, | 704 | MMC_CAP_NEEDS_POLL, |
705 | .get_cd = slot_cn7_get_cd, | 705 | .get_cd = slot_cn7_get_cd, |
706 | }; | 706 | }; |
@@ -743,7 +743,7 @@ static struct sh_mobile_sdhi_info sdhi2_info = { | |||
743 | .dma_slave_tx = SHDMA_SLAVE_SDHI2_TX, | 743 | .dma_slave_tx = SHDMA_SLAVE_SDHI2_TX, |
744 | .dma_slave_rx = SHDMA_SLAVE_SDHI2_RX, | 744 | .dma_slave_rx = SHDMA_SLAVE_SDHI2_RX, |
745 | .tmio_flags = TMIO_MMC_WRPROTECT_DISABLE, | 745 | .tmio_flags = TMIO_MMC_WRPROTECT_DISABLE, |
746 | .tmio_caps = MMC_CAP_SD_HIGHSPEED | | 746 | .tmio_caps = MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ | |
747 | MMC_CAP_NEEDS_POLL, | 747 | MMC_CAP_NEEDS_POLL, |
748 | .get_cd = slot_cn23_get_cd, | 748 | .get_cd = slot_cn23_get_cd, |
749 | }; | 749 | }; |