From 55ed3b46986fda389fb350794b11bb26db73ef5c Mon Sep 17 00:00:00 2001 From: Masahiro Yamada Date: Tue, 10 Jan 2017 13:32:04 +0900 Subject: [PATCH] mmc: move CONFIG_DWMMC to Kconfig, renaming to CONFIG_MMC_DW This commit was created as follows: [1] Rename the option with the following command: find . -name .git -prune -o ! -path ./scripts/config_whitelist.txt \ -type f -print | xargs sed -i -e 's/CONFIG_DWMMC/CONFIG_MMC_DW/g' [2] create the entry for MMC_DW in drivers/mmc/Kconfig (the prompt and help were copied from Linux) [3] run "tools/moveconfig.py -y MMC_DW" [4] add "depends on MMC_DW" to the MMC_DW_ROCKCHIP entry [5] Clean-up doc/README.socfpga by hand Signed-off-by: Masahiro Yamada Reviewed-by: Marek Vasut --- board/hisilicon/hikey/hikey.c | 2 +- board/samsung/common/board.c | 2 +- configs/arndale_defconfig | 1 + configs/axs101_defconfig | 1 + configs/axs103_defconfig | 1 + configs/chromebit_mickey_defconfig | 1 + configs/chromebook_jerry_defconfig | 1 + configs/chromebook_minnie_defconfig | 1 + configs/evb-rk3036_defconfig | 1 + configs/evb-rk3288_defconfig | 1 + configs/evb-rk3399_defconfig | 1 + configs/fennec-rk3288_defconfig | 1 + configs/firefly-rk3288_defconfig | 1 + configs/hikey_defconfig | 1 + configs/kylin-rk3036_defconfig | 1 + configs/miniarm-rk3288_defconfig | 1 + configs/odroid-xu3_defconfig | 1 + configs/odroid_defconfig | 1 + configs/origen_defconfig | 1 + configs/peach-pi_defconfig | 1 + configs/peach-pit_defconfig | 1 + configs/popmetal-rk3288_defconfig | 1 + configs/rock2_defconfig | 1 + configs/s5pc210_universal_defconfig | 1 + configs/smdk5250_defconfig | 1 + configs/smdk5420_defconfig | 1 + configs/smdkv310_defconfig | 1 + configs/snow_defconfig | 1 + configs/socfpga_arria5_defconfig | 1 + configs/socfpga_cyclone5_defconfig | 1 + configs/socfpga_de0_nano_soc_defconfig | 1 + configs/socfpga_de1_soc_defconfig | 1 + configs/socfpga_mcvevk_defconfig | 1 + configs/socfpga_sockit_defconfig | 1 + configs/socfpga_socrates_defconfig | 1 + configs/socfpga_sr1500_defconfig | 1 + configs/socfpga_vining_fpga_defconfig | 1 + configs/spring_defconfig | 1 + configs/trats2_defconfig | 1 + configs/trats_defconfig | 1 + doc/README.socfpga | 3 --- drivers/mmc/Kconfig | 8 ++++++++ drivers/mmc/Makefile | 2 +- include/configs/axs10x.h | 1 - include/configs/exynos-common.h | 1 - include/configs/hikey.h | 1 - include/configs/rk3036_common.h | 1 - include/configs/rk3288_common.h | 1 - include/configs/rk3399_common.h | 1 - include/configs/socfpga_common.h | 1 - 50 files changed, 49 insertions(+), 13 deletions(-) diff --git a/board/hisilicon/hikey/hikey.c b/board/hisilicon/hikey/hikey.c index 72d6334b5f..df3b5e717a 100644 --- a/board/hisilicon/hikey/hikey.c +++ b/board/hisilicon/hikey/hikey.c @@ -347,7 +347,7 @@ static int init_dwmmc(void) { int ret; -#ifdef CONFIG_DWMMC +#ifdef CONFIG_MMC_DW /* mmc0 clocks are already configured by ATF */ ret = hi6220_pinmux_config(PERIPH_ID_SDMMC0); diff --git a/board/samsung/common/board.c b/board/samsung/common/board.c index 522e0cd67a..ba928e0fa7 100644 --- a/board/samsung/common/board.c +++ b/board/samsung/common/board.c @@ -260,7 +260,7 @@ static int init_mmc(void) static int init_dwmmc(void) { -#ifdef CONFIG_DWMMC +#ifdef CONFIG_MMC_DW return exynos_dwmmc_init(gd->fdt_blob); #else return 0; diff --git a/configs/arndale_defconfig b/configs/arndale_defconfig index cdfb73996f..2298def33d 100644 --- a/configs/arndale_defconfig +++ b/configs/arndale_defconfig @@ -22,6 +22,7 @@ CONFIG_CMD_TIME=y CONFIG_CMD_SOUND=y CONFIG_CMD_EXT4_WRITE=y CONFIG_DM_I2C_COMPAT=y +CONFIG_MMC_DW=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_S5P=y CONFIG_SOUND=y diff --git a/configs/axs101_defconfig b/configs/axs101_defconfig index 04f5ffe959..3793c4255d 100644 --- a/configs/axs101_defconfig +++ b/configs/axs101_defconfig @@ -20,6 +20,7 @@ CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM=y CONFIG_CLK=y CONFIG_SYS_I2C_DW=y +CONFIG_MMC_DW=y CONFIG_DM_ETH=y CONFIG_ETH_DESIGNWARE=y CONFIG_DM_SERIAL=y diff --git a/configs/axs103_defconfig b/configs/axs103_defconfig index 54fad6d958..30a4021d79 100644 --- a/configs/axs103_defconfig +++ b/configs/axs103_defconfig @@ -20,6 +20,7 @@ CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM=y CONFIG_CLK=y CONFIG_SYS_I2C_DW=y +CONFIG_MMC_DW=y CONFIG_DM_ETH=y CONFIG_ETH_DESIGNWARE=y CONFIG_DM_SERIAL=y diff --git a/configs/chromebit_mickey_defconfig b/configs/chromebit_mickey_defconfig index 8c65ecfa8e..8b66d6ca47 100644 --- a/configs/chromebit_mickey_defconfig +++ b/configs/chromebit_mickey_defconfig @@ -50,6 +50,7 @@ CONFIG_CROS_EC_KEYB=y CONFIG_CROS_EC=y CONFIG_CROS_EC_SPI=y CONFIG_PWRSEQ=y +CONFIG_MMC_DW=y CONFIG_MMC_DW_ROCKCHIP=y CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y diff --git a/configs/chromebook_jerry_defconfig b/configs/chromebook_jerry_defconfig index 5bb9a99da4..f655301636 100644 --- a/configs/chromebook_jerry_defconfig +++ b/configs/chromebook_jerry_defconfig @@ -51,6 +51,7 @@ CONFIG_CROS_EC_KEYB=y CONFIG_CROS_EC=y CONFIG_CROS_EC_SPI=y CONFIG_PWRSEQ=y +CONFIG_MMC_DW=y CONFIG_MMC_DW_ROCKCHIP=y CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y diff --git a/configs/chromebook_minnie_defconfig b/configs/chromebook_minnie_defconfig index d4ec2bdabe..04321f4b5e 100644 --- a/configs/chromebook_minnie_defconfig +++ b/configs/chromebook_minnie_defconfig @@ -51,6 +51,7 @@ CONFIG_CROS_EC_KEYB=y CONFIG_CROS_EC=y CONFIG_CROS_EC_SPI=y CONFIG_PWRSEQ=y +CONFIG_MMC_DW=y CONFIG_MMC_DW_ROCKCHIP=y CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y diff --git a/configs/evb-rk3036_defconfig b/configs/evb-rk3036_defconfig index f4ee5b9772..623150b46d 100644 --- a/configs/evb-rk3036_defconfig +++ b/configs/evb-rk3036_defconfig @@ -29,6 +29,7 @@ CONFIG_CLK=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=y CONFIG_LED=y +CONFIG_MMC_DW=y CONFIG_MMC_DW_ROCKCHIP=y CONFIG_PINCTRL=y CONFIG_ROCKCHIP_RK3036_PINCTRL=y diff --git a/configs/evb-rk3288_defconfig b/configs/evb-rk3288_defconfig index 0bfb0ddc48..df58996884 100644 --- a/configs/evb-rk3288_defconfig +++ b/configs/evb-rk3288_defconfig @@ -43,6 +43,7 @@ CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=y CONFIG_LED=y CONFIG_LED_GPIO=y +CONFIG_MMC_DW=y CONFIG_MMC_DW_ROCKCHIP=y CONFIG_PINCTRL=y # CONFIG_PINCTRL_FULL is not set diff --git a/configs/evb-rk3399_defconfig b/configs/evb-rk3399_defconfig index 68de631283..6988bcb866 100644 --- a/configs/evb-rk3399_defconfig +++ b/configs/evb-rk3399_defconfig @@ -20,6 +20,7 @@ CONFIG_REGMAP=y CONFIG_SYSCON=y CONFIG_CLK=y CONFIG_ROCKCHIP_GPIO=y +CONFIG_MMC_DW=y CONFIG_MMC_DW_ROCKCHIP=y CONFIG_ROCKCHIP_SDHCI=y CONFIG_MMC_SDHCI=y diff --git a/configs/fennec-rk3288_defconfig b/configs/fennec-rk3288_defconfig index b76297ce10..21a5df701c 100644 --- a/configs/fennec-rk3288_defconfig +++ b/configs/fennec-rk3288_defconfig @@ -42,6 +42,7 @@ CONFIG_CLK=y CONFIG_SPL_CLK=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=y +CONFIG_MMC_DW=y CONFIG_MMC_DW_ROCKCHIP=y CONFIG_PINCTRL=y # CONFIG_PINCTRL_FULL is not set diff --git a/configs/firefly-rk3288_defconfig b/configs/firefly-rk3288_defconfig index 3e55a84d53..eb78d547bb 100644 --- a/configs/firefly-rk3288_defconfig +++ b/configs/firefly-rk3288_defconfig @@ -43,6 +43,7 @@ CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=y CONFIG_LED=y CONFIG_LED_GPIO=y +CONFIG_MMC_DW=y CONFIG_MMC_DW_ROCKCHIP=y CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y diff --git a/configs/hikey_defconfig b/configs/hikey_defconfig index 27a86382bf..4a9546a9e9 100644 --- a/configs/hikey_defconfig +++ b/configs/hikey_defconfig @@ -10,5 +10,6 @@ CONFIG_CMD_MMC=y CONFIG_CMD_USB=y CONFIG_CMD_GPIO=y CONFIG_CMD_CACHE=y +CONFIG_MMC_DW=y CONFIG_USB=y CONFIG_USB_STORAGE=y diff --git a/configs/kylin-rk3036_defconfig b/configs/kylin-rk3036_defconfig index 3e8fba26eb..653d8d25c8 100644 --- a/configs/kylin-rk3036_defconfig +++ b/configs/kylin-rk3036_defconfig @@ -30,6 +30,7 @@ CONFIG_CLK=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=y CONFIG_LED=y +CONFIG_MMC_DW=y CONFIG_MMC_DW_ROCKCHIP=y CONFIG_PINCTRL=y CONFIG_ROCKCHIP_RK3036_PINCTRL=y diff --git a/configs/miniarm-rk3288_defconfig b/configs/miniarm-rk3288_defconfig index 7d3e65e0e5..2b6bd0b8ab 100644 --- a/configs/miniarm-rk3288_defconfig +++ b/configs/miniarm-rk3288_defconfig @@ -42,6 +42,7 @@ CONFIG_CLK=y CONFIG_SPL_CLK=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=y +CONFIG_MMC_DW=y CONFIG_MMC_DW_ROCKCHIP=y CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y diff --git a/configs/odroid-xu3_defconfig b/configs/odroid-xu3_defconfig index a6ec2ee20c..dab4cc1443 100644 --- a/configs/odroid-xu3_defconfig +++ b/configs/odroid-xu3_defconfig @@ -26,6 +26,7 @@ CONFIG_ADC=y CONFIG_ADC_EXYNOS=y CONFIG_DFU_MMC=y CONFIG_DM_I2C_COMPAT=y +CONFIG_MMC_DW=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_S5P=y CONFIG_DM_PMIC=y diff --git a/configs/odroid_defconfig b/configs/odroid_defconfig index e12208cf3e..567ac2b755 100644 --- a/configs/odroid_defconfig +++ b/configs/odroid_defconfig @@ -36,6 +36,7 @@ CONFIG_CMD_FS_GENERIC=y CONFIG_OF_CONTROL=y CONFIG_DFU_MMC=y CONFIG_DM_I2C_COMPAT=y +CONFIG_MMC_DW=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_SDMA=y CONFIG_MMC_SDHCI_S5P=y diff --git a/configs/origen_defconfig b/configs/origen_defconfig index 0dcc9e8839..1feb71c698 100644 --- a/configs/origen_defconfig +++ b/configs/origen_defconfig @@ -29,6 +29,7 @@ CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_OF_CONTROL=y CONFIG_DFU_MMC=y +CONFIG_MMC_DW=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_SDMA=y CONFIG_MMC_SDHCI_S5P=y diff --git a/configs/peach-pi_defconfig b/configs/peach-pi_defconfig index ef02118421..42b9f258b0 100644 --- a/configs/peach-pi_defconfig +++ b/configs/peach-pi_defconfig @@ -32,6 +32,7 @@ CONFIG_I2C_ARB_GPIO_CHALLENGE=y CONFIG_CROS_EC_KEYB=y CONFIG_CROS_EC=y CONFIG_CROS_EC_SPI=y +CONFIG_MMC_DW=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_S5P=y CONFIG_SPI_FLASH=y diff --git a/configs/peach-pit_defconfig b/configs/peach-pit_defconfig index 14fe00eb2a..7b4ebfe77f 100644 --- a/configs/peach-pit_defconfig +++ b/configs/peach-pit_defconfig @@ -32,6 +32,7 @@ CONFIG_I2C_ARB_GPIO_CHALLENGE=y CONFIG_CROS_EC_KEYB=y CONFIG_CROS_EC=y CONFIG_CROS_EC_SPI=y +CONFIG_MMC_DW=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_S5P=y CONFIG_SPI_FLASH=y diff --git a/configs/popmetal-rk3288_defconfig b/configs/popmetal-rk3288_defconfig index 5a4e1b8b8a..a123b841f9 100644 --- a/configs/popmetal-rk3288_defconfig +++ b/configs/popmetal-rk3288_defconfig @@ -42,6 +42,7 @@ CONFIG_CLK=y CONFIG_SPL_CLK=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=y +CONFIG_MMC_DW=y CONFIG_MMC_DW_ROCKCHIP=y CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y diff --git a/configs/rock2_defconfig b/configs/rock2_defconfig index b7f54350e0..a3b0c87688 100644 --- a/configs/rock2_defconfig +++ b/configs/rock2_defconfig @@ -41,6 +41,7 @@ CONFIG_CLK=y CONFIG_SPL_CLK=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=y +CONFIG_MMC_DW=y CONFIG_MMC_DW_ROCKCHIP=y CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y diff --git a/configs/s5pc210_universal_defconfig b/configs/s5pc210_universal_defconfig index b6cefb132a..fad2b43ba2 100644 --- a/configs/s5pc210_universal_defconfig +++ b/configs/s5pc210_universal_defconfig @@ -29,6 +29,7 @@ CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_OF_CONTROL=y CONFIG_DFU_MMC=y +CONFIG_MMC_DW=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_SDMA=y CONFIG_MMC_SDHCI_S5P=y diff --git a/configs/smdk5250_defconfig b/configs/smdk5250_defconfig index b785efe306..4ef41437a2 100644 --- a/configs/smdk5250_defconfig +++ b/configs/smdk5250_defconfig @@ -26,6 +26,7 @@ CONFIG_CMD_PMIC=y CONFIG_CMD_REGULATOR=y CONFIG_CMD_EXT4_WRITE=y CONFIG_DM_I2C_COMPAT=y +CONFIG_MMC_DW=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_S5P=y CONFIG_SPI_FLASH=y diff --git a/configs/smdk5420_defconfig b/configs/smdk5420_defconfig index daa46d482c..bff944491e 100644 --- a/configs/smdk5420_defconfig +++ b/configs/smdk5420_defconfig @@ -23,6 +23,7 @@ CONFIG_CMD_CACHE=y CONFIG_CMD_TIME=y CONFIG_CMD_EXT4_WRITE=y CONFIG_DM_I2C_COMPAT=y +CONFIG_MMC_DW=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_S5P=y CONFIG_SPI_FLASH=y diff --git a/configs/smdkv310_defconfig b/configs/smdkv310_defconfig index a75a1f0733..c15f4f5c25 100644 --- a/configs/smdkv310_defconfig +++ b/configs/smdkv310_defconfig @@ -22,6 +22,7 @@ CONFIG_CMD_EXT4=y CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y +CONFIG_MMC_DW=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_SDMA=y CONFIG_MMC_SDHCI_S5P=y diff --git a/configs/snow_defconfig b/configs/snow_defconfig index 47b498b6b2..ef3cfa1519 100644 --- a/configs/snow_defconfig +++ b/configs/snow_defconfig @@ -33,6 +33,7 @@ CONFIG_I2C_ARB_GPIO_CHALLENGE=y CONFIG_CROS_EC_KEYB=y CONFIG_CROS_EC=y CONFIG_CROS_EC_I2C=y +CONFIG_MMC_DW=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_S5P=y CONFIG_SPI_FLASH=y diff --git a/configs/socfpga_arria5_defconfig b/configs/socfpga_arria5_defconfig index d91990c5e3..43c51fe94d 100644 --- a/configs/socfpga_arria5_defconfig +++ b/configs/socfpga_arria5_defconfig @@ -43,6 +43,7 @@ CONFIG_DM_GPIO=y CONFIG_DWAPB_GPIO=y CONFIG_SYS_I2C_DW=y CONFIG_DM_MMC=y +CONFIG_MMC_DW=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_SPANSION=y diff --git a/configs/socfpga_cyclone5_defconfig b/configs/socfpga_cyclone5_defconfig index 905f766278..8b050b95c4 100644 --- a/configs/socfpga_cyclone5_defconfig +++ b/configs/socfpga_cyclone5_defconfig @@ -43,6 +43,7 @@ CONFIG_DM_GPIO=y CONFIG_DWAPB_GPIO=y CONFIG_SYS_I2C_DW=y CONFIG_DM_MMC=y +CONFIG_MMC_DW=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_SPANSION=y diff --git a/configs/socfpga_de0_nano_soc_defconfig b/configs/socfpga_de0_nano_soc_defconfig index 7daf81a5a3..af41e1e0d2 100644 --- a/configs/socfpga_de0_nano_soc_defconfig +++ b/configs/socfpga_de0_nano_soc_defconfig @@ -42,6 +42,7 @@ CONFIG_DM_GPIO=y CONFIG_DWAPB_GPIO=y CONFIG_SYS_I2C_DW=y CONFIG_DM_MMC=y +CONFIG_MMC_DW=y CONFIG_DM_ETH=y CONFIG_ETH_DESIGNWARE=y CONFIG_SYS_NS16550=y diff --git a/configs/socfpga_de1_soc_defconfig b/configs/socfpga_de1_soc_defconfig index d8a3b828bd..032deef497 100644 --- a/configs/socfpga_de1_soc_defconfig +++ b/configs/socfpga_de1_soc_defconfig @@ -40,6 +40,7 @@ CONFIG_DM_GPIO=y CONFIG_DWAPB_GPIO=y CONFIG_SYS_I2C_DW=y CONFIG_DM_MMC=y +CONFIG_MMC_DW=y CONFIG_DM_ETH=y CONFIG_ETH_DESIGNWARE=y CONFIG_SYS_NS16550=y diff --git a/configs/socfpga_mcvevk_defconfig b/configs/socfpga_mcvevk_defconfig index 5a5324681f..b16ee1c06a 100644 --- a/configs/socfpga_mcvevk_defconfig +++ b/configs/socfpga_mcvevk_defconfig @@ -42,6 +42,7 @@ CONFIG_DM_GPIO=y CONFIG_DWAPB_GPIO=y CONFIG_SYS_I2C_DW=y CONFIG_DM_MMC=y +CONFIG_MMC_DW=y CONFIG_DM_ETH=y CONFIG_ETH_DESIGNWARE=y CONFIG_SYS_NS16550=y diff --git a/configs/socfpga_sockit_defconfig b/configs/socfpga_sockit_defconfig index 9450d214f8..d0c2bda18f 100644 --- a/configs/socfpga_sockit_defconfig +++ b/configs/socfpga_sockit_defconfig @@ -43,6 +43,7 @@ CONFIG_DM_GPIO=y CONFIG_DWAPB_GPIO=y CONFIG_SYS_I2C_DW=y CONFIG_DM_MMC=y +CONFIG_MMC_DW=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_SPANSION=y diff --git a/configs/socfpga_socrates_defconfig b/configs/socfpga_socrates_defconfig index 84a889035a..e9276f90af 100644 --- a/configs/socfpga_socrates_defconfig +++ b/configs/socfpga_socrates_defconfig @@ -44,6 +44,7 @@ CONFIG_DM_GPIO=y CONFIG_DWAPB_GPIO=y CONFIG_SYS_I2C_DW=y CONFIG_DM_MMC=y +CONFIG_MMC_DW=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_SPANSION=y diff --git a/configs/socfpga_sr1500_defconfig b/configs/socfpga_sr1500_defconfig index 641dd4dc57..6fd7bc0846 100644 --- a/configs/socfpga_sr1500_defconfig +++ b/configs/socfpga_sr1500_defconfig @@ -42,6 +42,7 @@ CONFIG_DM_GPIO=y CONFIG_DWAPB_GPIO=y CONFIG_SYS_I2C_DW=y CONFIG_DM_MMC=y +CONFIG_MMC_DW=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/configs/socfpga_vining_fpga_defconfig b/configs/socfpga_vining_fpga_defconfig index 608cdf8ebb..f01b56921b 100644 --- a/configs/socfpga_vining_fpga_defconfig +++ b/configs/socfpga_vining_fpga_defconfig @@ -47,6 +47,7 @@ CONFIG_DFU_SF=y CONFIG_DM_GPIO=y CONFIG_DWAPB_GPIO=y CONFIG_DM_MMC=y +CONFIG_MMC_DW=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SPANSION=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/configs/spring_defconfig b/configs/spring_defconfig index 4a782c80da..3bd8644276 100644 --- a/configs/spring_defconfig +++ b/configs/spring_defconfig @@ -33,6 +33,7 @@ CONFIG_I2C_ARB_GPIO_CHALLENGE=y CONFIG_CROS_EC_KEYB=y CONFIG_CROS_EC=y CONFIG_CROS_EC_I2C=y +CONFIG_MMC_DW=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_S5P=y CONFIG_SPI_FLASH=y diff --git a/configs/trats2_defconfig b/configs/trats2_defconfig index 9e8820167d..984ef06f84 100644 --- a/configs/trats2_defconfig +++ b/configs/trats2_defconfig @@ -32,6 +32,7 @@ CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_OF_CONTROL=y CONFIG_DFU_MMC=y +CONFIG_MMC_DW=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_SDMA=y CONFIG_MMC_SDHCI_S5P=y diff --git a/configs/trats_defconfig b/configs/trats_defconfig index 92cf3f7ae0..15737d1f75 100644 --- a/configs/trats_defconfig +++ b/configs/trats_defconfig @@ -31,6 +31,7 @@ CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_OF_CONTROL=y CONFIG_DFU_MMC=y +CONFIG_MMC_DW=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_SDMA=y CONFIG_MMC_SDHCI_S5P=y diff --git a/doc/README.socfpga b/doc/README.socfpga index 92942c940b..e61bfefa70 100644 --- a/doc/README.socfpga +++ b/doc/README.socfpga @@ -20,8 +20,5 @@ controller support within SOCFPGA #define CONFIG_SYS_MMC_MAX_BLK_COUNT 256 -> Using smaller max blk cnt to avoid flooding the limited stack in OCRAM -#define CONFIG_DWMMC --> Enable the common DesignWare SDMMC controller framework - #define CONFIG_SOCFPGA_DWMMC -> Enable the SOCFPGA specific driver for DesignWare SDMMC controller diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig index e1f8f9dacf..44f58b4202 100644 --- a/drivers/mmc/Kconfig +++ b/drivers/mmc/Kconfig @@ -68,9 +68,17 @@ config ATMEL_SDHCI It is compliant with the SD Host Controller Standard V3.0 specification. +config MMC_DW + bool "Synopsys DesignWare Memory Card Interface" + help + This selects support for the Synopsys DesignWare Mobile Storage IP + block, this provides host support for SD and MMC interfaces, in both + PIO, internal DMA mode and external DMA mode. + config MMC_DW_ROCKCHIP bool "Rockchip SD/MMC controller support" depends on DM_MMC && OF_CONTROL + depends on MMC_DW help This enables support for the Rockchip SD/MMM controller, which is based on Designware IP. The device is compatible with at least diff --git a/drivers/mmc/Makefile b/drivers/mmc/Makefile index f652baf984..1c51a7a998 100644 --- a/drivers/mmc/Makefile +++ b/drivers/mmc/Makefile @@ -17,7 +17,7 @@ obj-$(CONFIG_ARM_PL180_MMCI) += arm_pl180_mmci.o obj-$(CONFIG_ATMEL_SDHCI) += atmel_sdhci.o obj-$(CONFIG_BFIN_SDH) += bfin_sdh.o obj-$(CONFIG_DAVINCI_MMC) += davinci_mmc.o -obj-$(CONFIG_DWMMC) += dw_mmc.o +obj-$(CONFIG_MMC_DW) += dw_mmc.o obj-$(CONFIG_EXYNOS_DWMMC) += exynos_dw_mmc.o obj-$(CONFIG_HIKEY_DWMMC) += hi6220_dw_mmc.o obj-$(CONFIG_FSL_ESDHC) += fsl_esdhc.o diff --git a/include/configs/axs10x.h b/include/configs/axs10x.h index 296fbd1264..2dd9d31295 100644 --- a/include/configs/axs10x.h +++ b/include/configs/axs10x.h @@ -86,7 +86,6 @@ * SD/MMC configuration */ #define CONFIG_GENERIC_MMC -#define CONFIG_DWMMC #define CONFIG_DOS_PARTITION /* diff --git a/include/configs/exynos-common.h b/include/configs/exynos-common.h index 9328a222fe..0105f4a39c 100644 --- a/include/configs/exynos-common.h +++ b/include/configs/exynos-common.h @@ -39,7 +39,6 @@ /* SD/MMC configuration */ #define CONFIG_GENERIC_MMC -#define CONFIG_DWMMC #define CONFIG_EXYNOS_DWMMC #define CONFIG_BOUNCE_BUFFER diff --git a/include/configs/hikey.h b/include/configs/hikey.h index c725833675..242ed53548 100644 --- a/include/configs/hikey.h +++ b/include/configs/hikey.h @@ -72,7 +72,6 @@ /* SD/MMC configuration */ #define CONFIG_GENERIC_MMC -#define CONFIG_DWMMC #define CONFIG_HIKEY_DWMMC #define CONFIG_BOUNCE_BUFFER diff --git a/include/configs/rk3036_common.h b/include/configs/rk3036_common.h index 27dfbcef66..1fd33a067a 100644 --- a/include/configs/rk3036_common.h +++ b/include/configs/rk3036_common.h @@ -38,7 +38,6 @@ /* MMC/SD IP block */ #define CONFIG_GENERIC_MMC -#define CONFIG_DWMMC #define CONFIG_BOUNCE_BUFFER #define CONFIG_FAT_WRITE diff --git a/include/configs/rk3288_common.h b/include/configs/rk3288_common.h index 535797a72d..a9995ee190 100644 --- a/include/configs/rk3288_common.h +++ b/include/configs/rk3288_common.h @@ -41,7 +41,6 @@ /* MMC/SD IP block */ #define CONFIG_GENERIC_MMC -#define CONFIG_DWMMC #define CONFIG_BOUNCE_BUFFER #define CONFIG_FAT_WRITE diff --git a/include/configs/rk3399_common.h b/include/configs/rk3399_common.h index eab3f045ac..db0657b19d 100644 --- a/include/configs/rk3399_common.h +++ b/include/configs/rk3399_common.h @@ -28,7 +28,6 @@ /* MMC/SD IP block */ #define CONFIG_GENERIC_MMC -#define CONFIG_DWMMC #define CONFIG_BOUNCE_BUFFER #define CONFIG_ROCKCHIP_SDHCI_MAX_FREQ 200000000 diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h index dda1159cd7..0dde8c90b5 100644 --- a/include/configs/socfpga_common.h +++ b/include/configs/socfpga_common.h @@ -144,7 +144,6 @@ #ifdef CONFIG_CMD_MMC #define CONFIG_BOUNCE_BUFFER #define CONFIG_GENERIC_MMC -#define CONFIG_DWMMC #define CONFIG_SOCFPGA_DWMMC /* FIXME */ /* using smaller max blk cnt to avoid flooding the limited stack we have */ -- 2.25.1