Make the naming scheme consistent; all SDHCI-base drivers prefixed
with CONFIG_MMC_SDHCI_.
Signed-off-by: Masahiro Yamada <yamada.masah...@socionext.com>
---
Changes in v2: None
configs/dragonboard410c_defconfig | 2 +-
drivers/mmc/Kconfig | 20 ++++++++++----------
drivers/mmc/Makefile | 2 +-
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/configs/dragonboard410c_defconfig
b/configs/dragonboard410c_defconfig
index bf1a755..8f206e2 100644
--- a/configs/dragonboard410c_defconfig
+++ b/configs/dragonboard410c_defconfig
@@ -21,7 +21,7 @@ CONFIG_PM8916_GPIO=y
CONFIG_LED=y
CONFIG_LED_GPIO=y
CONFIG_DM_MMC=y
-CONFIG_MSM_SDHCI=y
+CONFIG_MMC_SDHCI_MSM=y
CONFIG_MMC_SDHCI=y
CONFIG_DM_PMIC=y
CONFIG_PMIC_PM8916=y
diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig
index 6f51354..c9a4ca9 100644
--- a/drivers/mmc/Kconfig
+++ b/drivers/mmc/Kconfig
@@ -51,16 +51,6 @@ config SPL_MMC_TINY
operations too, which can remove the need for malloc support in SPL
and thus further reduce footprint.
-config MSM_SDHCI
- bool "Qualcomm SDHCI controller"
- depends on DM_MMC && BLK && DM_MMC_OPS
- depends on MMC_SDHCI
- help
- Enables support for SDHCI 2.0 controller present on some Qualcomm
- Snapdragon devices. This device is compatible with eMMC v4.5 and
- SD 3.0 specifications. Both SD and eMMC devices are supported.
- Card-detect gpios are not supported.
-
config ATMEL_SDHCI
bool "Atmel SDHCI controller support"
depends on DM_MMC && BLK && DM_MMC_OPS && ARCH_AT91
@@ -243,6 +233,16 @@ config MMC_SDHCI_KONA
If you have a controller with this interface, say Y here.
+config MMC_SDHCI_MSM
+ bool "Qualcomm SDHCI controller"
+ depends on BLK && DM_MMC_OPS
+ depends on MMC_SDHCI
+ help
+ Enables support for SDHCI 2.0 controller present on some Qualcomm
+ Snapdragon devices. This device is compatible with eMMC v4.5 and
+ SD 3.0 specifications. Both SD and eMMC devices are supported.
+ Card-detect gpios are not supported.
+
config MMC_SDHCI_MV
bool "SDHCI support on Marvell platform"
depends on ARCH_MVEBU
diff --git a/drivers/mmc/Makefile b/drivers/mmc/Makefile
index 379b08c..7693644 100644
--- a/drivers/mmc/Makefile
+++ b/drivers/mmc/Makefile
@@ -51,13 +51,13 @@ else
obj-$(CONFIG_GENERIC_MMC) += mmc_write.o
endif
obj-$(CONFIG_PIC32_SDHCI) += pic32_sdhci.o
-obj-$(CONFIG_MSM_SDHCI) += msm_sdhci.o
# SDHCI
obj-$(CONFIG_MMC_SDHCI) += sdhci.o
obj-$(CONFIG_MMC_SDHCI_BCM2835) += bcm2835_sdhci.o
obj-$(CONFIG_MMC_SDHCI_CADENCE) += sdhci-cadence.o
obj-$(CONFIG_MMC_SDHCI_KONA) += kona_sdhci.o
+obj-$(CONFIG_MMC_SDHCI_MSM) += msm_sdhci.o
obj-$(CONFIG_MMC_SDHCI_MV) += mv_sdhci.o
obj-$(CONFIG_MMC_SDHCI_ROCKCHIP) += rockchip_sdhci.o
obj-$(CONFIG_MMC_SDHCI_S5P) += s5p_sdhci.o
--
2.7.4
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
