diff options
| author | Masahiro Yamada | 2017-01-30 19:46:52 +0900 |
|---|---|---|
| committer | Jaehoon Chung | 2017-01-31 21:50:47 +0900 |
| commit | facc8058097d3149ad6ce10f0cc20c647d72c9ea (patch) | |
| tree | 393b26120e552949744790370458b8d0cfe3cf05 | |
| parent | 08aa0334c6e885491c6d10fa4a8209b8917fbf63 (diff) | |
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>
| -rw-r--r-- | configs/evb-rk3399_defconfig | 2 | ||||
| -rw-r--r-- | drivers/mmc/Kconfig | 15 | ||||
| -rw-r--r-- | drivers/mmc/Makefile | 2 |
3 files changed, 10 insertions, 9 deletions
diff --git a/configs/evb-rk3399_defconfig b/configs/evb-rk3399_defconfig index ca292cf16b2..47064f9b9e7 100644 --- 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 1d15cdd7b3b..6f51354152d 100644 --- 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 5a497f5d135..379b08cc766 100644 --- 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 |