TononixOS/ubports_kernel_google_msm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mmc: sdio: Fix sdio_disable_wide to properly handle 8 bit bus width.

Browse Source 
Change-Id: I2e712f5d8f6ff8da9fdabe8cf30e378c560e067f
Signed-off-by: Murali Palnati <palnatim@codeaurora.org>
This commit is contained in:
Murali Palnati
2011-04-11 18:05:58 +05:30
committed by Stephen Boyd
parent 0e223a10b5
commit fcaeb8c98a
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/mmc/core/sdio.c
View File

@@ -274,10 +274,10 @@ static int sdio_disable_wide(struct mmc_card *card)
if (ret) if (ret)
return ret; return ret;
if (!(ctrl & SDIO_BUS_WIDTH_4BIT)) if (!(ctrl & (SDIO_BUS_WIDTH_4BIT | SDIO_BUS_WIDTH_8BIT)))
return 0; return 0;
ctrl &= ~SDIO_BUS_WIDTH_4BIT; ctrl &= ~(SDIO_BUS_WIDTH_4BIT | SDIO_BUS_WIDTH_8BIT);
ctrl |= SDIO_BUS_ASYNC_INT; ctrl |= SDIO_BUS_ASYNC_INT;
ret = mmc_io_rw_direct(card, 1, 0, SDIO_CCCR_IF, ctrl, NULL); ret = mmc_io_rw_direct(card, 1, 0, SDIO_CCCR_IF, ctrl, NULL);

1
include/linux/mmc/sdio.h
View File

@@ -100,6 +100,7 @@
#define SDIO_BUS_WIDTH_1BIT 0x00 #define SDIO_BUS_WIDTH_1BIT 0x00
#define SDIO_BUS_WIDTH_4BIT 0x02 #define SDIO_BUS_WIDTH_4BIT 0x02
#define SDIO_BUS_WIDTH_8BIT 0x03
#define SDIO_BUS_ECSI 0x20 /* Enable continuous SPI interrupt */ #define SDIO_BUS_ECSI 0x20 /* Enable continuous SPI interrupt */
#define SDIO_BUS_SCSI 0x40 /* Support continuous SPI interrupt */ #define SDIO_BUS_SCSI 0x40 /* Support continuous SPI interrupt */