mmc: rockchip: rename CONFIG_ROCKCHIP_SDHCI to CONFIG_MMC_SDHCI_ROCKCHIP

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

While we are here, add "depends on ARCH_ROCKCHIP".

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

diff --git a/configs/evb-rk3399_defconfig b/configs/evb-rk3399_defconfig
index ca292cf16b2b0e02ae26ebe5d8b6ea53e3209c57..47064f9b9e7b2a41e9308f23ff57112876043cd1 100644 (file)
--- a/configs/evb-rk3399_defconfig
+++ b/configs/evb-rk3399_defconfig
@@ -18,7 +18,7 @@ CONFIG_CLK=y
 CONFIG_ROCKCHIP_GPIO=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_DW_ROCKCHIP=y
-CONFIG_ROCKCHIP_SDHCI=y
+CONFIG_MMC_SDHCI_ROCKCHIP=y
 CONFIG_MMC_SDHCI=y
 CONFIG_PINCTRL=y
 CONFIG_ROCKCHIP_RK3399_PINCTRL=y

diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig
index 1d15cdd7b3b3359ce30096506b9aca8c4dccabfb..6f51354152d06ed37ada3d400165828af86cd070 100644 (file)
--- a/drivers/mmc/Kconfig
+++ b/drivers/mmc/Kconfig
@@ -165,13 +165,6 @@ config PIC32_SDHCI
        help
          Support for Microchip PIC32 SDHCI controller.
 
-config ROCKCHIP_SDHCI
-       bool "Arasan SDHCI controller for Rockchip support"
-       depends on DM_MMC && BLK && DM_MMC_OPS
-       depends on MMC_SDHCI
-       help
-         Support for Arasan SDHCI host controller on Rockchip ARM SoCs platform
-
 config MMC_UNIPHIER
        bool "UniPhier SD/MMC Host Controller support"
        depends on ARCH_UNIPHIER
@@ -262,6 +255,14 @@ config MMC_SDHCI_MV
 
          If unsure, say N.
 
+config MMC_SDHCI_ROCKCHIP
+       bool "Arasan SDHCI controller for Rockchip support"
+       depends on ARCH_ROCKCHIP
+       depends on DM_MMC && BLK && DM_MMC_OPS
+       depends on MMC_SDHCI
+       help
+         Support for Arasan SDHCI host controller on Rockchip ARM SoCs platform
+
 config MMC_SDHCI_S5P
        bool "SDHCI support on Samsung S5P SoC"
        depends on MMC_SDHCI

diff --git a/drivers/mmc/Makefile b/drivers/mmc/Makefile
index 5a497f5d1352fb5bbe2ffabad2b3247c7db1aa82..379b08cc766e697f8395f0034c4f9f1b17483315 100644 (file)
--- a/drivers/mmc/Makefile
+++ b/drivers/mmc/Makefile
@@ -43,7 +43,6 @@ obj-$(CONFIG_S3C_SDI) += s3c_sdi.o
 obj-$(CONFIG_MMC_SANDBOX)              += sandbox_mmc.o
 obj-$(CONFIG_SH_MMCIF) += sh_mmcif.o
 obj-$(CONFIG_SH_SDHI) += sh_sdhi.o
-obj-$(CONFIG_ROCKCHIP_SDHCI) += rockchip_sdhci.o
 
 ifdef CONFIG_SPL_BUILD
 obj-$(CONFIG_SPL_MMC_BOOT) += fsl_esdhc_spl.o
@@ -60,6 +59,7 @@ 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_MV)             += mv_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
 obj-$(CONFIG_MMC_SDHCI_TEGRA)          += tegra_mmc.o