mmc: JZ4770: Removed redundant max_bus_width platform data field

Instead, set bus width capabilities based on the bus_width field.
gcwnow · May 27, 2013 · f3531f8 · f3531f8
1 parent c84f2af
commit f3531f8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/arch/mips/include/asm/mach-jz4770/mmc.h b/arch/mips/include/asm/mach-jz4770/mmc.h
@@ -13,7 +13,6 @@ struct jz_mmc_platform_data {
 	unsigned int ocr_mask;			/* available voltages */
 	unsigned char support_sdio;
 	unsigned char bus_width;
-	unsigned int max_bus_width;
 
 	int gpio_card_detect;
 	int gpio_read_only;

diff --git a/drivers/mmc/host/jzmmc/jz_mmc_main.c b/drivers/mmc/host/jzmmc/jz_mmc_main.c
@@ -212,7 +212,11 @@ static int jz_mmc_probe(struct platform_device *pdev)
 	mmc->f_min = MMC_CLOCK_SLOW;
 	mmc->f_max = SD_CLOCK_HIGH;
 	mmc->ocr_avail = pdata->ocr_mask;
-	mmc->caps |= host->pdata->max_bus_width;
+	mmc->caps = MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED;
+	if (pdata->bus_width >= 4)
+		mmc->caps |= MMC_CAP_4_BIT_DATA;
+	if (pdata->bus_width >= 8)
+		mmc->caps |= MMC_CAP_8_BIT_DATA;
 
 	mmc->max_blk_size = 4095;
 	mmc->max_blk_count = 65535;