Merge pull request torvalds#161 from hzhuang1/emmc_rpmb

Emmc rpmb
xin3liang · Dec 1, 2015 · 88c232f · 88c232f
2 parents f7136b7 + f5ad7da
commit 88c232f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
@@ -338,7 +338,7 @@ CONFIG_USB_FUNCTIONFS_RNDIS=y
 CONFIG_USB_MASS_STORAGE=m
 CONFIG_USB_G_SERIAL=m
 CONFIG_MMC=y
-CONFIG_MMC_BLOCK_MINORS=64
+CONFIG_MMC_BLOCK_MINORS=32
 CONFIG_MMC_ARMMMCI=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_PLTFM=y

diff --git a/drivers/mmc/host/dw_mmc-k3.c b/drivers/mmc/host/dw_mmc-k3.c
@@ -30,6 +30,13 @@ struct k3_priv {
 	struct regmap	*reg;
 };
 
+/* only enable MMC_CAP_CMD23 for eMMC controller */
+static unsigned long dw_mci_hi6220_caps[] = {
+	MMC_CAP_CMD23,
+	0,
+	0
+};
+
 static void dw_mci_k3_set_ios(struct dw_mci *host, struct mmc_ios *ios)
 {
 	int ret;
@@ -133,6 +140,7 @@ static int dw_mci_hi6220_execute_tunning(struct dw_mci_slot *slot)
 }
 
 static const struct dw_mci_drv_data hi6220_data = {
+	.caps			= dw_mci_hi6220_caps,
 	.switch_voltage		= dw_mci_hi6220_switch_voltage,
 	.set_ios		= dw_mci_hi6220_set_ios,
 	.parse_dt		= dw_mci_hi6220_parse_dt,