mmc: pic32: rename CONFIG_PIC32_SDHCI to CONFIG_MMC_SDHCI_PIC32

Make the naming scheme consistent; all SDHCI-base drivers prefixed
with CONFIG_MMC_SDHCI_.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

diff --git a/configs/pic32mzdask_defconfig b/configs/pic32mzdask_defconfig
index 90a0d3242db6c887bb49a8df33180e3f4bc4be8e..85c0d2ad2401d342a3640da0e191f1b33b459df3 100644 (file)
--- a/configs/pic32mzdask_defconfig
+++ b/configs/pic32mzdask_defconfig
@@ -29,7 +29,7 @@ CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_CLK=y
 CONFIG_DM_GPIO=y
 CONFIG_DM_MMC=y
-CONFIG_PIC32_SDHCI=y
+CONFIG_MMC_SDHCI_PIC32=y
 CONFIG_MMC_SDHCI=y
 CONFIG_DM_ETH=y
 CONFIG_PIC32_ETH=y

diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig
index c9a4ca96a39eeb566df7e6f9bfe1076fd212ccd7..520e7ea182275658f06b6c8dacdb205b3804ac3d 100644 (file)
--- a/drivers/mmc/Kconfig
+++ b/drivers/mmc/Kconfig
@@ -148,13 +148,6 @@ config SH_SDHI
        help
          Support for the on-chip SDHI host controller on SuperH/Renesas ARM SoCs platform
 
-config PIC32_SDHCI
-       bool "Microchip PIC32 on-chip SDHCI support"
-       depends on DM_MMC && MACH_PIC32
-       depends on MMC_SDHCI
-       help
-         Support for Microchip PIC32 SDHCI controller.
-
 config MMC_UNIPHIER
        bool "UniPhier SD/MMC Host Controller support"
        depends on ARCH_UNIPHIER
@@ -255,6 +248,13 @@ config MMC_SDHCI_MV
 
          If unsure, say N.
 
+config MMC_SDHCI_PIC32
+       bool "Microchip PIC32 on-chip SDHCI support"
+       depends on DM_MMC && MACH_PIC32
+       depends on MMC_SDHCI
+       help
+         Support for Microchip PIC32 SDHCI controller.
+
 config MMC_SDHCI_ROCKCHIP
        bool "Arasan SDHCI controller for Rockchip support"
        depends on ARCH_ROCKCHIP

diff --git a/drivers/mmc/Makefile b/drivers/mmc/Makefile
index 76936445fc05835d5b7d3e57c65518dbc9bf4d88..e63f4394d6bebb5855711399ae428d7ecc509b52 100644 (file)
--- a/drivers/mmc/Makefile
+++ b/drivers/mmc/Makefile
@@ -50,7 +50,6 @@ obj-$(CONFIG_SPL_SAVEENV) += mmc_write.o
 else
 obj-$(CONFIG_GENERIC_MMC) += mmc_write.o
 endif
-obj-$(CONFIG_PIC32_SDHCI) += pic32_sdhci.o
 
 # SDHCI
 obj-$(CONFIG_MMC_SDHCI)                        += sdhci.o
@@ -59,6 +58,7 @@ 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_PIC32)          += pic32_sdhci.o
 obj-$(CONFIG_MMC_SDHCI_ROCKCHIP)       += rockchip_sdhci.o
 obj-$(CONFIG_MMC_SDHCI_S5P)            += s5p_sdhci.o
 obj-$(CONFIG_MMC_SDHCI_SPEAR)          += spear_sdhci.o