Skip to content

Commit a02f8f4

Browse files
XBurststorulf
authored andcommitted
mmc: jz4740: Add 8bit mode support
Add support for 8bit mode, now supports 1bit/4bit/8bit modes. Signed-off-by: Zhou Yanjie <[email protected]> Signed-off-by: Ulf Hansson <[email protected]>
1 parent 38413ce commit a02f8f4

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

drivers/mmc/host/jz4740_mmc.c

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,8 @@
7777

7878
#define JZ_MMC_CMDAT_IO_ABORT BIT(11)
7979
#define JZ_MMC_CMDAT_BUS_WIDTH_4BIT BIT(10)
80+
#define JZ_MMC_CMDAT_BUS_WIDTH_8BIT (BIT(10) | BIT(9))
81+
#define JZ_MMC_CMDAT_BUS_WIDTH_MASK (BIT(10) | BIT(9))
8082
#define JZ_MMC_CMDAT_DMA_EN BIT(8)
8183
#define JZ_MMC_CMDAT_INIT BIT(7)
8284
#define JZ_MMC_CMDAT_BUSY BIT(6)
@@ -895,11 +897,16 @@ static void jz4740_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
895897

896898
switch (ios->bus_width) {
897899
case MMC_BUS_WIDTH_1:
898-
host->cmdat &= ~JZ_MMC_CMDAT_BUS_WIDTH_4BIT;
900+
host->cmdat &= ~JZ_MMC_CMDAT_BUS_WIDTH_MASK;
899901
break;
900902
case MMC_BUS_WIDTH_4:
903+
host->cmdat &= ~JZ_MMC_CMDAT_BUS_WIDTH_MASK;
901904
host->cmdat |= JZ_MMC_CMDAT_BUS_WIDTH_4BIT;
902905
break;
906+
case MMC_BUS_WIDTH_8:
907+
host->cmdat &= ~JZ_MMC_CMDAT_BUS_WIDTH_MASK;
908+
host->cmdat |= JZ_MMC_CMDAT_BUS_WIDTH_8BIT;
909+
break;
903910
default:
904911
break;
905912
}
@@ -1029,7 +1036,8 @@ static int jz4740_mmc_probe(struct platform_device* pdev)
10291036

10301037
dev_info(&pdev->dev, "Using %s, %d-bit mode\n",
10311038
host->use_dma ? "DMA" : "PIO",
1032-
(mmc->caps & MMC_CAP_4_BIT_DATA) ? 4 : 1);
1039+
(mmc->caps & MMC_CAP_8_BIT_DATA) ? 8 :
1040+
((mmc->caps & MMC_CAP_4_BIT_DATA) ? 4 : 1));
10331041

10341042
return 0;
10351043

0 commit comments

Comments
 (0)