diff options
| author | David S. Miller <davem@davemloft.net> | 2011-09-16 01:09:02 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-09-16 01:09:02 -0400 |
| commit | 52b9aca7ae8726d1fb41b97dd1d243d107fef11b (patch) | |
| tree | 7acee111840bd25183513e9bde08e939ffd57be8 /arch/arm/mach-shmobile/board-ag5evm.c | |
| parent | 7756332f5b64c9c1535712b9679792e8bd4f0019 (diff) | |
| parent | e2faeec2de9e2c73958e6ea6065dde1e8cd6f3a2 (diff) | |
Merge branch 'master' of ../netdev/
Diffstat (limited to 'arch/arm/mach-shmobile/board-ag5evm.c')
| -rw-r--r-- | arch/arm/mach-shmobile/board-ag5evm.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-shmobile/board-ag5evm.c b/arch/arm/mach-shmobile/board-ag5evm.c index ce5c2513c6ce..cdfdd624d21d 100644 --- a/arch/arm/mach-shmobile/board-ag5evm.c +++ b/arch/arm/mach-shmobile/board-ag5evm.c @@ -341,6 +341,7 @@ static struct platform_device mipidsi0_device = { static struct sh_mobile_sdhi_info sdhi0_info = { .dma_slave_tx = SHDMA_SLAVE_SDHI0_TX, .dma_slave_rx = SHDMA_SLAVE_SDHI0_RX, + .tmio_flags = TMIO_MMC_HAS_IDLE_WAIT, .tmio_caps = MMC_CAP_SD_HIGHSPEED, .tmio_ocr_mask = MMC_VDD_27_28 | MMC_VDD_28_29, }; @@ -382,7 +383,7 @@ void ag5evm_sdhi1_set_pwr(struct platform_device *pdev, int state) } static struct sh_mobile_sdhi_info sh_sdhi1_info = { - .tmio_flags = TMIO_MMC_WRPROTECT_DISABLE, + .tmio_flags = TMIO_MMC_WRPROTECT_DISABLE | TMIO_MMC_HAS_IDLE_WAIT, .tmio_caps = MMC_CAP_NONREMOVABLE | MMC_CAP_SDIO_IRQ, .tmio_ocr_mask = MMC_VDD_32_33 | MMC_VDD_33_34, .set_pwr = ag5evm_sdhi1_set_pwr, |