From ebce73f0afe6efe926328c10316e54f3e43a33a1 Mon Sep 17 00:00:00 2001 From: Rick Chen Date: Tue, 20 Mar 2018 14:06:38 +0800 Subject: Drop CONFIG_FTSDC010_BASE After drop non-dm code of ftsdc010, the sd register base definition can be droppped now. So CONFIG_FTSDC010_BASE and CONFIG_FTSDC010_BASE_LIST both can be removed from config_whitelist.txt Signed-off-by: Rick Chen Signed-off-by: Rick Chen Cc: Greentime Hu --- scripts/config_whitelist.txt | 2 -- 1 file changed, 2 deletions(-) (limited to 'scripts') diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 0c7db05274f..a90a8dc9f81 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -741,8 +741,6 @@ CONFIG_FTPWM010_BASE CONFIG_FTRTC010_BASE CONFIG_FTRTC010_EXTCLK CONFIG_FTRTC010_PCLK -CONFIG_FTSDC010_BASE -CONFIG_FTSDC010_BASE_LIST CONFIG_FTSDC010_NUMBER CONFIG_FTSDC010_SDIO CONFIG_FTSDMC021 -- cgit v1.3.1 From 88a0b7694ffb69b1d1ff55d5f75a26722a86748a Mon Sep 17 00:00:00 2001 From: Rick Chen Date: Tue, 20 Mar 2018 15:03:40 +0800 Subject: Drop CONFIG_FTSDC010_NUMBER CONFIG_FTSDC010_NUMBER was not used anymore, can be removed now. So CONFIG_FTSDC010_NUMBER can also be removed from config_whitelist.txt. Signed-off-by: Rick Chen Signed-off-by: Rick Chen Cc: Greentime Hu --- include/configs/adp-ae3xx.h | 1 - include/configs/adp-ag101p.h | 1 - include/configs/nx25-ae250.h | 1 - scripts/config_whitelist.txt | 1 - 4 files changed, 4 deletions(-) (limited to 'scripts') diff --git a/include/configs/adp-ae3xx.h b/include/configs/adp-ae3xx.h index f5a8dec24a3..2ee808d08c8 100644 --- a/include/configs/adp-ae3xx.h +++ b/include/configs/adp-ae3xx.h @@ -83,7 +83,6 @@ /* * SD (MMC) controller */ -#define CONFIG_FTSDC010_NUMBER 1 #define CONFIG_FTSDC010_SDIO /* diff --git a/include/configs/adp-ag101p.h b/include/configs/adp-ag101p.h index 6ae6fb45450..499a424d8ae 100644 --- a/include/configs/adp-ag101p.h +++ b/include/configs/adp-ag101p.h @@ -85,7 +85,6 @@ /* * SD (MMC) controller */ -#define CONFIG_FTSDC010_NUMBER 1 #define CONFIG_FTSDC010_SDIO /* diff --git a/include/configs/nx25-ae250.h b/include/configs/nx25-ae250.h index 73c3c33ffa5..f3e65e37a6c 100644 --- a/include/configs/nx25-ae250.h +++ b/include/configs/nx25-ae250.h @@ -73,7 +73,6 @@ /* * SD (MMC) controller */ -#define CONFIG_FTSDC010_NUMBER 1 #define CONFIG_FTSDC010_SDIO /* Init Stack Pointer */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index a90a8dc9f81..46b7f292c00 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -741,7 +741,6 @@ CONFIG_FTPWM010_BASE CONFIG_FTRTC010_BASE CONFIG_FTRTC010_EXTCLK CONFIG_FTRTC010_PCLK -CONFIG_FTSDC010_NUMBER CONFIG_FTSDC010_SDIO CONFIG_FTSDMC021 CONFIG_FTSDMC021_BASE -- cgit v1.3.1 From 095c9f35d5a04ed0907624479f702f6fce7591bb Mon Sep 17 00:00:00 2001 From: Rick Chen Date: Tue, 20 Mar 2018 15:10:49 +0800 Subject: mmc: ftsdc010: Migrate CONFIG_FTSDC010_SDIO to Kconfig Convert CONFIG_FTSDC010_SDIO to Kconfig. So CONFIG_FTSDC010_SDIO can also be removed from config_whitelist.txt. Signed-off-by: Rick Chen Signed-off-by: Rick Chen Cc: Greentime Hu --- configs/adp-ae3xx_defconfig | 1 + configs/adp-ag101p_defconfig | 1 + configs/nx25-ae250_defconfig | 1 + drivers/mmc/Kconfig | 7 +++++++ include/configs/adp-ae3xx.h | 5 ----- include/configs/adp-ag101p.h | 5 ----- include/configs/nx25-ae250.h | 5 ----- scripts/config_whitelist.txt | 1 - 8 files changed, 10 insertions(+), 16 deletions(-) (limited to 'scripts') diff --git a/configs/adp-ae3xx_defconfig b/configs/adp-ae3xx_defconfig index f3eabea70e5..43515241c0e 100644 --- a/configs/adp-ae3xx_defconfig +++ b/configs/adp-ae3xx_defconfig @@ -26,6 +26,7 @@ CONFIG_MMC=y CONFIG_DM_MMC=y CONFIG_MMC_NDS32=y CONFIG_FTSDC010=y +CONFIG_FTSDC010_SDIO=y CONFIG_MTD=y CONFIG_MTD_NOR_FLASH=y CONFIG_CFI_FLASH=y diff --git a/configs/adp-ag101p_defconfig b/configs/adp-ag101p_defconfig index 742d9046ad0..05a5e2817e0 100644 --- a/configs/adp-ag101p_defconfig +++ b/configs/adp-ag101p_defconfig @@ -23,6 +23,7 @@ CONFIG_MMC=y CONFIG_DM_MMC=y CONFIG_MMC_NDS32=y CONFIG_FTSDC010=y +CONFIG_FTSDC010_SDIO=y CONFIG_MTD_NOR_FLASH=y CONFIG_DM_ETH=y CONFIG_FTMAC100=y diff --git a/configs/nx25-ae250_defconfig b/configs/nx25-ae250_defconfig index 47b83db5eae..ab889101cdf 100644 --- a/configs/nx25-ae250_defconfig +++ b/configs/nx25-ae250_defconfig @@ -24,6 +24,7 @@ CONFIG_MMC=y CONFIG_DM_MMC=y CONFIG_MMC_NDS32=y CONFIG_FTSDC010=y +CONFIG_FTSDC010_SDIO=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_MACRONIX=y diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig index 5f67e336dba..ff987ed8036 100644 --- a/drivers/mmc/Kconfig +++ b/drivers/mmc/Kconfig @@ -535,6 +535,13 @@ config FTSDC010 help This SD/MMC controller is present in Andestech SoCs which is based on Faraday IP. +config FTSDC010_SDIO + bool "Support ftsdc010 sdio" + default n + depends on FTSDC010 + help + This can enable ftsdc010 sdio function. + endif config TEGRA124_MMC_DISABLE_EXT_LOOPBACK diff --git a/include/configs/adp-ae3xx.h b/include/configs/adp-ae3xx.h index 2ee808d08c8..1ebbc4c9e25 100644 --- a/include/configs/adp-ae3xx.h +++ b/include/configs/adp-ae3xx.h @@ -80,11 +80,6 @@ #endif #define CONFIG_SYS_NS16550_CLK ((18432000 * 20) / 25) /* AG101P */ -/* - * SD (MMC) controller - */ -#define CONFIG_FTSDC010_SDIO - /* * Miscellaneous configurable options */ diff --git a/include/configs/adp-ag101p.h b/include/configs/adp-ag101p.h index 499a424d8ae..ff365c464e5 100644 --- a/include/configs/adp-ag101p.h +++ b/include/configs/adp-ag101p.h @@ -82,11 +82,6 @@ #endif #define CONFIG_SYS_NS16550_CLK ((18432000 * 20) / 25) /* AG101P */ -/* - * SD (MMC) controller - */ -#define CONFIG_FTSDC010_SDIO - /* * Miscellaneous configurable options */ diff --git a/include/configs/nx25-ae250.h b/include/configs/nx25-ae250.h index f3e65e37a6c..3c888fdd50d 100644 --- a/include/configs/nx25-ae250.h +++ b/include/configs/nx25-ae250.h @@ -70,11 +70,6 @@ #endif #define CONFIG_SYS_NS16550_CLK 19660800 -/* - * SD (MMC) controller - */ -#define CONFIG_FTSDC010_SDIO - /* Init Stack Pointer */ #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + 0x1000000 - \ GENERATED_GBL_DATA_SIZE) diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 46b7f292c00..2c26d34ce4f 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -741,7 +741,6 @@ CONFIG_FTPWM010_BASE CONFIG_FTRTC010_BASE CONFIG_FTRTC010_EXTCLK CONFIG_FTRTC010_PCLK -CONFIG_FTSDC010_SDIO CONFIG_FTSDMC021 CONFIG_FTSDMC021_BASE CONFIG_FTSMC020 -- cgit v1.3.1