sunxi: remove CONFIG_MMC?_CD_PIN
cover sunxi: remove CONFIG_MMC?_CD_PIN
Since the dawn of time we had CONFIG_MMC?_CD_PIN defines for each Allwinner board, which held the name for the respective MMC card detect GPIO. These days we don't use that in U-Boot proper anymore (and rely on DT for that, instead), so it's just for the SPL loading. However the card detect is actually not needed there:
- We continue loading from the same boot media that the BootROM booted us from, so when we get to load from MMC, there is surely a card in the slot.
- The BROM already spoiled all efforts by unconditionally accessing the MMC bus, regardless of any card presence or not. We can't do more harm by doing the same.
This series removes the code checking the CD pin, and also the definition from Kconfig and all defconfigs. On top there is a cleanup for the MMC driver, which explains the reason for still also implementing the legacy MMC interface.
Please have a look and test!
Thanks,
Andre
Andre Przywara (3):
sunxi: mmc: ignore card detect in SPL
sunxi: mmc: group non-DM specific functions
sunxi: remove CONFIG_MMC?_CD_PIN
arch/arm/mach-sunxi/Kconfig | 27 ---- configs/A10-OLinuXino-Lime_defconfig | 1 - configs/A10s-OLinuXino-M_defconfig | 2 - configs/A13-OLinuXinoM_defconfig | 1 - configs/A13-OLinuXino_defconfig | 1 - configs/A20-OLinuXino-Lime2-eMMC_defconfig | 1 - configs/A20-OLinuXino-Lime2_defconfig | 1 - configs/A20-OLinuXino-Lime_defconfig | 1 - configs/A20-OLinuXino_MICRO-eMMC_defconfig | 1 - configs/A20-OLinuXino_MICRO_defconfig | 2 - configs/A20-Olimex-SOM-EVB_defconfig | 2 - configs/A20-Olimex-SOM204-EVB-eMMC_defconfig | 1 - configs/A20-Olimex-SOM204-EVB_defconfig | 1 - configs/A33-OLinuXino_defconfig | 1 - configs/Ainol_AW1_defconfig | 1 - configs/Ampe_A76_defconfig | 1 - configs/Bananapi_M2_Ultra_defconfig | 1 - configs/Bananapi_m2m_defconfig | 1 - configs/Cubieboard2_defconfig | 1 - configs/Cubieboard4_defconfig | 1 - configs/Cubieboard_defconfig | 1 - configs/Cubietruck_defconfig | 1 - configs/Empire_electronix_d709_defconfig | 1 - configs/Empire_electronix_m712_defconfig | 1 - configs/Itead_Ibox_A20_defconfig | 1 - configs/Lamobo_R1_defconfig | 1 - configs/Mele_M3_defconfig | 1 - configs/Mele_M5_defconfig | 1 - configs/Merrii_A80_Optimus_defconfig | 1 - configs/Orangepi_mini_defconfig | 2 - configs/Sinlinx_SinA31s_defconfig | 1 - configs/Sinlinx_SinA33_defconfig | 1 - configs/Sunchip_CX-A99_defconfig | 1 - configs/UTOO_P66_defconfig | 1 - configs/Wobo_i5_defconfig | 1 - configs/Yones_Toptech_BD1078_defconfig | 2 - configs/Yones_Toptech_BS1078_V2_defconfig | 1 - configs/bananapi_m2_berry_defconfig | 1 - configs/bananapi_m2_zero_defconfig | 1 - configs/bananapi_m64_defconfig | 1 - configs/beelink_gs1_defconfig | 1 - configs/colorfly_e708_q1_defconfig | 1 - configs/difrnce_dit4350_defconfig | 1 - configs/dserve_dsrv9703c_defconfig | 1 - configs/gt90h_v4_defconfig | 1 - configs/iNet_3F_defconfig | 1 - configs/iNet_3W_defconfig | 1 - configs/iNet_D978_rev2_defconfig | 1 - configs/icnova-a20-swac_defconfig | 1 - configs/inet86dz_defconfig | 1 - configs/inet98v_rev2_defconfig | 1 - configs/inet_q972_defconfig | 1 - configs/nanopi_m1_plus_defconfig | 1 - configs/oceanic_5205_5inmfd_defconfig | 1 - configs/orangepi_3_defconfig | 1 - configs/orangepi_lite2_defconfig | 1 - configs/orangepi_one_plus_defconfig | 1 - configs/orangepi_zero2_defconfig | 1 - configs/orangepi_zero_plus2_defconfig | 1 - configs/orangepi_zero_plus2_h3_defconfig | 1 - configs/parrot_r16_defconfig | 1 - configs/pine64-lts_defconfig | 1 - configs/pine_h64_defconfig | 1 - configs/polaroid_mid2407pxe03_defconfig | 1 - configs/polaroid_mid2809pxe04_defconfig | 1 - configs/q8_a13_tablet_defconfig | 1 - configs/q8_a23_tablet_800x480_defconfig | 1 - configs/q8_a33_tablet_1024x600_defconfig | 1 - configs/q8_a33_tablet_800x480_defconfig | 1 - configs/sopine_baseboard_defconfig | 1 - configs/tanix_tx6_defconfig | 1 - drivers/mmc/sunxi_mmc.c | 152 ++++++++----------- 72 files changed, 62 insertions(+), 192 deletions(-)
Signature · 1 line
2.25.1
PATCH 1/3 sunxi: mmc: ignore card detect in SPL
The sunxi MMC code does not use the DM in the SPL, as we don't have a device tree available that early, also no space for it.
This also means we cannot access the card-detect GPIO information from there, so we have Kconfig symbols called CONFIG_MMCx_CD_PIN, which each board has to define. This is a burden, also requires extra GPIO code in the SPL.
As the SPL is the natural successor of the BootROM (from which we are loaded), we can actually ignore the CD pin completely, as this is what the BootROM does as well: CD GPIOs are board specific, but the BootROM is not, so accesses the MMC devices anyway.
Remove the card detect code from the non-DM implementation of the sunxi MMC driver, to get rid of this unneeded code.
--- drivers/mmc/sunxi_mmc.c | 37 ++----------------------------------- 1 file changed, 2 insertions(+), 35 deletions(-)
drivers/mmc/sunxi_mmc.c +2 -35
@@ -44,22 +44,10 @@ struct sunxi_mmc_priv {/* support 4 mmc hosts */ struct sunxi_mmc_priv mmc_host[4 ]; -static int sunxi_mmc_getcd_gpio (int sdc_no) -{ -switch (sdc_no) { -case 0 :return sunxi_name_to_gpio (CONFIG_MMC0_CD_PIN ); -case 1 :return sunxi_name_to_gpio (CONFIG_MMC1_CD_PIN ); -case 2 :return sunxi_name_to_gpio (CONFIG_MMC2_CD_PIN ); -case 3 :return sunxi_name_to_gpio (CONFIG_MMC3_CD_PIN ); - } -return -EINVAL ; -} -static int mmc_resource_init (int sdc_no) {struct sunxi_mmc_priv *priv = &mmc_host[sdc_no];struct sunxi_ccm_reg *ccm = (struct sunxi_ccm_reg *)SUNXI_CCM_BASE ; -int cd_pin, ret =0 ;debug ("init mmc %d resource\n" , sdc_no);
@@ -90,16 +78,7 @@ static int mmc_resource_init(int sdc_no) } priv->mmc_no = sdc_no; - cd_pin =sunxi_mmc_getcd_gpio (sdc_no); -if (cd_pin >=0 ) { - ret =gpio_request (cd_pin,"mmc_cd" ); -if (!ret) { -sunxi_gpio_set_pull (cd_pin,SUNXI_GPIO_PULL_UP ); - ret =gpio_direction_input (cd_pin); - } - } - -return ret; +return 0 ; }#endif
@@ -523,23 +502,11 @@ static int sunxi_mmc_send_cmd_legacy(struct mmc *mmc, struct mmc_cmd *cmd,return sunxi_mmc_send_cmd_common (priv, mmc, cmd, data); } -static int sunxi_mmc_getcd_legacy (struct mmc *mmc) -{ -struct sunxi_mmc_priv *priv = mmc->priv; -int cd_pin; - - cd_pin =sunxi_mmc_getcd_gpio (priv->mmc_no); -if (cd_pin <0 ) -return 1 ; - -return !gpio_get_value (cd_pin); -} - +/* .get_cd is not needed by the SPL */ static const struct mmc_ops sunxi_mmc_ops = { .send_cmd = sunxi_mmc_send_cmd_legacy, .set_ios = sunxi_mmc_set_ios_legacy, .init = sunxi_mmc_core_init, - .getcd = sunxi_mmc_getcd_legacy, };struct mmc *sunxi_mmc_init (int sdc_no)
Signature · 1 line
2.25.1
Re: [PATCH 1/3] sunxi: mmc: ignore card detect in SPL
Hi Andre,
Thanks for helping to get rid of sunxi_name_to_gpio().
Quoted 10 lines · Andre Przywara
The sunxi MMC code does not use the DM in the SPL, as we don't have a device tree available that early, also no space for it.
This also means we cannot access the card-detect GPIO information from there, so we haveKconfigsymbols calledCONFIG_MMCx_CD_PIN, which each board has to define. This is a burden, also requires extra GPIO code in the SPL.
As the SPL is the natural successor of the BootROM (from which we are loaded), we can actually ignore the CD pin completely, as this is what the BootROM does as well: CD GPIOs are board specific, but the BootROM is not, so accesses the MMC devices anyway.
The card detection logic is useless for an even simpler reason: because of our spl_boot_device() implementation, SPL only accesses the MMC interface where SPL itself was originally read from. Therefore, it must have a card inserted.
Quoted 60 lines
Remove the card detect code from the non-DM implementation of the sunxi MMC driver, to get rid of this unneeded code.
Signed-off-by Andre Przywara <[email protected]>--- drivers/mmc/sunxi_mmc.c | 37 ++----------------------------------- 1 file changed, 2 insertions(+), 35 deletions(-)drivers/mmc/sunxi_mmc.c +1
-25@@ -44,22 +44,10 @@ struct sunxi_mmc_priv {/* support 4 mmc hosts */ struct sunxi_mmc_priv mmc_host[4 ]; -static int sunxi_mmc_getcd_gpio (int sdc_no) -{ -switch (sdc_no) { -case 0 :return sunxi_name_to_gpio (CONFIG_MMC0_CD_PIN ); -case 1 :return sunxi_name_to_gpio (CONFIG_MMC1_CD_PIN ); -case 2 :return sunxi_name_to_gpio (CONFIG_MMC2_CD_PIN ); -case 3 :return sunxi_name_to_gpio (CONFIG_MMC3_CD_PIN ); - } -return -EINVAL ; -} -static int mmc_resource_init (int sdc_no) {struct sunxi_mmc_priv *priv = &mmc_host[sdc_no];struct sunxi_ccm_reg *ccm = (struct sunxi_ccm_reg *)SUNXI_CCM_BASE ; -int cd_pin, ret =0 ;debug ("init mmc %d resource\n" , sdc_no);@@ -90,16 +78,7 @@ static int mmc_resource_init(int sdc_no) } priv->mmc_no = sdc_no; - cd_pin =sunxi_mmc_getcd_gpio (sdc_no); -if (cd_pin >=0 ) { - ret =gpio_request (cd_pin,"mmc_cd" ); -if (!ret) { -sunxi_gpio_set_pull (cd_pin,SUNXI_GPIO_PULL_UP ); - ret =gpio_direction_input (cd_pin); - } - } - -return ret; +return 0 ; }#endif @@ -523,23 +502,11 @@ static int sunxi_mmc_send_cmd_legacy(struct mmc *mmc, struct mmc_cmd *cmd,return sunxi_mmc_send_cmd_common (priv, mmc, cmd, data); } -static int sunxi_mmc_getcd_legacy (struct mmc *mmc) -{ -struct sunxi_mmc_priv *priv = mmc->priv;
drivers/mmc/sunxi_mmc.c static int sunxi_mmc_send_cmd_legacy(struct mmc *mmc, struct mmc_cmd *cmd, · line 505
Quoted 10 lines
drivers/mmc/sunxi_mmc.c +1
-9-int cd_pin; - - cd_pin =sunxi_mmc_getcd_gpio (priv->mmc_no); -if (cd_pin <0 ) -return 1 ; - -return !gpio_get_value (cd_pin); -} - +/* .get_cd is not needed by the SPL */
nit: s/get_cd/getcd/
Quoted 8 lines
drivers/mmc/sunxi_mmc.c +0
-1static const struct mmc_ops sunxi_mmc_ops = { .send_cmd = sunxi_mmc_send_cmd_legacy, .set_ios = sunxi_mmc_set_ios_legacy, .init = sunxi_mmc_core_init, - .getcd = sunxi_mmc_getcd_legacy, };struct mmc *sunxi_mmc_init (int sdc_no)
Re: [PATCH 1/3] sunxi: mmc: ignore card detect in SPL
On Sun, 8 Jan 2023 15:00:29 -0600
Samuel Holland <[email protected]> wrote:
Hi Samuel,
Quoted 1 line
Thanks for helping to get rid of
sunxi_name_to_gpio().
many thanks for the review, that's much appreciated.
Quoted 13 lines · Andre Przywara
Quoted 10 lines
The sunxi MMC code does not use the DM in the SPL, as we don't have a device tree available that early, also no space for it.
This also means we cannot access the card-detect GPIO information from there, so we haveKconfigsymbols calledCONFIG_MMCx_CD_PIN, which each board has to define. This is a burden, also requires extra GPIO code in the SPL.
As the SPL is the natural successor of the BootROM (from which we are loaded), we can actually ignore the CD pin completely, as this is what the BootROM does as well: CD GPIOs are board specific, but the BootROM is not, so accesses the MMC devices anyway.
Quoted 4 lines
The card detection logic is useless for an even simpler reason: because of our
spl_boot_device()implementation, SPL only accesses the MMC interface where SPL itself was originally read from. Therefore, it must have a card inserted.
Indeed, I thought I mentioned this as well, but didn't. I added a sentence to that effect to the commit message (and removed the underscore in the comment below).
Cheers,
Andre
Quoted 87 lines
Quoted 61 lines
Remove the card detect code from the non-DM implementation of the sunxi MMC driver, to get rid of this unneeded code.
Signed-off-by Andre Przywara <[email protected]>--- drivers/mmc/sunxi_mmc.c | 37 ++----------------------------------- 1 file changed, 2 insertions(+), 35 deletions(-)drivers/mmc/sunxi_mmc.c +1
-25@@ -44,22 +44,10 @@ struct sunxi_mmc_priv {/* support 4 mmc hosts */ struct sunxi_mmc_priv mmc_host[4 ]; -static int sunxi_mmc_getcd_gpio (int sdc_no) -{ -switch (sdc_no) { -case 0 :return sunxi_name_to_gpio (CONFIG_MMC0_CD_PIN ); -case 1 :return sunxi_name_to_gpio (CONFIG_MMC1_CD_PIN ); -case 2 :return sunxi_name_to_gpio (CONFIG_MMC2_CD_PIN ); -case 3 :return sunxi_name_to_gpio (CONFIG_MMC3_CD_PIN ); - } -return -EINVAL ; -} -static int mmc_resource_init (int sdc_no) {struct sunxi_mmc_priv *priv = &mmc_host[sdc_no];struct sunxi_ccm_reg *ccm = (struct sunxi_ccm_reg *)SUNXI_CCM_BASE ; -int cd_pin, ret =0 ;debug ("init mmc %d resource\n" , sdc_no);@@ -90,16 +78,7 @@ static int mmc_resource_init(int sdc_no) } priv->mmc_no = sdc_no; - cd_pin =sunxi_mmc_getcd_gpio (sdc_no); -if (cd_pin >=0 ) { - ret =gpio_request (cd_pin,"mmc_cd" ); -if (!ret) { -sunxi_gpio_set_pull (cd_pin,SUNXI_GPIO_PULL_UP ); - ret =gpio_direction_input (cd_pin); - } - } - -return ret; +return 0 ; }#endif @@ -523,23 +502,11 @@ static int sunxi_mmc_send_cmd_legacy(struct mmc *mmc, struct mmc_cmd *cmd,return sunxi_mmc_send_cmd_common (priv, mmc, cmd, data); } -static int sunxi_mmc_getcd_legacy (struct mmc *mmc) -{ -struct sunxi_mmc_priv *priv = mmc->priv;drivers/mmc/sunxi_mmc.c static int sunxi_mmc_send_cmd_legacy(struct mmc *mmc, struct mmc_cmd *cmd, · line 505
Quoted 10 lines
drivers/mmc/sunxi_mmc.c +1
-9-int cd_pin; - - cd_pin =sunxi_mmc_getcd_gpio (priv->mmc_no); -if (cd_pin <0 ) -return 1 ; - -return !gpio_get_value (cd_pin); -} - +/* .get_cd is not needed by the SPL */ nit: s/get_cd/getcd/
Reviewed-by Samuel Holland <[email protected]>Tested-by Samuel Holland <[email protected]>Quoted 8 lines
drivers/mmc/sunxi_mmc.c +0
-1static const struct mmc_ops sunxi_mmc_ops = { .send_cmd = sunxi_mmc_send_cmd_legacy, .set_ios = sunxi_mmc_set_ios_legacy, .init = sunxi_mmc_core_init, - .getcd = sunxi_mmc_getcd_legacy, };struct mmc *sunxi_mmc_init (int sdc_no)
PATCH 2/3 sunxi: mmc: group non-DM specific functions
In reply to Andre PrzywaraAs the SPL code for sunxi boards does not use the driver model, we have two mmc_ops structures, one for DM, one for non-DM. The actual hardware access code is shared, with the respective callback functions using that common code.
To make this more obvious and easier to read, reorder the functions to group them: we first have the common code, then the non-DM bits, and the proper DM implementation at the end.
Also document this structure in the comment at the beginning of the file.
No functional change intended.
--- drivers/mmc/sunxi_mmc.c | 117 +++++++++++++++++++++------------------- 1 file changed, 61 insertions(+), 56 deletions(-)
drivers/mmc/sunxi_mmc.c +61 -56
@@ -5,6 +5,12 @@* Aaron <[email protected]> * * MMC driver for allwinner sunxi platform. +* +* This driver is used by the (ARM) SPL with the legacy MMC interface, and +* by U-Boot proper using the full DM interface. The actual hardware access +* code is common, and comes first in this file. +* The legacy MMC interface implementation comes next, followed by the +* proper DM_MMC implementation at the end. */ #include <common.h>
@@ -40,48 +46,6 @@ struct sunxi_mmc_priv {struct mmc_config cfg; }; -#if !CONFIG_IS_ENABLED (DM_MMC ) -/* support 4 mmc hosts */ -struct sunxi_mmc_priv mmc_host[4 ]; - -static int mmc_resource_init (int sdc_no) -{ -struct sunxi_mmc_priv *priv = &mmc_host[sdc_no]; -struct sunxi_ccm_reg *ccm = (struct sunxi_ccm_reg *)SUNXI_CCM_BASE ; - -debug ("init mmc %d resource\n" , sdc_no); - -switch (sdc_no) { -case 0 : - priv->reg = (struct sunxi_mmc *)SUNXI_MMC0_BASE ; - priv->mclkreg = &ccm->sd0_clk_cfg; -break ; -case 1 : - priv->reg = (struct sunxi_mmc *)SUNXI_MMC1_BASE ; - priv->mclkreg = &ccm->sd1_clk_cfg; -break ; -#ifdef SUNXI_MMC2_BASE -case 2 : - priv->reg = (struct sunxi_mmc *)SUNXI_MMC2_BASE ; - priv->mclkreg = &ccm->sd2_clk_cfg; -break ; -#endif -#ifdef SUNXI_MMC3_BASE -case 3 : - priv->reg = (struct sunxi_mmc *)SUNXI_MMC3_BASE ; - priv->mclkreg = &ccm->sd3_clk_cfg; -break ; -#endif -default : -printf ("Wrong mmc number %d\n" , sdc_no); -return -1 ; - } - priv->mmc_no = sdc_no; - -return 0 ; -} -#endif -/* * All A64 and later MMC controllers feature auto-calibration. This would * normally be detected via the compatible string, but we need something
@@ -269,19 +233,6 @@ static int sunxi_mmc_set_ios_common(struct sunxi_mmc_priv *priv,return 0 ; } -#if !CONFIG_IS_ENABLED (DM_MMC ) -static int sunxi_mmc_core_init (struct mmc *mmc) -{ -struct sunxi_mmc_priv *priv = mmc->priv; - -/* Reset controller */ -writel (SUNXI_MMC_GCTRL_RESET , &priv->reg->gctrl); -udelay (1000 ); - -return 0 ; -} -#endif -static int mmc_trans_data_by_cpu (struct sunxi_mmc_priv *priv,struct mmc *mmc,struct mmc_data *data) {
@@ -486,7 +437,60 @@ out:return error; } +/* non-DM code here is used by the (ARM) SPL only */ +#if !CONFIG_IS_ENABLED (DM_MMC ) +/* support 4 mmc hosts */ +struct sunxi_mmc_priv mmc_host[4 ]; + +static int mmc_resource_init (int sdc_no) +{ +struct sunxi_mmc_priv *priv = &mmc_host[sdc_no]; +struct sunxi_ccm_reg *ccm = (struct sunxi_ccm_reg *)SUNXI_CCM_BASE ; + +debug ("init mmc %d resource\n" , sdc_no); + +switch (sdc_no) { +case 0 : + priv->reg = (struct sunxi_mmc *)SUNXI_MMC0_BASE ; + priv->mclkreg = &ccm->sd0_clk_cfg; +break ; +case 1 : + priv->reg = (struct sunxi_mmc *)SUNXI_MMC1_BASE ; + priv->mclkreg = &ccm->sd1_clk_cfg; +break ; +#ifdef SUNXI_MMC2_BASE +case 2 : + priv->reg = (struct sunxi_mmc *)SUNXI_MMC2_BASE ; + priv->mclkreg = &ccm->sd2_clk_cfg; +break ; +#endif +#ifdef SUNXI_MMC3_BASE +case 3 : + priv->reg = (struct sunxi_mmc *)SUNXI_MMC3_BASE ; + priv->mclkreg = &ccm->sd3_clk_cfg; +break ; +#endif +default : +printf ("Wrong mmc number %d\n" , sdc_no); +return -1 ; + } + priv->mmc_no = sdc_no; + +return 0 ; +} + +static int sunxi_mmc_core_init (struct mmc *mmc) +{ +struct sunxi_mmc_priv *priv = mmc->priv; + +/* Reset controller */ +writel (SUNXI_MMC_GCTRL_RESET , &priv->reg->gctrl); +udelay (1000 ); + +return 0 ; +} +static int sunxi_mmc_set_ios_legacy (struct mmc *mmc) {struct sunxi_mmc_priv *priv = mmc->priv;
@@ -562,7 +566,8 @@ struct mmc *sunxi_mmc_init(int sdc_no) return mmc_create(cfg, priv); } -#else + +#else /* CONFIG_DM_MMC code below, as used by U-Boot proper */ static int sunxi_mmc_set_ios (struct udevice *dev) {
Signature · 1 line
2.25.1
Re: [PATCH 2/3] sunxi: mmc: group non-DM specific functions
Quoted 10 lines · Andre Przywara
As the SPL code for sunxi boards does not use the driver model, we have two
mmc_opsstructures, one for DM, one for non-DM. The actual hardware access code is shared, with the respective callback functions using that common code.To make this more obvious and easier to read, reorder the functions to group them: we first have the common code, then the non-DM bits, and the proper DM implementation at the end.
Also document this structure in the comment at the beginning of the file.
Quoted 6 lines
No functional change intended.
Signed-off-by Andre Przywara <[email protected]>--- drivers/mmc/sunxi_mmc.c | 117 +++++++++++++++++++++------------------- 1 file changed, 61 insertions(+), 56 deletions(-)
PATCH 3/3 sunxi: remove CONFIG_MMC?_CD_PIN
In reply to Andre PrzywaraFor legacy reasons we were defining the card detect GPIO for all sunxi boards in each board's defconfig.
There is actually no need for a card-detect check in the SPL code (which consequently has been removed already), and also in U-Boot proper we have DM code to query the CD GPIO name from the device tree.
That means we don't have any user of that information left, so can remove the definitions from the defconfigs.
--- arch/arm/mach-sunxi/Kconfig | 27 -------------------- configs/A10-OLinuXino-Lime_defconfig | 1 - configs/A10s-OLinuXino-M_defconfig | 2 -- configs/A13-OLinuXinoM_defconfig | 1 - configs/A13-OLinuXino_defconfig | 1 - configs/A20-OLinuXino-Lime2-eMMC_defconfig | 1 - configs/A20-OLinuXino-Lime2_defconfig | 1 - configs/A20-OLinuXino-Lime_defconfig | 1 - configs/A20-OLinuXino_MICRO-eMMC_defconfig | 1 - configs/A20-OLinuXino_MICRO_defconfig | 2 -- configs/A20-Olimex-SOM-EVB_defconfig | 2 -- configs/A20-Olimex-SOM204-EVB-eMMC_defconfig | 1 - configs/A20-Olimex-SOM204-EVB_defconfig | 1 - configs/A33-OLinuXino_defconfig | 1 - configs/Ainol_AW1_defconfig | 1 - configs/Ampe_A76_defconfig | 1 - configs/Bananapi_M2_Ultra_defconfig | 1 - configs/Bananapi_m2m_defconfig | 1 - configs/Cubieboard2_defconfig | 1 - configs/Cubieboard4_defconfig | 1 - configs/Cubieboard_defconfig | 1 - configs/Cubietruck_defconfig | 1 - configs/Empire_electronix_d709_defconfig | 1 - configs/Empire_electronix_m712_defconfig | 1 - configs/Itead_Ibox_A20_defconfig | 1 - configs/Lamobo_R1_defconfig | 1 - configs/Mele_M3_defconfig | 1 - configs/Mele_M5_defconfig | 1 - configs/Merrii_A80_Optimus_defconfig | 1 - configs/Orangepi_mini_defconfig | 2 -- configs/Sinlinx_SinA31s_defconfig | 1 - configs/Sinlinx_SinA33_defconfig | 1 - configs/Sunchip_CX-A99_defconfig | 1 - configs/UTOO_P66_defconfig | 1 - configs/Wobo_i5_defconfig | 1 - configs/Yones_Toptech_BD1078_defconfig | 2 -- configs/Yones_Toptech_BS1078_V2_defconfig | 1 - configs/bananapi_m2_berry_defconfig | 1 - configs/bananapi_m2_zero_defconfig | 1 - configs/bananapi_m64_defconfig | 1 - configs/beelink_gs1_defconfig | 1 - configs/colorfly_e708_q1_defconfig | 1 - configs/difrnce_dit4350_defconfig | 1 - configs/dserve_dsrv9703c_defconfig | 1 - configs/gt90h_v4_defconfig | 1 - configs/iNet_3F_defconfig | 1 - configs/iNet_3W_defconfig | 1 - configs/iNet_D978_rev2_defconfig | 1 - configs/icnova-a20-swac_defconfig | 1 - configs/inet86dz_defconfig | 1 - configs/inet98v_rev2_defconfig | 1 - configs/inet_q972_defconfig | 1 - configs/nanopi_m1_plus_defconfig | 1 - configs/oceanic_5205_5inmfd_defconfig | 1 - configs/orangepi_3_defconfig | 1 - configs/orangepi_lite2_defconfig | 1 - configs/orangepi_one_plus_defconfig | 1 - configs/orangepi_zero2_defconfig | 1 - configs/orangepi_zero_plus2_defconfig | 1 - configs/orangepi_zero_plus2_h3_defconfig | 1 - configs/parrot_r16_defconfig | 1 - configs/pine64-lts_defconfig | 1 - configs/pine_h64_defconfig | 1 - configs/polaroid_mid2407pxe03_defconfig | 1 - configs/polaroid_mid2809pxe04_defconfig | 1 - configs/q8_a13_tablet_defconfig | 1 - configs/q8_a23_tablet_800x480_defconfig | 1 - configs/q8_a33_tablet_1024x600_defconfig | 1 - configs/q8_a33_tablet_800x480_defconfig | 1 - configs/sopine_baseboard_defconfig | 1 - configs/tanix_tx6_defconfig | 1 - 71 files changed, 102 deletions(-)
arch/arm/mach-sunxi/Kconfig +0 -27
@@ -638,33 +638,6 @@ config MACPWR Set the pin used to power the MAC. This takes a string in the format understood by sunxi_name_to_gpio, e.g. PH1 for pin 1 of port H. -config MMC0_CD_PIN - string "Card detect pin for mmc0" - default "PF6" if MACH_SUN8I_A83T || MACH_SUNXI_H3_H5 || MACH_SUN50I - default "" - ---help--- - Set the card detect pin for mmc0, leave empty to not use cd. This - takes a string in the format understood by sunxi_name_to_gpio, e.g. - PH1 for pin 1 of port H. - -config MMC1_CD_PIN - string "Card detect pin for mmc1" - default "" - ---help--- - See MMC0_CD_PIN help text. - -config MMC2_CD_PIN - string "Card detect pin for mmc2" - default "" - ---help--- - See MMC0_CD_PIN help text. - -config MMC3_CD_PIN - string "Card detect pin for mmc3" - default "" - ---help--- - See MMC0_CD_PIN help text. - config MMC1_PINS_PH bool "Pins for mmc1 are on Port H" depends on MACH_SUN4I || MACH_SUN7I || MACH_SUN8I_R40
configs/A10-OLinuXino-Lime_defconfig +0 -1
@@ -6,7 +6,6 @@ CONFIG_MACH_SUN4I=y CONFIG_DRAM_CLK=480 CONFIG_DRAM_EMR1=4 CONFIG_SYS_CLK_FREQ=912000000 -CONFIG_MMC0_CD_PIN="PH1" CONFIG_I2C1_ENABLE=y CONFIG_SATAPWR="PC3" CONFIG_AHCI=y
configs/A10s-OLinuXino-M_defconfig +0 -2
@@ -4,8 +4,6 @@ CONFIG_DEFAULT_DEVICE_TREE="sun5i-a10s-olinuxino-micro" CONFIG_SPL=y CONFIG_MACH_SUN5I=y CONFIG_DRAM_CLK=432 -CONFIG_MMC0_CD_PIN="PG1" -CONFIG_MMC1_CD_PIN="PG13" CONFIG_MMC_SUNXI_SLOT_EXTRA=1 CONFIG_USB1_VBUS_PIN="PB10" # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
configs/A13-OLinuXinoM_defconfig +0 -1
@@ -5,7 +5,6 @@ CONFIG_SPL=y CONFIG_MACH_SUN5I=y CONFIG_DRAM_CLK=408 CONFIG_DRAM_EMR1=0 -CONFIG_MMC0_CD_PIN="PG0" CONFIG_USB1_VBUS_PIN="PG11" # CONFIG_VIDEO_HDMI is not set CONFIG_VIDEO_VGA_VIA_LCD=y
configs/A13-OLinuXino_defconfig +0 -1
@@ -5,7 +5,6 @@ CONFIG_SPL=y CONFIG_MACH_SUN5I=y CONFIG_DRAM_CLK=408 CONFIG_DRAM_EMR1=0 -CONFIG_MMC0_CD_PIN="PG0" CONFIG_USB0_VBUS_DET="PG1" CONFIG_USB1_VBUS_PIN="PG11" CONFIG_AXP_GPIO=y
configs/A20-OLinuXino-Lime2-eMMC_defconfig +0 -1
@@ -4,7 +4,6 @@ CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-olinuxino-lime2-emmc" CONFIG_SPL=y CONFIG_MACH_SUN7I=y CONFIG_DRAM_CLK=384 -CONFIG_MMC0_CD_PIN="PH1" CONFIG_MMC_SUNXI_SLOT_EXTRA=2 CONFIG_USB0_VBUS_PIN="PC17" CONFIG_USB0_VBUS_DET="PH5"
configs/A20-OLinuXino-Lime2_defconfig +0 -1
@@ -4,7 +4,6 @@ CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-olinuxino-lime2" CONFIG_SPL=y CONFIG_MACH_SUN7I=y CONFIG_DRAM_CLK=384 -CONFIG_MMC0_CD_PIN="PH1" CONFIG_USB0_VBUS_PIN="PC17" CONFIG_USB0_VBUS_DET="PH5" CONFIG_I2C1_ENABLE=y
configs/A20-OLinuXino-Lime_defconfig +0 -1
@@ -4,7 +4,6 @@ CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-olinuxino-lime" CONFIG_SPL=y CONFIG_MACH_SUN7I=y CONFIG_DRAM_CLK=384 -CONFIG_MMC0_CD_PIN="PH1" CONFIG_I2C1_ENABLE=y CONFIG_SATAPWR="PC3" CONFIG_AHCI=y
configs/A20-OLinuXino_MICRO-eMMC_defconfig +0 -1
@@ -4,7 +4,6 @@ CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-olinuxino-micro-emmc" CONFIG_SPL=y CONFIG_MACH_SUN7I=y CONFIG_DRAM_CLK=384 -CONFIG_MMC0_CD_PIN="PH1" CONFIG_MMC_SUNXI_SLOT_EXTRA=2 CONFIG_I2C1_ENABLE=y CONFIG_VIDEO_VGA=y
configs/A20-OLinuXino_MICRO_defconfig +0 -2
@@ -4,8 +4,6 @@ CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-olinuxino-micro" CONFIG_SPL=y CONFIG_MACH_SUN7I=y CONFIG_DRAM_CLK=384 -CONFIG_MMC0_CD_PIN="PH1" -CONFIG_MMC3_CD_PIN="PH11" CONFIG_MMC_SUNXI_SLOT_EXTRA=3 CONFIG_I2C1_ENABLE=y CONFIG_VIDEO_VGA=y
configs/A20-Olimex-SOM-EVB_defconfig +0 -2
@@ -4,8 +4,6 @@ CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-olimex-som-evb" CONFIG_SPL=y CONFIG_MACH_SUN7I=y CONFIG_DRAM_CLK=384 -CONFIG_MMC0_CD_PIN="PH1" -CONFIG_MMC3_CD_PIN="PH0" CONFIG_MMC_SUNXI_SLOT_EXTRA=3 CONFIG_USB0_VBUS_PIN="PB9" CONFIG_USB0_VBUS_DET="PH5"
configs/A20-Olimex-SOM204-EVB-eMMC_defconfig +0 -1
@@ -4,7 +4,6 @@ CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-olimex-som204-evb-emmc" CONFIG_SPL=y CONFIG_MACH_SUN7I=y CONFIG_DRAM_CLK=384 -CONFIG_MMC0_CD_PIN="PH1" CONFIG_MMC_SUNXI_SLOT_EXTRA=2 CONFIG_USB0_VBUS_PIN="PC17" CONFIG_USB0_VBUS_DET="PH5"
configs/A20-Olimex-SOM204-EVB_defconfig +0 -1
@@ -4,7 +4,6 @@ CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-olimex-som204-evb" CONFIG_SPL=y CONFIG_MACH_SUN7I=y CONFIG_DRAM_CLK=384 -CONFIG_MMC0_CD_PIN="PH1" CONFIG_USB0_VBUS_PIN="PC17" CONFIG_USB0_VBUS_DET="PH5" CONFIG_I2C1_ENABLE=y
configs/A33-OLinuXino_defconfig +0 -1
@@ -6,7 +6,6 @@ CONFIG_MACH_SUN8I_A33=y CONFIG_DRAM_CLK=432 CONFIG_DRAM_ZQ=15291 CONFIG_DRAM_ODT_EN=y -CONFIG_MMC0_CD_PIN="PB4" CONFIG_USB0_VBUS_PIN="AXP0-VBUS-ENABLE" CONFIG_USB0_VBUS_DET="AXP0-VBUS-DETECT" CONFIG_USB0_ID_DET="PB3"
configs/Ainol_AW1_defconfig +0 -1
@@ -5,7 +5,6 @@ CONFIG_SPL=y CONFIG_MACH_SUN7I=y CONFIG_DRAM_CLK=432 CONFIG_DRAM_ZQ=123 -CONFIG_MMC0_CD_PIN="PH1" CONFIG_USB0_VBUS_PIN="PB9" CONFIG_USB0_VBUS_DET="AXP0-VBUS-DETECT" CONFIG_AXP_GPIO=y
configs/Ampe_A76_defconfig +0 -1
@@ -4,7 +4,6 @@ CONFIG_DEFAULT_DEVICE_TREE="sun5i-a13-ampe-a76" CONFIG_SPL=y CONFIG_MACH_SUN5I=y CONFIG_DRAM_CLK=432 -CONFIG_MMC0_CD_PIN="PG0" CONFIG_USB0_VBUS_PIN="PG12" CONFIG_USB0_VBUS_DET="PG1" CONFIG_USB0_ID_DET="PG2"
configs/Bananapi_M2_Ultra_defconfig +0 -1
@@ -5,7 +5,6 @@ CONFIG_SPL=y CONFIG_MACH_SUN8I_R40=y CONFIG_DRAM_CLK=576 CONFIG_MACPWR="PA17" -CONFIG_MMC0_CD_PIN="PH13" CONFIG_MMC_SUNXI_SLOT_EXTRA=2 CONFIG_USB1_VBUS_PIN="PH23" CONFIG_USB2_VBUS_PIN="PH23"
configs/Bananapi_m2m_defconfig +0 -1
@@ -6,7 +6,6 @@ CONFIG_MACH_SUN8I_A33=y CONFIG_DRAM_CLK=600 CONFIG_DRAM_ZQ=15291 CONFIG_DRAM_ODT_EN=y -CONFIG_MMC0_CD_PIN="PB4" CONFIG_MMC_SUNXI_SLOT_EXTRA=2 CONFIG_USB0_ID_DET="PH8" # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
configs/Cubieboard2_defconfig +0 -1
@@ -4,7 +4,6 @@ CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-cubieboard2" CONFIG_SPL=y CONFIG_MACH_SUN7I=y CONFIG_DRAM_CLK=480 -CONFIG_MMC0_CD_PIN="PH1" CONFIG_SATAPWR="PB8" CONFIG_AHCI=y # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
configs/Cubieboard4_defconfig +0 -1
@@ -4,7 +4,6 @@ CONFIG_DEFAULT_DEVICE_TREE="sun9i-a80-cubieboard4" CONFIG_SPL=y CONFIG_MACH_SUN9I=y CONFIG_DRAM_CLK=672 -CONFIG_MMC0_CD_PIN="PH18" CONFIG_MMC_SUNXI_SLOT_EXTRA=2 CONFIG_USB0_VBUS_PIN="AXP0-VBUS-ENABLE" CONFIG_USB0_VBUS_DET="AXP0-VBUS-DETECT"
configs/Cubieboard_defconfig +0 -1
@@ -4,7 +4,6 @@ CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-cubieboard" CONFIG_SPL=y CONFIG_MACH_SUN4I=y CONFIG_DRAM_CLK=480 -CONFIG_MMC0_CD_PIN="PH1" CONFIG_SATAPWR="PB8" CONFIG_AHCI=y # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
configs/Cubietruck_defconfig +0 -1
@@ -4,7 +4,6 @@ CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-cubietruck" CONFIG_SPL=y CONFIG_MACH_SUN7I=y CONFIG_DRAM_CLK=432 -CONFIG_MMC0_CD_PIN="PH1" CONFIG_USB0_VBUS_PIN="PH17" CONFIG_USB0_VBUS_DET="PH22" CONFIG_USB0_ID_DET="PH19"
configs/Empire_electronix_d709_defconfig +0 -1
@@ -5,7 +5,6 @@ CONFIG_SPL=y CONFIG_MACH_SUN5I=y CONFIG_DRAM_CLK=432 CONFIG_DRAM_EMR1=0 -CONFIG_MMC0_CD_PIN="PG0" CONFIG_USB0_VBUS_PIN="PG12" CONFIG_USB0_VBUS_DET="PG1" CONFIG_USB0_ID_DET="PG2"
configs/Empire_electronix_m712_defconfig +0 -1
@@ -4,7 +4,6 @@ CONFIG_DEFAULT_DEVICE_TREE="sun5i-a13-empire-electronix-m712" CONFIG_SPL=y CONFIG_MACH_SUN5I=y CONFIG_DRAM_CLK=408 -CONFIG_MMC0_CD_PIN="PG0" CONFIG_USB0_VBUS_PIN="PG12" CONFIG_USB0_VBUS_DET="PG1" CONFIG_USB0_ID_DET="PG2"
configs/Itead_Ibox_A20_defconfig +0 -1
@@ -4,7 +4,6 @@ CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-itead-ibox" CONFIG_SPL=y CONFIG_MACH_SUN7I=y CONFIG_DRAM_CLK=480 -CONFIG_MMC0_CD_PIN="PH1" CONFIG_SATAPWR="PB8" CONFIG_AHCI=y # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
configs/Lamobo_R1_defconfig +0 -1
@@ -5,7 +5,6 @@ CONFIG_SPL=y CONFIG_MACH_SUN7I=y CONFIG_DRAM_CLK=432 CONFIG_MACPWR="PH23" -CONFIG_MMC0_CD_PIN="PH10" CONFIG_SATAPWR="PB3" CONFIG_GMAC_TX_DELAY=4 CONFIG_AHCI=y
configs/Mele_M3_defconfig +0 -1
@@ -4,7 +4,6 @@ CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-m3" CONFIG_SPL=y CONFIG_MACH_SUN7I=y CONFIG_DRAM_CLK=384 -CONFIG_MMC0_CD_PIN="PH1" CONFIG_MMC_SUNXI_SLOT_EXTRA=2 CONFIG_VIDEO_VGA=y CONFIG_VIDEO_COMPOSITE=y
configs/Mele_M5_defconfig +0 -1
@@ -5,7 +5,6 @@ CONFIG_SPL=y CONFIG_MACH_SUN7I=y CONFIG_DRAM_CLK=432 CONFIG_DRAM_ZQ=122 -CONFIG_MMC0_CD_PIN="PH1" CONFIG_VIDEO_COMPOSITE=y CONFIG_AHCI=y # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
configs/Merrii_A80_Optimus_defconfig +0 -1
@@ -4,7 +4,6 @@ CONFIG_DEFAULT_DEVICE_TREE="sun9i-a80-optimus" CONFIG_SPL=y CONFIG_MACH_SUN9I=y CONFIG_DRAM_CLK=672 -CONFIG_MMC0_CD_PIN="PH18" CONFIG_MMC_SUNXI_SLOT_EXTRA=2 CONFIG_USB0_VBUS_PIN="AXP0-VBUS-ENABLE" CONFIG_USB0_VBUS_DET="AXP0-VBUS-DETECT"
configs/Orangepi_mini_defconfig +0 -2
@@ -5,8 +5,6 @@ CONFIG_SPL=y CONFIG_MACH_SUN7I=y CONFIG_DRAM_CLK=432 CONFIG_MACPWR="PH23" -CONFIG_MMC0_CD_PIN="PH10" -CONFIG_MMC3_CD_PIN="PH11" CONFIG_MMC_SUNXI_SLOT_EXTRA=3 CONFIG_USB1_VBUS_PIN="PH26" CONFIG_USB2_VBUS_PIN="PH22"
configs/Sinlinx_SinA31s_defconfig +0 -1
@@ -5,7 +5,6 @@ CONFIG_SPL=y CONFIG_MACH_SUN6I=y CONFIG_DRAM_CLK=432 CONFIG_DRAM_ZQ=251 -CONFIG_MMC0_CD_PIN="PA4" CONFIG_MMC_SUNXI_SLOT_EXTRA=3 CONFIG_USB1_VBUS_PIN="" CONFIG_USB2_VBUS_PIN=""
configs/Sinlinx_SinA33_defconfig +0 -1
@@ -5,7 +5,6 @@ CONFIG_SPL=y CONFIG_MACH_SUN8I_A33=y CONFIG_DRAM_CLK=552 CONFIG_DRAM_ZQ=15291 -CONFIG_MMC0_CD_PIN="PB4" CONFIG_MMC_SUNXI_SLOT_EXTRA=2 CONFIG_USB0_ID_DET="PH8" CONFIG_VIDEO_LCD_MODE="x:1024,y:600,depth:18,pclk_khz:66000,le:90,ri:160,up:3,lo:127,hs:70,vs:20,sync:3,vmode:0"
configs/Sunchip_CX-A99_defconfig +0 -1
@@ -6,7 +6,6 @@ CONFIG_MACH_SUN9I=y CONFIG_DRAM_CLK=600 CONFIG_DRAM_ZQ=3881915 CONFIG_DRAM_ODT_EN=y -CONFIG_MMC0_CD_PIN="PH17" CONFIG_MMC_SUNXI_SLOT_EXTRA=2 CONFIG_USB0_VBUS_PIN="PH15" CONFIG_USB1_VBUS_PIN="PL7"
configs/UTOO_P66_defconfig +0 -1
@@ -5,7 +5,6 @@ CONFIG_SPL=y CONFIG_MACH_SUN5I=y CONFIG_DRAM_CLK=432 CONFIG_DRAM_EMR1=0 -CONFIG_MMC0_CD_PIN="PG0" CONFIG_MMC_SUNXI_SLOT_EXTRA=2 CONFIG_USB0_VBUS_PIN="PB04" CONFIG_USB0_VBUS_DET="PG01"
configs/Wobo_i5_defconfig +0 -1
@@ -4,7 +4,6 @@ CONFIG_DEFAULT_DEVICE_TREE="sun5i-a10s-wobo-i5" CONFIG_SPL=y CONFIG_MACH_SUN5I=y CONFIG_DRAM_CLK=432 -CONFIG_MMC0_CD_PIN="PB3" CONFIG_USB1_VBUS_PIN="PG12" # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_SPL_STACK=0x8000
configs/Yones_Toptech_BD1078_defconfig +0 -2
@@ -4,8 +4,6 @@ CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-yones-toptech-bd1078" CONFIG_SPL=y CONFIG_MACH_SUN7I=y CONFIG_DRAM_CLK=408 -CONFIG_MMC0_CD_PIN="PH1" -CONFIG_MMC1_CD_PIN="PH2" CONFIG_MMC1_PINS_PH=y CONFIG_MMC_SUNXI_SLOT_EXTRA=1 CONFIG_USB0_VBUS_PIN="PB9"
configs/Yones_Toptech_BS1078_V2_defconfig +0 -1
@@ -5,7 +5,6 @@ CONFIG_SPL=y CONFIG_MACH_SUN6I=y CONFIG_DRAM_CLK=420 CONFIG_DRAM_ZQ=251 -CONFIG_MMC0_CD_PIN="PA8" CONFIG_USB0_VBUS_PIN="AXP0-VBUS-ENABLE" CONFIG_USB0_VBUS_DET="AXP0-VBUS-DETECT" CONFIG_USB0_ID_DET="PA15"
configs/bananapi_m2_berry_defconfig +0 -1
@@ -4,7 +4,6 @@ CONFIG_DEFAULT_DEVICE_TREE="sun8i-v40-bananapi-m2-berry" CONFIG_SPL=y CONFIG_MACH_SUN8I_R40=y CONFIG_DRAM_CLK=576 -CONFIG_MMC0_CD_PIN="PH13" CONFIG_USB1_VBUS_PIN="PH23" # CONFIG_HAS_ARMV7_SECURE_BASE is not set CONFIG_AHCI=y
configs/bananapi_m2_zero_defconfig +0 -1
@@ -4,7 +4,6 @@ CONFIG_DEFAULT_DEVICE_TREE="sun8i-h2-plus-bananapi-m2-zero" CONFIG_SPL=y CONFIG_MACH_SUN8I_H3=y CONFIG_DRAM_CLK=408 -CONFIG_MMC0_CD_PIN="" # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_SPL_STACK=0x8000 CONFIG_SYS_PBSIZE=1024
configs/bananapi_m64_defconfig +0 -1
@@ -4,7 +4,6 @@ CONFIG_DEFAULT_DEVICE_TREE="sun50i-a64-bananapi-m64" CONFIG_SPL=y CONFIG_MACH_SUN50I=y CONFIG_RESERVE_ALLWINNER_BOOT0_HEADER=y -CONFIG_MMC0_CD_PIN="PH13" CONFIG_MMC_SUNXI_SLOT_EXTRA=2 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_SPL_STACK=0x54000
configs/beelink_gs1_defconfig +0 -1
@@ -4,7 +4,6 @@ CONFIG_DEFAULT_DEVICE_TREE="sun50i-h6-beelink-gs1" CONFIG_SPL=y CONFIG_MACH_SUN50I_H6=y CONFIG_SUNXI_DRAM_H6_LPDDR3=y -CONFIG_MMC0_CD_PIN="PF6" CONFIG_MMC_SUNXI_SLOT_EXTRA=2 # CONFIG_PSCI_RESET is not set # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
configs/colorfly_e708_q1_defconfig +0 -1
@@ -5,7 +5,6 @@ CONFIG_SPL=y CONFIG_MACH_SUN6I=y CONFIG_DRAM_CLK=432 CONFIG_DRAM_ZQ=251 -CONFIG_MMC0_CD_PIN="PA8" CONFIG_USB0_VBUS_PIN="AXP0-VBUS-ENABLE" CONFIG_USB0_VBUS_DET="AXP0-VBUS-DETECT" CONFIG_USB0_ID_DET="PA15"
configs/difrnce_dit4350_defconfig +0 -1
@@ -4,7 +4,6 @@ CONFIG_DEFAULT_DEVICE_TREE="sun5i-a13-difrnce-dit4350" CONFIG_SPL=y CONFIG_MACH_SUN5I=y CONFIG_DRAM_CLK=408 -CONFIG_MMC0_CD_PIN="PG0" CONFIG_USB0_VBUS_PIN="PG12" CONFIG_USB0_VBUS_DET="PG1" CONFIG_USB0_ID_DET="PG2"
configs/dserve_dsrv9703c_defconfig +0 -1
@@ -3,7 +3,6 @@ CONFIG_ARCH_SUNXI=y CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-dserve-dsrv9703c" CONFIG_SPL=y CONFIG_MACH_SUN4I=y -CONFIG_MMC0_CD_PIN="PH1" CONFIG_USB0_VBUS_PIN="PB9" CONFIG_USB0_VBUS_DET="PH5" CONFIG_USB0_ID_DET="PH4"
configs/gt90h_v4_defconfig +0 -1
@@ -5,7 +5,6 @@ CONFIG_SPL=y CONFIG_MACH_SUN8I_A23=y CONFIG_DRAM_CLK=480 CONFIG_DRAM_ZQ=32767 -CONFIG_MMC0_CD_PIN="PB4" CONFIG_USB0_VBUS_PIN="AXP0-VBUS-ENABLE" CONFIG_USB0_VBUS_DET="AXP0-VBUS-DETECT" CONFIG_USB0_ID_DET="PH8"
configs/iNet_3F_defconfig +0 -1
@@ -5,7 +5,6 @@ CONFIG_SPL=y CONFIG_MACH_SUN4I=y CONFIG_DRAM_CLK=432 CONFIG_DRAM_EMR1=4 -CONFIG_MMC0_CD_PIN="PH1" CONFIG_USB0_VBUS_PIN="PB9" CONFIG_USB0_VBUS_DET="PH5" CONFIG_VIDEO_LCD_MODE="x:1024,y:768,depth:18,pclk_khz:100000,le:799,ri:260,up:15,lo:16,hs:1,vs:1,sync:3,vmode:0"
configs/iNet_3W_defconfig +0 -1
@@ -6,7 +6,6 @@ CONFIG_MACH_SUN4I=y CONFIG_DRAM_CLK=408 CONFIG_DRAM_ZQ=127 CONFIG_DRAM_EMR1=4 -CONFIG_MMC0_CD_PIN="PH20" CONFIG_USB0_VBUS_PIN="PB9" CONFIG_USB0_VBUS_DET="PH5" CONFIG_VIDEO_LCD_MODE="x:1024,y:768,depth:24,pclk_khz:65000,le:159,ri:160,up:22,lo:15,hs:1,vs:1,sync:3,vmode:0"
configs/iNet_D978_rev2_defconfig +0 -1
@@ -5,7 +5,6 @@ CONFIG_SPL=y CONFIG_MACH_SUN8I_A33=y CONFIG_DRAM_CLK=456 CONFIG_DRAM_ZQ=15291 -CONFIG_MMC0_CD_PIN="PB4" CONFIG_USB0_VBUS_PIN="AXP0-VBUS-ENABLE" CONFIG_USB0_VBUS_DET="AXP0-VBUS-DETECT" CONFIG_USB0_ID_DET="PH8"
configs/icnova-a20-swac_defconfig +0 -1
@@ -11,7 +11,6 @@ CONFIG_SPL=y CONFIG_MACH_SUN7I=y CONFIG_DRAM_CLK=384 CONFIG_OLD_SUNXI_KERNEL_COMPAT=y -CONFIG_MMC0_CD_PIN="PI5" CONFIG_USB0_VBUS_PIN="PG11" CONFIG_USB0_VBUS_DET="PH7" CONFIG_USB1_VBUS_PIN="PG10"
configs/inet86dz_defconfig +0 -1
@@ -5,7 +5,6 @@ CONFIG_SPL=y CONFIG_MACH_SUN8I_A23=y CONFIG_DRAM_CLK=552 CONFIG_DRAM_ZQ=63351 -CONFIG_MMC0_CD_PIN="PB4" CONFIG_USB0_VBUS_PIN="AXP0-VBUS-ENABLE" CONFIG_USB0_VBUS_DET="AXP0-VBUS-DETECT" CONFIG_USB0_ID_DET="PH8"
configs/inet98v_rev2_defconfig +0 -1
@@ -4,7 +4,6 @@ CONFIG_DEFAULT_DEVICE_TREE="sun5i-a13-inet-98v-rev2" CONFIG_SPL=y CONFIG_MACH_SUN5I=y CONFIG_DRAM_CLK=432 -CONFIG_MMC0_CD_PIN="PG0" CONFIG_USB0_VBUS_PIN="PG12" CONFIG_USB0_VBUS_DET="PG1" CONFIG_USB0_ID_DET="PG2"
configs/inet_q972_defconfig +0 -1
@@ -5,7 +5,6 @@ CONFIG_SPL=y CONFIG_MACH_SUN6I=y CONFIG_DRAM_CLK=384 CONFIG_DRAM_ZQ=251 -CONFIG_MMC0_CD_PIN="PA8" CONFIG_USB0_VBUS_PIN="AXP0-VBUS-ENABLE" CONFIG_USB0_VBUS_DET="AXP0-VBUS-DETECT" CONFIG_USB0_ID_DET="PA15"
configs/nanopi_m1_plus_defconfig +0 -1
@@ -5,7 +5,6 @@ CONFIG_SPL=y CONFIG_MACH_SUN8I_H3=y CONFIG_DRAM_CLK=408 CONFIG_MACPWR="PD6" -CONFIG_MMC0_CD_PIN="PH13" CONFIG_MMC_SUNXI_SLOT_EXTRA=2 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_SPL_STACK=0x8000
configs/oceanic_5205_5inmfd_defconfig +0 -1
@@ -7,7 +7,6 @@ CONFIG_RESERVE_ALLWINNER_BOOT0_HEADER=y CONFIG_SUNXI_DRAM_LPDDR3_STOCK=y CONFIG_DRAM_CLK=552 CONFIG_DRAM_ZQ=3881949 -CONFIG_MMC0_CD_PIN="" CONFIG_SPL_SPI_SUNXI=y # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_SPL_STACK=0x54000
configs/orangepi_3_defconfig +0 -1
@@ -4,7 +4,6 @@ CONFIG_DEFAULT_DEVICE_TREE="sun50i-h6-orangepi-3" CONFIG_SPL=y CONFIG_MACH_SUN50I_H6=y CONFIG_SUNXI_DRAM_H6_LPDDR3=y -CONFIG_MMC0_CD_PIN="PF6" CONFIG_MMC_SUNXI_SLOT_EXTRA=2 CONFIG_BLUETOOTH_DT_DEVICE_FIXUP="brcm,bcm4345c5" # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
configs/orangepi_lite2_defconfig +0 -1
@@ -4,7 +4,6 @@ CONFIG_DEFAULT_DEVICE_TREE="sun50i-h6-orangepi-lite2" CONFIG_SPL=y CONFIG_MACH_SUN50I_H6=y CONFIG_SUNXI_DRAM_H6_LPDDR3=y -CONFIG_MMC0_CD_PIN="PF6" # CONFIG_PSCI_RESET is not set # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_SPL_STACK=0x118000
configs/orangepi_one_plus_defconfig +0 -1
@@ -4,7 +4,6 @@ CONFIG_DEFAULT_DEVICE_TREE="sun50i-h6-orangepi-one-plus" CONFIG_SPL=y CONFIG_MACH_SUN50I_H6=y CONFIG_SUNXI_DRAM_H6_LPDDR3=y -CONFIG_MMC0_CD_PIN="PF6" # CONFIG_PSCI_RESET is not set # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_SPL_STACK=0x118000
configs/orangepi_zero2_defconfig +0 -1
@@ -7,7 +7,6 @@ CONFIG_DRAM_SUN50I_H616_READ_CALIBRATION=y CONFIG_DRAM_SUN50I_H616_READ_TRAINING=y CONFIG_DRAM_SUN50I_H616_WRITE_TRAINING=y CONFIG_MACH_SUN50I_H616=y -CONFIG_MMC0_CD_PIN="PF6" CONFIG_R_I2C_ENABLE=y # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_SPL_MAX_SIZE=0xbfa0
configs/orangepi_zero_plus2_defconfig +0 -1
@@ -6,7 +6,6 @@ CONFIG_MACH_SUN50I_H5=y CONFIG_DRAM_CLK=672 CONFIG_DRAM_ZQ=3881977 # CONFIG_DRAM_ODT_EN is not set -CONFIG_MMC0_CD_PIN="PH13" CONFIG_MMC_SUNXI_SLOT_EXTRA=2 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_SPL_STACK=0x54000
configs/orangepi_zero_plus2_h3_defconfig +0 -1
@@ -5,7 +5,6 @@ CONFIG_SPL=y CONFIG_MACH_SUN8I_H3=y CONFIG_DRAM_CLK=672 # CONFIG_DRAM_ODT_EN is not set -CONFIG_MMC0_CD_PIN="PH13" CONFIG_MMC_SUNXI_SLOT_EXTRA=2 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_SPL_STACK=0x8000
configs/parrot_r16_defconfig +0 -1
@@ -5,7 +5,6 @@ CONFIG_SPL=y CONFIG_MACH_SUN8I_A33=y CONFIG_DRAM_CLK=600 CONFIG_DRAM_ZQ=15291 -CONFIG_MMC0_CD_PIN="PD14" CONFIG_MMC_SUNXI_SLOT_EXTRA=2 CONFIG_USB0_ID_DET="PD10" CONFIG_USB1_VBUS_PIN="PD12"
configs/pine64-lts_defconfig +0 -1
@@ -6,7 +6,6 @@ CONFIG_MACH_SUN50I=y CONFIG_SUNXI_DRAM_LPDDR3_STOCK=y CONFIG_DRAM_CLK=552 CONFIG_DRAM_ZQ=3881949 -CONFIG_MMC0_CD_PIN="" CONFIG_MMC_SUNXI_SLOT_EXTRA=2 CONFIG_SPL_SPI_SUNXI=y # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
configs/pine_h64_defconfig +0 -1
@@ -5,7 +5,6 @@ CONFIG_SPL=y CONFIG_MACH_SUN50I_H6=y CONFIG_SUNXI_DRAM_H6_LPDDR3=y CONFIG_MACPWR="PC16" -CONFIG_MMC0_CD_PIN="PF6" CONFIG_MMC_SUNXI_SLOT_EXTRA=2 CONFIG_USB3_VBUS_PIN="PL5" CONFIG_SPL_SPI_SUNXI=y
configs/polaroid_mid2407pxe03_defconfig +0 -1
@@ -5,7 +5,6 @@ CONFIG_SPL=y CONFIG_MACH_SUN8I_A23=y CONFIG_DRAM_CLK=432 CONFIG_DRAM_ZQ=63351 -CONFIG_MMC0_CD_PIN="PB4" CONFIG_USB0_VBUS_PIN="AXP0-VBUS-ENABLE" CONFIG_USB0_VBUS_DET="AXP0-VBUS-DETECT" CONFIG_USB0_ID_DET="PH8"
configs/polaroid_mid2809pxe04_defconfig +0 -1
@@ -5,7 +5,6 @@ CONFIG_SPL=y CONFIG_MACH_SUN8I_A23=y CONFIG_DRAM_CLK=432 CONFIG_DRAM_ZQ=63351 -CONFIG_MMC0_CD_PIN="PB4" CONFIG_USB0_VBUS_PIN="AXP0-VBUS-ENABLE" CONFIG_USB0_VBUS_DET="AXP0-VBUS-DETECT" CONFIG_USB0_ID_DET="PH8"
configs/q8_a13_tablet_defconfig +0 -1
@@ -4,7 +4,6 @@ CONFIG_DEFAULT_DEVICE_TREE="sun5i-a13-q8-tablet" CONFIG_SPL=y CONFIG_MACH_SUN5I=y CONFIG_DRAM_CLK=384 -CONFIG_MMC0_CD_PIN="PG0" CONFIG_USB0_VBUS_PIN="PG12" CONFIG_USB0_VBUS_DET="PG1" CONFIG_USB0_ID_DET="PG2"
configs/q8_a23_tablet_800x480_defconfig +0 -1
@@ -5,7 +5,6 @@ CONFIG_SPL=y CONFIG_MACH_SUN8I_A23=y CONFIG_DRAM_CLK=432 CONFIG_DRAM_ZQ=63306 -CONFIG_MMC0_CD_PIN="PB4" CONFIG_USB0_VBUS_PIN="AXP0-VBUS-ENABLE" CONFIG_USB0_VBUS_DET="AXP0-VBUS-DETECT" CONFIG_USB0_ID_DET="PH8"
configs/q8_a33_tablet_1024x600_defconfig +0 -1
@@ -5,7 +5,6 @@ CONFIG_SPL=y CONFIG_MACH_SUN8I_A33=y CONFIG_DRAM_CLK=456 CONFIG_DRAM_ZQ=15291 -CONFIG_MMC0_CD_PIN="PB4" CONFIG_USB0_VBUS_PIN="AXP0-VBUS-ENABLE" CONFIG_USB0_VBUS_DET="AXP0-VBUS-DETECT" CONFIG_USB0_ID_DET="PH8"
configs/q8_a33_tablet_800x480_defconfig +0 -1
@@ -5,7 +5,6 @@ CONFIG_SPL=y CONFIG_MACH_SUN8I_A33=y CONFIG_DRAM_CLK=456 CONFIG_DRAM_ZQ=15291 -CONFIG_MMC0_CD_PIN="PB4" CONFIG_USB0_VBUS_PIN="AXP0-VBUS-ENABLE" CONFIG_USB0_VBUS_DET="AXP0-VBUS-DETECT" CONFIG_USB0_ID_DET="PH8"
configs/sopine_baseboard_defconfig +0 -1
@@ -7,7 +7,6 @@ CONFIG_RESERVE_ALLWINNER_BOOT0_HEADER=y CONFIG_SUNXI_DRAM_LPDDR3_STOCK=y CONFIG_DRAM_CLK=552 CONFIG_DRAM_ZQ=3881949 -CONFIG_MMC0_CD_PIN="" CONFIG_MMC_SUNXI_SLOT_EXTRA=2 CONFIG_SPL_SPI_SUNXI=y # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
configs/tanix_tx6_defconfig +0 -1
@@ -5,7 +5,6 @@ CONFIG_SPL=y CONFIG_MACH_SUN50I_H6=y CONFIG_SUNXI_DRAM_H6_DDR3_1333=y CONFIG_DRAM_CLK=648 -CONFIG_MMC0_CD_PIN="PF6" CONFIG_MMC_SUNXI_SLOT_EXTRA=2 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_SPL_STACK=0x118000
Signature · 1 line
2.25.1
Quoted 6 lines · Andre Przywara
For legacy reasons we were defining the card detect GPIO for all sunxi boards in each board's defconfig.
There is actually no need for a card-detect check in the SPL code (which consequently has been removed already), and also in U-Boot proper we have DM code to query the CD GPIO name from the device tree.
Quoted 6 lines
That means we don't have any user of that information left, so can remove the definitions from the defconfigs.
Signed-off-by Andre Przywara <[email protected]>--- arch/arm/mach-sunxi/Kconfig | 27 --------------------