mmc: ftsdc010: Merge nds32_mmc to ftsdc010
PATCH 6/7 mmc: ftsdc010: Merge nds32_mmc to ftsdc010
From: Rick Chen <[email protected]>
nsd32_mmc was created to support ftsdc010 dm.
It is not necessary to separate both, so merge it
to ftsdc010.
Signed-off-by Rick Chen <[email protected]>
Signed-off-by Rick Chen <[email protected]>
Cc Greentime Hu <[email protected]>
--- drivers/mmc/Kconfig | 7 --- drivers/mmc/Makefile | 1 - drivers/mmc/ftsdc010_mci.c | 139 ++++++++++++++++++++++++++++++++++++++++++-- drivers/mmc/ftsdc010_mci.h | 10 ---- drivers/mmc/nds32_mmc.c | 141 --------------------------------------------- 5 files changed, 133 insertions(+), 165 deletions(-) delete mode 100644 drivers/mmc/nds32_mmc.c
drivers/mmc/Kconfig +0 -7
@@ -523,13 +523,6 @@ config STM32_SDMMC2 If you have a board based on such a SoC and with a SD/MMC slot, say Y or M here. -config MMC_NDS32 - bool "Andestech SD/MMC controller support" - depends on DM_MMC && OF_CONTROL && BLK && FTSDC010 - help - This enables support for the Andestech SD/MMM controller, which is - based on Faraday IP. - config FTSDC010 bool "Ftsdc010 SD/MMC controller Support" help
drivers/mmc/Makefile +0 -1
@@ -42,7 +42,6 @@ obj-$(CONFIG_MMC_SANDBOX) += sandbox_mmc.o obj-$(CONFIG_SH_MMCIF) += sh_mmcif.o obj-$(CONFIG_SH_SDHI) += sh_sdhi.o obj-$(CONFIG_STM32_SDMMC2) += stm32_sdmmc2.o -obj-$(CONFIG_MMC_NDS32) += nds32_mmc.o # SDHCI obj-$(CONFIG_MMC_SDHCI) += sdhci.o
drivers/mmc/ftsdc010_mci.c +133 -6
183 lines not on this page · raw message
drivers/mmc/ftsdc010_mci.h +0 -10
@@ -35,14 +35,4 @@ struct ftsdc010_chip { bool fifo_mode; }; - -#ifdef CONFIG_DM_MMC -/* Export the operations to drivers */ -int ftsdc010_probe (struct udevice *dev); -extern const struct dm_mmc_ops dm_ftsdc010_ops; -#endif -void ftsdc_setup_cfg (struct mmc_config *cfg,const char *name,int buswidth, -uint caps,u32 max_clk,u32 min_clk); -int ftsdc010_bind (struct udevice *dev,struct mmc *mmc,struct mmc_config *cfg); -#endif /* __FTSDC010_MCI_H */
drivers/mmc/nds32_mmc.c deleted +0 -141
141 lines not on this page · raw message
Signature · 1 line
2.7.4