Drop CONFIG_FSL_ESDHC_VS33_NOT_SUPPORT
Subsystems (2)
v3 cover Drop CONFIG_FSL_ESDHC_VS33_NOT_SUPPORT
For eSDHC, power supply is through peripheral circuit. Some eSDHC versions have value 0 of the bit but that does not reflect the truth. 3.3V is common for SD/MMC, and is supported for all boards with eSDHC in current u-boot. So, make 3.3V is supported in default in code. CONFIG_FSL_ESDHC_VS33_NOT_SUPPORT can be enabled if future board does not support 3.3V.
Then CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33 can be dropped. And i.MX eSDHC driver should drop it too, since it's not used by any one of i.MX board.
Changes for v2:
- Updated copyright.
Changes for v3:
- Fixed code logic in patch#1.
- Dropped wrong copyright.
Yangbo Lu (3):
mmc: fsl_esdhc: convert to CONFIG_FSL_ESDHC_VS33_NOT_SUPPORT
mmc: fsl_esdhc_imx: drop CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33
armv8: layerscape: drop CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33
drivers/mmc/Kconfig | 7 +++++++ drivers/mmc/fsl_esdhc.c | 17 ++++++++++++++--- drivers/mmc/fsl_esdhc_imx.c | 7 +------ include/configs/T208xQDS.h | 3 +-- include/configs/T208xRDB.h | 3 +-- include/configs/T4240RDB.h | 3 +-- include/configs/kontron_sl28.h | 5 ----- include/configs/ls1012a2g5rdb.h | 7 +------ include/configs/ls1012afrwy.h | 7 +------ include/configs/ls1012aqds.h | 6 +----- include/configs/ls1012ardb.h | 8 +------- include/configs/ls1028a_common.h | 7 +------ include/configs/ls1043a_common.h | 9 +-------- include/configs/ls1046a_common.h | 9 +-------- include/configs/ls1088aqds.h | 3 +-- include/configs/ls1088ardb.h | 7 +------ include/configs/ls2080aqds.h | 7 +------ include/configs/ls2080ardb.h | 7 +------ include/configs/lx2160a_common.h | 7 +------ scripts/config_whitelist.txt | 1 - 20 files changed, 37 insertions(+), 93 deletions(-)
base-commit: 89be8e31ccd1c53b010385ed0807eb00f0eec06a
Signature · 1 line
2.25.1
PATCH v3 1/3 mmc: fsl_esdhc: convert to CONFIG_FSL_ESDHC_VS33_NOT_SUPPORT
For eSDHC, power supply is through peripheral circuit. Some eSDHC versions have value 0 of the bit but that does not reflect the truth. 3.3V is common for SD/MMC, and is supported for all boards with eSDHC in current u-boot. So, make 3.3V is supported in default in code. CONFIG_FSL_ESDHC_VS33_NOT_SUPPORT can be enabled if future board does not support 3.3V.
This is also a fix-up for one previous patch, which converted to use IS_ENABLED() for CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33 that is not a Kconfig option.
---
Changes for v2:
- Updated copyright.
Chagnes for v3:
- Fixed code logic.
--- drivers/mmc/Kconfig | 7 +++++++ drivers/mmc/fsl_esdhc.c | 17 ++++++++++++++--- 2 files changed, 21 insertions(+), 3 deletions(-)
drivers/mmc/Kconfig +7 -0
@@ -798,6 +798,13 @@ config FSL_ESDHC_33V_IO_RELIABILITY_WORKAROUND This option assumes no hotplug, and u-boot has to make all the way to to linux to use 1.8v UHS-I speed mode if has card. +config FSL_ESDHC_VS33_NOT_SUPPORT + bool "3.3V power supply not supported" + depends on FSL_ESDHC + help + For eSDHC, power supply is through peripheral circuit. 3.3V support is + common. Select this if 3.3V power supply not supported. + config FSL_ESDHC_IMX bool "Freescale/NXP i.MX eSDHC controller support" help
drivers/mmc/fsl_esdhc.c +14 -3
@@ -1,7 +1,7 @@// SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2007, 2010-2011 Freescale Semiconductor, Inc -* Copyright 2019-2020 NXP +* Copyright 2019-2021 NXP * Andy Fleming * * Based vaguely on the pxa mmc code:
@@ -795,10 +795,21 @@ static void fsl_esdhc_get_cfg_common(struct fsl_esdhc_priv *priv,u32 caps; caps =esdhc_read32 (®s->hostcapblt); + +/* +* For eSDHC, power supply is through peripheral circuit. Some eSDHC +* versions have value 0 of the bit but that does not reflect the +* truth. 3.3V is common for SD/MMC, and is supported for all boards +* with eSDHC in current u-boot. So, make 3.3V is supported in +* default in code. CONFIG_FSL_ESDHC_VS33_NOT_SUPPORT can be enabled +* if future board does not support 3.3V. +*/ + caps |=HOSTCAPBLT_VS33 ; +if (IS_ENABLED (CONFIG_FSL_ESDHC_VS33_NOT_SUPPORT )) + caps &= ~HOSTCAPBLT_VS33 ; +if (IS_ENABLED (CONFIG_SYS_FSL_ERRATUM_ESDHC135 )) caps &= ~(HOSTCAPBLT_SRS |HOSTCAPBLT_VS18 |HOSTCAPBLT_VS30 ); -if (IS_ENABLED (CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33 )) - caps |=HOSTCAPBLT_VS33 ;if (caps &HOSTCAPBLT_VS18 ) cfg->voltages |=MMC_VDD_165_195 ;if (caps &HOSTCAPBLT_VS30 )
Signature · 1 line
2.25.1
Re: [v3, 1/3] mmc: fsl_esdhc: convert to CONFIG_FSL_ESDHC_VS33_NOT_SUPPORT
Quoted 8 lines · Yangbo Lu
For eSDHC, power supply is through peripheral circuit. Some eSDHC versions have value 0 of the bit but that does not reflect the truth. 3.3V is common for SD/MMC, and is supported for all boards with eSDHC in current u-boot. So, make 3.3V is supported in default in code.
CONFIG_FSL_ESDHC_VS33_NOT_SUPPORTcan be enabled if future board does not support 3.3V.
Quoted 6 lines
This is also a fix-up for one previous patch, which converted to use
IS_ENABLED()forCONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33that is not aKconfigoption.Fixes 52faec31827e ("mmc: fsl_esdhc: replace most #ifdefs by IS_ENABLED()")Signed-off-by Yangbo Lu <[email protected]>
Best Regards,
Jaehoon Chung
Quoted 66 lines
---
Changes for v2:
- Updated copyright.
Chagnes for v3:
- Fixed code logic.--- drivers/mmc/Kconfig | 7 +++++++ drivers/mmc/fsl_esdhc.c | 17 ++++++++++++++--- 2 files changed, 21 insertions(+), 3 deletions(-)drivers/mmc/Kconfig +7
-0@@ -798,6 +798,13 @@ config FSL_ESDHC_33V_IO_RELIABILITY_WORKAROUND This option assumes no hotplug, and u-boot has to make all the way to to linux to use 1.8v UHS-I speed mode if has card. +config FSL_ESDHC_VS33_NOT_SUPPORT + bool "3.3V power supply not supported" + depends on FSL_ESDHC + help + For eSDHC, power supply is through peripheral circuit. 3.3V support is + common. Select this if 3.3V power supply not supported. + config FSL_ESDHC_IMX bool "Freescale/NXP i.MX eSDHC controller support" helpdrivers/mmc/fsl_esdhc.c +14
-3@@ -1,7 +1,7 @@// SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2007, 2010-2011 Freescale Semiconductor, Inc -* Copyright 2019-2020 NXP +* Copyright 2019-2021 NXP * Andy Fleming * * Based vaguely on the pxa mmc code: @@ -795,10 +795,21 @@ static void fsl_esdhc_get_cfg_common(struct fsl_esdhc_priv *priv,u32 caps; caps =esdhc_read32 (®s->hostcapblt); + +/* +* For eSDHC, power supply is through peripheral circuit. Some eSDHC +* versions have value 0 of the bit but that does not reflect the +* truth. 3.3V is common for SD/MMC, and is supported for all boards +* with eSDHC in current u-boot. So, make 3.3V is supported in +* default in code. CONFIG_FSL_ESDHC_VS33_NOT_SUPPORT can be enabled +* if future board does not support 3.3V. +*/ + caps |=HOSTCAPBLT_VS33 ; +if (IS_ENABLED (CONFIG_FSL_ESDHC_VS33_NOT_SUPPORT )) + caps &= ~HOSTCAPBLT_VS33 ; +if (IS_ENABLED (CONFIG_SYS_FSL_ERRATUM_ESDHC135 )) caps &= ~(HOSTCAPBLT_SRS |HOSTCAPBLT_VS18 |HOSTCAPBLT_VS30 ); -if (IS_ENABLED (CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33 )) - caps |=HOSTCAPBLT_VS33 ;if (caps &HOSTCAPBLT_VS18 ) cfg->voltages |=MMC_VDD_165_195 ;if (caps &HOSTCAPBLT_VS30 )
PATCH v3 2/3 mmc: fsl_esdhc_imx: drop CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33
In reply to Yangbo LuThere is no i.MX board using such option. Drop it.
---
Changes for v2:
- Updated copyright.
Changes for v3:
- None.
--- drivers/mmc/fsl_esdhc_imx.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)
drivers/mmc/fsl_esdhc_imx.c +1 -6
@@ -1,7 +1,7 @@// SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2007, 2010-2011 Freescale Semiconductor, Inc -* Copyright 2019 NXP Semiconductors +* Copyright 2019, 2021 NXP * Andy Fleming * Yangbo Lu <[email protected]> *
@@ -1234,11 +1234,6 @@ static int fsl_esdhc_init(struct fsl_esdhc_priv *priv, ESDHC_HOSTCAPBLT_VS18 | ESDHC_HOSTCAPBLT_VS30);#endif -/* T4240 host controller capabilities register should have VS33 bit */ -#ifdef CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33 - caps = caps |ESDHC_HOSTCAPBLT_VS33 ; -#endif -if (caps &ESDHC_HOSTCAPBLT_VS18 ) voltage_caps |=MMC_VDD_165_195 ;if (caps &ESDHC_HOSTCAPBLT_VS30 )
Signature · 1 line
2.25.1
PATCH v3 3/3 armv8: layerscape: drop CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33
In reply to Yangbo LuDrop CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33. CONFIG_FSL_ESDHC_VS33_NOT_SUPPORT is used instead.
---
Changes for v2:
- Updated copyright.
Changes for v3:
- Dropped wrong copyright.
--- include/configs/T208xQDS.h | 3 +-- include/configs/T208xRDB.h | 3 +-- include/configs/T4240RDB.h | 3 +-- include/configs/kontron_sl28.h | 5 ----- include/configs/ls1012a2g5rdb.h | 7 +------ include/configs/ls1012afrwy.h | 7 +------ include/configs/ls1012aqds.h | 6 +----- include/configs/ls1012ardb.h | 8 +------- include/configs/ls1028a_common.h | 7 +------ include/configs/ls1043a_common.h | 9 +-------- include/configs/ls1046a_common.h | 9 +-------- include/configs/ls1088aqds.h | 3 +-- include/configs/ls1088ardb.h | 7 +------ include/configs/ls2080aqds.h | 7 +------ include/configs/ls2080ardb.h | 7 +------ include/configs/lx2160a_common.h | 7 +------ scripts/config_whitelist.txt | 1 - 17 files changed, 15 insertions(+), 84 deletions(-)
include/configs/T208xQDS.h +1 -2
@@ -1,7 +1,7 @@/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright 2011-2013 Freescale Semiconductor, Inc. -* Copyright 2020 NXP +* Copyright 2020-2021 NXP */ /*
@@ -618,7 +618,6 @@ unsigned long get_board_ddr_clk(void);#ifdef CONFIG_MMC #define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC85xx_ESDHC_ADDR#define CONFIG_SYS_FSL_ESDHC_BROKEN_TIMEOUT -#define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33 #endif /*
include/configs/T208xRDB.h +1 -2
@@ -1,7 +1,7 @@/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright 2014 Freescale Semiconductor, Inc. -* Copyright 2020 NXP +* Copyright 2020-2021 NXP */ /*
@@ -574,7 +574,6 @@ unsigned long get_board_ddr_clk(void);#ifdef CONFIG_MMC #define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC85xx_ESDHC_ADDR#define CONFIG_SYS_FSL_ESDHC_BROKEN_TIMEOUT -#define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33 #endif /*
include/configs/T4240RDB.h +1 -2
@@ -1,7 +1,7 @@/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright 2014 Freescale Semiconductor, Inc. -* Copyright 2020 NXP +* Copyright 2020-2021 NXP */ /*
@@ -585,7 +585,6 @@ unsigned long get_board_ddr_clk(void);#ifdef CONFIG_MMC #define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC85xx_ESDHC_ADDR#define CONFIG_SYS_FSL_ESDHC_BROKEN_TIMEOUT -#define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33 #endif
include/configs/kontron_sl28.h +0 -5
@@ -56,11 +56,6 @@#define CONFIG_DDR_CLK_FREQ 100000000#define COUNTER_FREQUENCY_REAL (CONFIG_SYS_CLK_FREQ / 4) -/* MMC */ -#ifdef CONFIG_MMC -#define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33 -#endif -/* ethernet */ #define CONFIG_SYS_RX_ETH_BUFFER 8
include/configs/ls1012a2g5rdb.h +1 -6
@@ -1,6 +1,6 @@/* SPDX-License-Identifier: GPL-2.0+ */ /* -* Copyright 2017 NXP +* Copyright 2017, 2021 NXP */ #ifndef __LS1012A2G5RDB_H__
@@ -13,11 +13,6 @@#define CONFIG_CHIP_SELECTS_PER_CTRL 1#define CONFIG_SYS_SDRAM_SIZE 0x40000000 -/* MMC */ -#ifdef CONFIG_MMC -#define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33 -#endif -/* SATA */ #define CONFIG_LIBATA #define CONFIG_SCSI_AHCI
include/configs/ls1012afrwy.h +1 -6
@@ -1,6 +1,6 @@/* SPDX-License-Identifier: GPL-2.0+ */ /* -* Copyright 2018 NXP +* Copyright 2018, 2021 NXP */ #ifndef __LS1012AFRWY_H__
@@ -33,11 +33,6 @@ func(DHCP, dhcp, na)#endif -/* MMC */ -#ifdef CONFIG_MMC -#define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33 -#endif -#define CONFIG_PCIE1 /* PCIE controller 1 */ #define CONFIG_PCI_SCAN_SHOW
include/configs/ls1012aqds.h +1 -5
@@ -1,6 +1,7 @@/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright 2016 Freescale Semiconductor, Inc. +* Copyright 2021 NXP */ #ifndef __LS1012AQDS_H__
@@ -93,11 +94,6 @@ DSPI_CTAR_DT(0))#define CONFIG_SPI_FLASH_EON /* cs3 */ -/* MMC */ -#ifdef CONFIG_MMC -#define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33 -#endif -#define CONFIG_PCIE1 /* PCIE controller 1 */ #define CONFIG_PCI_SCAN_SHOW
include/configs/ls1012ardb.h +1 -7
@@ -1,6 +1,6 @@/* SPDX-License-Identifier: GPL-2.0+ */ /* -* Copyright 2020 NXP +* Copyright 2020-2021 NXP * Copyright 2016 Freescale Semiconductor, Inc. */
@@ -38,12 +38,6 @@#define __PHY_ETH2_MASK 0xFB#define __PHY_ETH1_MASK 0xFD -/* MMC */ -#ifdef CONFIG_MMC -#define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33 -#endif - -#define CONFIG_PCIE1 /* PCIE controller 1 */ #define CONFIG_PCI_SCAN_SHOW
include/configs/ls1028a_common.h +1 -6
@@ -1,6 +1,6 @@/* SPDX-License-Identifier: GPL-2.0+ */ /* -* Copyright 2019-2020 NXP +* Copyright 2019-2021 NXP */ #ifndef __L1028A_COMMON_H
@@ -93,11 +93,6 @@#define CONFIG_SYS_BOOTM_LEN (64 << 20)/* Increase max gunzip size */ -/* MMC */ -#ifdef CONFIG_MMC -#define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33 -#endif -#define OCRAM_NONSECURE_SIZE 0x00010000#define CONFIG_SYS_FSL_QSPI_BASE 0x20000000
include/configs/ls1043a_common.h +1 -8
@@ -1,7 +1,7 @@/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2015 Freescale Semiconductor -* Copyright 2019-2020 NXP +* Copyright 2019-2021 NXP */ #ifndef __LS1043A_COMMON_H
@@ -171,13 +171,6 @@#endif #endif -/* MMC */ -#ifndef SPL_NO_MMC -#ifdef CONFIG_MMC -#define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33 -#endif -#endif -/* DSPI */ #ifndef SPL_NO_DSPI #ifdef CONFIG_FSL_DSPI
include/configs/ls1046a_common.h +1 -8
@@ -1,7 +1,7 @@/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright 2016 Freescale Semiconductor -* Copyright 2019-2020 NXP +* Copyright 2019-2021 NXP */ #ifndef __LS1046A_COMMON_H
@@ -165,13 +165,6 @@ CONFIG_SYS_SCSI_MAX_LUN)#endif -/* MMC */ -#ifndef SPL_NO_MMC -#ifdef CONFIG_MMC -#define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33 -#endif -#endif -/* FMan ucode */ #ifndef SPL_NO_FMAN #define CONFIG_SYS_DPAA_FMAN
include/configs/ls1088aqds.h +1 -2
@@ -1,6 +1,6 @@/* SPDX-License-Identifier: GPL-2.0+ */ /* -* Copyright 2017, 2020 NXP +* Copyright 2017, 2020-2021 NXP */ #ifndef __LS1088A_QDS_H
@@ -361,7 +361,6 @@ unsigned long get_board_ddr_clk(void);#define CONFIG_FSL_MEMAC /* MMC */ -#define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33 #define CONFIG_ESDHC_DETECT_QUIRK ((readb(QIXIS_BASE + QIXIS_STAT_PRES1) & \ QIXIS_SDID_MASK) != QIXIS_ESDHC_NO_ADAPTER)
include/configs/ls1088ardb.h +1 -6
@@ -1,6 +1,6 @@/* SPDX-License-Identifier: GPL-2.0+ */ /* -* Copyright 2017, 2020 NXP +* Copyright 2017, 2020-2021 NXP */ #ifndef __LS1088A_RDB_H
@@ -507,11 +507,6 @@#endif #endif -/* MMC */ -#ifdef CONFIG_MMC -#define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33 -#endif -#ifndef SPL_NO_ENV #define BOOT_TARGET_DEVICES (func) \
include/configs/ls2080aqds.h +1 -6
@@ -1,6 +1,6 @@/* SPDX-License-Identifier: GPL-2.0+ */ /* -* Copyright 2017, 2019-2020 NXP +* Copyright 2017, 2019-2021 NXP * Copyright 2015 Freescale Semiconductor */
@@ -318,11 +318,6 @@ unsigned long get_board_ddr_clk(void);#define CONFIG_PCI_SCAN_SHOW #endif -/* MMC */ -#ifdef CONFIG_MMC -#define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33 -#endif -/* Initial environment variables */ #undef CONFIG_EXTRA_ENV_SETTINGS#ifdef CONFIG_NXP_ESBC
include/configs/ls2080ardb.h +1 -6
@@ -1,6 +1,6 @@/* SPDX-License-Identifier: GPL-2.0+ */ /* -* Copyright 2017, 2019-2020 NXP +* Copyright 2017, 2019-2021 NXP * Copyright 2015 Freescale Semiconductor */
@@ -300,11 +300,6 @@ unsigned long get_board_sys_clk(void);#define CONFIG_PCI_SCAN_SHOW #endif -/* MMC */ -#ifdef CONFIG_MMC -#define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33 -#endif -#define BOOT_TARGET_DEVICES (func) \ func(USB, usb, 0) \ func(MMC, mmc, 0) \
include/configs/lx2160a_common.h +1 -6
@@ -1,6 +1,6 @@/* SPDX-License-Identifier: GPL-2.0+ */ /* -* Copyright 2018-2020 NXP +* Copyright 2018-2021 NXP */ #ifndef __LX2_COMMON_H
@@ -129,11 +129,6 @@#define CONFIG_PCI_SCAN_SHOW #endif -/* MMC */ -#ifdef CONFIG_MMC -#define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33 -#endif -/* SATA */ #ifdef CONFIG_SCSI
scripts/config_whitelist.txt +0 -1
@@ -2307,7 +2307,6 @@ CONFIG_SYS_FSL_MAX_NUM_OF_SEC CONFIG_SYS_FSL_MC9SDZ60_I2C_ADDR CONFIG_SYS_FSL_MC_BASE CONFIG_SYS_FSL_MC_SIZE -CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33 CONFIG_SYS_FSL_NI_BASE CONFIG_SYS_FSL_NI_SIZE CONFIG_SYS_FSL_NO_SERDES
Signature · 1 line
2.25.1
Re: [v3, 3/3] armv8: layerscape: drop CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33
Am 3. Juni 2021 04:51:19 MESZ schrieb Yangbo Lu <[email protected]>:
Quoted 5 lines
Drop
CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33.CONFIG_FSL_ESDHC_VS33_NOT_SUPPORT
is used instead.Signed-off-by Yangbo Lu <[email protected]>