summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2017-01-30 19:46:51 +0900
committerJaehoon Chung <jh80.chung@samsung.com>2017-01-31 21:50:47 +0900
commit08aa0334c6e885491c6d10fa4a8209b8917fbf63 (patch)
tree0e48c7716438670a9d16bec127598868ba265446 /drivers
parenta5995a5d7b793f74c7c893b752b51cc635a621db (diff)
downloadu-boot-imx-08aa0334c6e885491c6d10fa4a8209b8917fbf63.zip
u-boot-imx-08aa0334c6e885491c6d10fa4a8209b8917fbf63.tar.gz
u-boot-imx-08aa0334c6e885491c6d10fa4a8209b8917fbf63.tar.bz2
mmc: zynq: rename CONFIG_ZYNQ_SDHCI to CONFIG_MMC_SDHCI_ZYNQ
Make the naming scheme consistent; all SDHCI-base drivers prefixed with CONFIG_MMC_SDHCI_. While we are here, add "depends on ARCH_ZYNQ || ARCH_ZYNQMP". Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mmc/Kconfig15
-rw-r--r--drivers/mmc/Makefile2
2 files changed, 9 insertions, 8 deletions
diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig
index 97d245e..1d15cdd 100644
--- a/drivers/mmc/Kconfig
+++ b/drivers/mmc/Kconfig
@@ -165,13 +165,6 @@ config PIC32_SDHCI
help
Support for Microchip PIC32 SDHCI controller.
-config ZYNQ_SDHCI
- bool "Arasan SDHCI controller support"
- depends on DM_MMC && OF_CONTROL && BLK && DM_MMC_OPS
- depends on MMC_SDHCI
- help
- Support for Arasan SDHCI host controller on Zynq/ZynqMP ARM SoCs platform
-
config ROCKCHIP_SDHCI
bool "Arasan SDHCI controller for Rockchip support"
depends on DM_MMC && BLK && DM_MMC_OPS
@@ -313,6 +306,14 @@ config MMC_SDHCI_TEGRA
If unsure, say N.
+config MMC_SDHCI_ZYNQ
+ bool "Arasan SDHCI controller support"
+ depends on ARCH_ZYNQ || ARCH_ZYNQMP
+ depends on DM_MMC && OF_CONTROL && BLK && DM_MMC_OPS
+ depends on MMC_SDHCI
+ help
+ Support for Arasan SDHCI host controller on Zynq/ZynqMP ARM SoCs platform
+
config MMC_SUNXI
bool "Allwinner sunxi SD/MMC Host Controller support"
depends on ARCH_SUNXI && !UART0_PORT_F
diff --git a/drivers/mmc/Makefile b/drivers/mmc/Makefile
index 2747deb..5a497f5 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_ZYNQ_SDHCI) += zynq_sdhci.o
obj-$(CONFIG_ROCKCHIP_SDHCI) += rockchip_sdhci.o
ifdef CONFIG_SPL_BUILD
@@ -65,6 +64,7 @@ obj-$(CONFIG_MMC_SDHCI_S5P) += s5p_sdhci.o
obj-$(CONFIG_MMC_SDHCI_SPEAR) += spear_sdhci.o
obj-$(CONFIG_MMC_SDHCI_TEGRA) += tegra_mmc.o
obj-$(CONFIG_MMC_SDHCI_XENON) += xenon_sdhci.o
+obj-$(CONFIG_MMC_SDHCI_ZYNQ) += zynq_sdhci.o
obj-$(CONFIG_MMC_SUNXI) += sunxi_mmc.o
obj-$(CONFIG_MMC_UNIPHIER) += uniphier-sd.o