Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-23 05:08:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Convert CONFIG_SYS_I2C_EARLY_INIT to Kconfig

Browse source 
Convert SYS_I2C_EARLY_INIT to Kconfig, and make it depend on
SPL_SYS_I2C_LEGACY.  Remove the weak implementation as it's either
something that needs to exist for real, or shouldn't be called.

Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Tom Rini 2021-08-18 23:12:25 -04:00
parent 55dabcc8f2
commit 52c7e37596
31 changed files with 33 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
arch/arm/include/asm/arch-fsl-layerscape/config.h
View file

@ -183,9 +183,6 @@
#elif defined(CONFIG_ARCH_LX2160A) || defined(CONFIG_ARCH_LX2162A) #elif defined(CONFIG_ARCH_LX2160A) || defined(CONFIG_ARCH_LX2162A)
#define TZPC_BASE 0x02200000 #define TZPC_BASE 0x02200000
#define TZPCDECPROT_0_SET_BASE (TZPC_BASE + 0x804) #define TZPCDECPROT_0_SET_BASE (TZPC_BASE + 0x804)
#if !CONFIG_IS_ENABLED(DM_I2C)
#define CONFIG_SYS_I2C_EARLY_INIT
#endif
#define SRDS_MAX_LANES 8 #define SRDS_MAX_LANES 8
#ifndef L1_CACHE_BYTES #ifndef L1_CACHE_BYTES
#define L1_CACHE_SHIFT 6 #define L1_CACHE_SHIFT 6

2
board/freescale/ls1028a/ls1028a.c
View file

@ -137,7 +137,7 @@ int board_early_init_f(void)
u8 uart; u8 uart;
#endif #endif
#ifdef CONFIG_SYS_I2C_EARLY_INIT #if defined(CONFIG_SYS_I2C_EARLY_INIT) && defined(CONFIG_SPL_BUILD)
i2c_early_init_f(); i2c_early_init_f();
#endif #endif

6
board/freescale/ls1043aqds/ls1043aqds.c
View file

@ -52,10 +52,6 @@ enum {
#define CFG_UART_MUX_SHIFT 1 #define CFG_UART_MUX_SHIFT 1
#define CFG_LPUART_EN 0x1 #define CFG_LPUART_EN 0x1
#ifdef CONFIG_SYS_I2C_EARLY_INIT
void i2c_early_init_f(void);
#endif
#ifdef CONFIG_TFABOOT #ifdef CONFIG_TFABOOT
struct ifc_regs ifc_cfg_nor_boot[CONFIG_SYS_FSL_IFC_BANK_COUNT] = { struct ifc_regs ifc_cfg_nor_boot[CONFIG_SYS_FSL_IFC_BANK_COUNT] = {
{ {
@ -447,7 +443,7 @@ int board_early_init_f(void)
*/ */
out_le32(cntcr, 0x1); out_le32(cntcr, 0x1);
#ifdef CONFIG_SYS_I2C_EARLY_INIT #if defined(CONFIG_SYS_I2C_EARLY_INIT)
i2c_early_init_f(); i2c_early_init_f();
#endif #endif
fsl_lsch2_early_init_f(); fsl_lsch2_early_init_f();

6
board/freescale/ls1046aqds/ls1046aqds.c
View file

@ -37,10 +37,6 @@
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
#ifdef CONFIG_SYS_I2C_EARLY_INIT
void i2c_early_init_f(void);
#endif
#ifdef CONFIG_TFABOOT #ifdef CONFIG_TFABOOT
struct ifc_regs ifc_cfg_nor_boot[CONFIG_SYS_FSL_IFC_BANK_COUNT] = { struct ifc_regs ifc_cfg_nor_boot[CONFIG_SYS_FSL_IFC_BANK_COUNT] = {
{ {
@ -318,7 +314,7 @@ int board_early_init_f(void)
*/ */
out_le32(cntcr, 0x1); out_le32(cntcr, 0x1);
#ifdef CONFIG_SYS_I2C_EARLY_INIT #if defined(CONFIG_SYS_I2C_EARLY_INIT)
i2c_early_init_f(); i2c_early_init_f();
#endif #endif
fsl_lsch2_early_init_f(); fsl_lsch2_early_init_f();

2
board/freescale/ls2080aqds/ls2080aqds.c
View file

@ -241,7 +241,7 @@ int board_init(void)
int board_early_init_f(void) int board_early_init_f(void)
{ {
#ifdef CONFIG_SYS_I2C_EARLY_INIT #if defined(CONFIG_SYS_I2C_EARLY_INIT)
i2c_early_init_f(); i2c_early_init_f();
#endif #endif
fsl_lsch3_early_init_f(); fsl_lsch3_early_init_f();

2
board/freescale/ls2080ardb/ls2080ardb.c
View file

@ -314,7 +314,7 @@ int board_init(void)
int board_early_init_f(void) int board_early_init_f(void)
{ {
#ifdef CONFIG_SYS_I2C_EARLY_INIT #if defined(CONFIG_SYS_I2C_EARLY_INIT)
i2c_early_init_f(); i2c_early_init_f();
#endif #endif
fsl_lsch3_early_init_f(); fsl_lsch3_early_init_f();

2
board/freescale/lx2160a/lx2160a.c
View file

@ -89,7 +89,7 @@ static void uart_get_clock(void)
int board_early_init_f(void) int board_early_init_f(void)
{ {
#ifdef CONFIG_SYS_I2C_EARLY_INIT #if defined(CONFIG_SYS_I2C_EARLY_INIT) && defined(CONFIG_SPL_BUILD)
i2c_early_init_f(); i2c_early_init_f();
#endif #endif
/* get required clock for UART IP */ /* get required clock for UART IP */

1
configs/ls1043aqds_qspi_defconfig
View file

@ -45,6 +45,7 @@ CONFIG_SATA_CEVA=y
CONFIG_FSL_CAAM=y CONFIG_FSL_CAAM=y
CONFIG_DM_I2C=y CONFIG_DM_I2C=y
CONFIG_SPL_SYS_I2C_LEGACY=y CONFIG_SPL_SYS_I2C_LEGACY=y
CONFIG_SYS_I2C_EARLY_INIT=y
CONFIG_SYS_I2C_EEPROM_ADDR=0x57 CONFIG_SYS_I2C_EEPROM_ADDR=0x57
CONFIG_FSL_ESDHC=y CONFIG_FSL_ESDHC=y
# CONFIG_SPI_FLASH_BAR is not set # CONFIG_SPI_FLASH_BAR is not set

1
configs/ls1043aqds_sdcard_qspi_defconfig
View file

@ -58,6 +58,7 @@ CONFIG_SATA_CEVA=y
CONFIG_FSL_CAAM=y CONFIG_FSL_CAAM=y
CONFIG_DM_I2C=y CONFIG_DM_I2C=y
CONFIG_SPL_SYS_I2C_LEGACY=y CONFIG_SPL_SYS_I2C_LEGACY=y
CONFIG_SYS_I2C_EARLY_INIT=y
CONFIG_SYS_I2C_EEPROM_ADDR=0x57 CONFIG_SYS_I2C_EEPROM_ADDR=0x57
CONFIG_FSL_ESDHC=y CONFIG_FSL_ESDHC=y
# CONFIG_SPI_FLASH_BAR is not set # CONFIG_SPI_FLASH_BAR is not set

1
configs/ls1043aqds_tfa_SECURE_BOOT_defconfig
View file

@ -42,6 +42,7 @@ CONFIG_DM=y
CONFIG_SATA_CEVA=y CONFIG_SATA_CEVA=y
CONFIG_DM_I2C=y CONFIG_DM_I2C=y
CONFIG_SPL_SYS_I2C_LEGACY=y CONFIG_SPL_SYS_I2C_LEGACY=y
CONFIG_SYS_I2C_EARLY_INIT=y
CONFIG_SYS_I2C_EEPROM_ADDR=0x57 CONFIG_SYS_I2C_EEPROM_ADDR=0x57
CONFIG_FSL_ESDHC=y CONFIG_FSL_ESDHC=y
CONFIG_MTD=y CONFIG_MTD=y

1
configs/ls1043aqds_tfa_defconfig
View file

@ -52,6 +52,7 @@ CONFIG_SATA_CEVA=y
CONFIG_FSL_CAAM=y CONFIG_FSL_CAAM=y
CONFIG_DM_I2C=y CONFIG_DM_I2C=y
CONFIG_SPL_SYS_I2C_LEGACY=y CONFIG_SPL_SYS_I2C_LEGACY=y
CONFIG_SYS_I2C_EARLY_INIT=y
CONFIG_SYS_I2C_EEPROM_ADDR=0x57 CONFIG_SYS_I2C_EEPROM_ADDR=0x57
CONFIG_FSL_ESDHC=y CONFIG_FSL_ESDHC=y
CONFIG_MTD=y CONFIG_MTD=y

1
configs/ls1046aqds_qspi_defconfig
View file

@ -44,6 +44,7 @@ CONFIG_DM=y
CONFIG_SATA_CEVA=y CONFIG_SATA_CEVA=y
CONFIG_FSL_CAAM=y CONFIG_FSL_CAAM=y
CONFIG_DM_I2C=y CONFIG_DM_I2C=y
CONFIG_SYS_I2C_EARLY_INIT=y
CONFIG_SYS_I2C_EEPROM_ADDR=0x57 CONFIG_SYS_I2C_EEPROM_ADDR=0x57
CONFIG_FSL_ESDHC=y CONFIG_FSL_ESDHC=y
# CONFIG_SPI_FLASH_BAR is not set # CONFIG_SPI_FLASH_BAR is not set

1
configs/ls1046aqds_sdcard_qspi_defconfig
View file

@ -59,6 +59,7 @@ CONFIG_DM=y
CONFIG_SATA_CEVA=y CONFIG_SATA_CEVA=y
CONFIG_FSL_CAAM=y CONFIG_FSL_CAAM=y
CONFIG_DM_I2C=y CONFIG_DM_I2C=y
CONFIG_SYS_I2C_EARLY_INIT=y
CONFIG_SYS_I2C_EEPROM_ADDR=0x57 CONFIG_SYS_I2C_EEPROM_ADDR=0x57
CONFIG_FSL_ESDHC=y CONFIG_FSL_ESDHC=y
# CONFIG_SPI_FLASH_BAR is not set # CONFIG_SPI_FLASH_BAR is not set

1
configs/ls1046aqds_tfa_SECURE_BOOT_defconfig
View file

@ -42,6 +42,7 @@ CONFIG_ENV_OVERWRITE=y
CONFIG_DM=y CONFIG_DM=y
CONFIG_SATA_CEVA=y CONFIG_SATA_CEVA=y
CONFIG_DM_I2C=y CONFIG_DM_I2C=y
CONFIG_SYS_I2C_EARLY_INIT=y
CONFIG_SYS_I2C_EEPROM_ADDR=0x57 CONFIG_SYS_I2C_EEPROM_ADDR=0x57
CONFIG_FSL_ESDHC=y CONFIG_FSL_ESDHC=y
CONFIG_MTD=y CONFIG_MTD=y

1
configs/ls1046aqds_tfa_defconfig
View file

@ -51,6 +51,7 @@ CONFIG_DM=y
CONFIG_SATA_CEVA=y CONFIG_SATA_CEVA=y
CONFIG_FSL_CAAM=y CONFIG_FSL_CAAM=y
CONFIG_DM_I2C=y CONFIG_DM_I2C=y
CONFIG_SYS_I2C_EARLY_INIT=y
CONFIG_SYS_I2C_EEPROM_ADDR=0x57 CONFIG_SYS_I2C_EEPROM_ADDR=0x57
CONFIG_FSL_ESDHC=y CONFIG_FSL_ESDHC=y
CONFIG_MTD=y CONFIG_MTD=y

1
configs/ls1088aqds_defconfig
View file

@ -46,6 +46,7 @@ CONFIG_DM=y
CONFIG_SCSI_AHCI=y CONFIG_SCSI_AHCI=y
CONFIG_SATA_CEVA=y CONFIG_SATA_CEVA=y
CONFIG_SYS_I2C_LEGACY=y CONFIG_SYS_I2C_LEGACY=y
CONFIG_SYS_I2C_EARLY_INIT=y
CONFIG_SYS_I2C_EEPROM_ADDR=0x57 CONFIG_SYS_I2C_EEPROM_ADDR=0x57
CONFIG_FSL_ESDHC=y CONFIG_FSL_ESDHC=y
CONFIG_MTD=y CONFIG_MTD=y

1
configs/ls1088aqds_sdcard_ifc_defconfig
View file

@ -57,6 +57,7 @@ CONFIG_DM=y
CONFIG_SCSI_AHCI=y CONFIG_SCSI_AHCI=y
CONFIG_SATA_CEVA=y CONFIG_SATA_CEVA=y
CONFIG_SYS_I2C_LEGACY=y CONFIG_SYS_I2C_LEGACY=y
CONFIG_SYS_I2C_EARLY_INIT=y
CONFIG_SYS_I2C_EEPROM_ADDR=0x57 CONFIG_SYS_I2C_EEPROM_ADDR=0x57
CONFIG_FSL_ESDHC=y CONFIG_FSL_ESDHC=y
CONFIG_MTD=y CONFIG_MTD=y

1
configs/ls2080aqds_nand_defconfig
View file

@ -53,6 +53,7 @@ CONFIG_DM=y
CONFIG_SATA_CEVA=y CONFIG_SATA_CEVA=y
CONFIG_FSL_CAAM=y CONFIG_FSL_CAAM=y
CONFIG_SYS_I2C_LEGACY=y CONFIG_SYS_I2C_LEGACY=y
CONFIG_SYS_I2C_EARLY_INIT=y
CONFIG_SYS_I2C_EEPROM_ADDR=0x57 CONFIG_SYS_I2C_EEPROM_ADDR=0x57
CONFIG_FSL_ESDHC=y CONFIG_FSL_ESDHC=y
CONFIG_MTD=y CONFIG_MTD=y

1
configs/ls2080aqds_qspi_defconfig
View file

@ -44,6 +44,7 @@ CONFIG_DM=y
CONFIG_SATA_CEVA=y CONFIG_SATA_CEVA=y
CONFIG_FSL_CAAM=y CONFIG_FSL_CAAM=y
CONFIG_SYS_I2C_LEGACY=y CONFIG_SYS_I2C_LEGACY=y
CONFIG_SYS_I2C_EARLY_INIT=y
CONFIG_SYS_I2C_EEPROM_ADDR=0x57 CONFIG_SYS_I2C_EEPROM_ADDR=0x57
CONFIG_FSL_ESDHC=y CONFIG_FSL_ESDHC=y
CONFIG_MTD=y CONFIG_MTD=y

1
configs/ls2080aqds_sdcard_defconfig
View file

@ -50,6 +50,7 @@ CONFIG_NET_RANDOM_ETHADDR=y
CONFIG_DM=y CONFIG_DM=y
CONFIG_SATA_CEVA=y CONFIG_SATA_CEVA=y
CONFIG_SYS_I2C_LEGACY=y CONFIG_SYS_I2C_LEGACY=y
CONFIG_SYS_I2C_EARLY_INIT=y
CONFIG_SYS_I2C_EEPROM_ADDR=0x57 CONFIG_SYS_I2C_EEPROM_ADDR=0x57
CONFIG_FSL_ESDHC=y CONFIG_FSL_ESDHC=y
CONFIG_MTD=y CONFIG_MTD=y

1
configs/ls2081ardb_defconfig
View file

@ -41,6 +41,7 @@ CONFIG_SCSI_AHCI=y
CONFIG_SATA_CEVA=y CONFIG_SATA_CEVA=y
CONFIG_FSL_CAAM=y CONFIG_FSL_CAAM=y
CONFIG_SYS_I2C_LEGACY=y CONFIG_SYS_I2C_LEGACY=y
CONFIG_SYS_I2C_EARLY_INIT=y
CONFIG_SYS_I2C_EEPROM_ADDR=0x57 CONFIG_SYS_I2C_EEPROM_ADDR=0x57
CONFIG_FSL_ESDHC=y CONFIG_FSL_ESDHC=y
CONFIG_MTD=y CONFIG_MTD=y

1
configs/ls2088ardb_qspi_SECURE_BOOT_defconfig
View file

@ -37,6 +37,7 @@ CONFIG_NET_RANDOM_ETHADDR=y
CONFIG_DM=y CONFIG_DM=y
CONFIG_SATA_CEVA=y CONFIG_SATA_CEVA=y
CONFIG_SYS_I2C_LEGACY=y CONFIG_SYS_I2C_LEGACY=y
CONFIG_SYS_I2C_EARLY_INIT=y
CONFIG_SYS_I2C_EEPROM_ADDR=0x57 CONFIG_SYS_I2C_EEPROM_ADDR=0x57
CONFIG_FSL_ESDHC=y CONFIG_FSL_ESDHC=y
CONFIG_MTD=y CONFIG_MTD=y

1
configs/ls2088ardb_qspi_defconfig
View file

@ -44,6 +44,7 @@ CONFIG_DM=y
CONFIG_SATA_CEVA=y CONFIG_SATA_CEVA=y
CONFIG_FSL_CAAM=y CONFIG_FSL_CAAM=y
CONFIG_SYS_I2C_LEGACY=y CONFIG_SYS_I2C_LEGACY=y
CONFIG_SYS_I2C_EARLY_INIT=y
CONFIG_SYS_I2C_EEPROM_ADDR=0x57 CONFIG_SYS_I2C_EEPROM_ADDR=0x57
CONFIG_FSL_ESDHC=y CONFIG_FSL_ESDHC=y
CONFIG_MTD=y CONFIG_MTD=y

7
drivers/i2c/Kconfig
View file

@ -69,6 +69,13 @@ config TPL_SYS_I2C_LEGACY
Enable the legacy I2C subsystem and drivers in TPL. This is useful Enable the legacy I2C subsystem and drivers in TPL. This is useful
in some size constrained situations. in some size constrained situations.
config SYS_I2C_EARLY_INIT
bool "Enable legacy I2C subsystem early in boot"
depends on BOARD_EARLY_INIT_F && SPL_SYS_I2C_LEGACY && SYS_I2C_MXC
help
Add the function prototype for i2c_early_init_f which is called in
board_early_init_f.
config I2C_CROS_EC_TUNNEL config I2C_CROS_EC_TUNNEL
tristate "Chrome OS EC tunnel I2C bus" tristate "Chrome OS EC tunnel I2C bus"
depends on CROS_EC depends on CROS_EC

5
drivers/i2c/i2c_core.c
View file

@ -190,11 +190,6 @@ __weak void i2c_init_board(void)
{ {
} }
/* implement possible for i2c specific early i2c init */
__weak void i2c_early_init_f(void)
{
}
/* /*
* i2c_init_all(): * i2c_init_all():
* *

1
include/configs/ls1043aqds.h
View file

@ -186,7 +186,6 @@ unsigned long get_board_ddr_clk(void);
#if defined(CONFIG_TFABOOT) || \ #if defined(CONFIG_TFABOOT) || \
defined(CONFIG_QSPI_BOOT) || defined(CONFIG_SD_BOOT_QSPI) defined(CONFIG_QSPI_BOOT) || defined(CONFIG_SD_BOOT_QSPI)
#define CONFIG_QIXIS_I2C_ACCESS #define CONFIG_QIXIS_I2C_ACCESS
#define CONFIG_SYS_I2C_EARLY_INIT
#endif #endif
/* /*

1
include/configs/ls1046aqds.h
View file

@ -204,7 +204,6 @@ unsigned long get_board_ddr_clk(void);
#if defined(CONFIG_TFABOOT) || \ #if defined(CONFIG_TFABOOT) || \
defined(CONFIG_QSPI_BOOT) || defined(CONFIG_SD_BOOT_QSPI) defined(CONFIG_QSPI_BOOT) || defined(CONFIG_SD_BOOT_QSPI)
#define CONFIG_QIXIS_I2C_ACCESS #define CONFIG_QIXIS_I2C_ACCESS
#define CONFIG_SYS_I2C_EARLY_INIT
#endif #endif
/* /*

3
include/configs/ls1088aqds.h
View file

@ -26,9 +26,6 @@ unsigned long get_board_ddr_clk(void);
#define CONFIG_DDR_CLK_FREQ 100000000 #define CONFIG_DDR_CLK_FREQ 100000000
#else #else
#define CONFIG_QIXIS_I2C_ACCESS #define CONFIG_QIXIS_I2C_ACCESS
#if !CONFIG_IS_ENABLED(DM_I2C)
#define CONFIG_SYS_I2C_EARLY_INIT
#endif
#define CONFIG_SYS_CLK_FREQ get_board_sys_clk() #define CONFIG_SYS_CLK_FREQ get_board_sys_clk()
#define CONFIG_DDR_CLK_FREQ get_board_ddr_clk() #define CONFIG_DDR_CLK_FREQ get_board_ddr_clk()
#endif #endif

3
include/configs/ls2080aqds.h
View file

@ -16,9 +16,6 @@ unsigned long get_board_ddr_clk(void);
#ifdef CONFIG_FSL_QSPI #ifdef CONFIG_FSL_QSPI
#define CONFIG_QIXIS_I2C_ACCESS #define CONFIG_QIXIS_I2C_ACCESS
#if !CONFIG_IS_ENABLED(DM_I2C)
#define CONFIG_SYS_I2C_EARLY_INIT
#endif
#define CONFIG_SYS_I2C_IFDR_DIV 0x7e #define CONFIG_SYS_I2C_IFDR_DIV 0x7e
#endif #endif

3
include/configs/ls2080ardb.h
View file

@ -13,9 +13,6 @@
#ifdef CONFIG_TARGET_LS2081ARDB #ifdef CONFIG_TARGET_LS2081ARDB
#define CONFIG_QIXIS_I2C_ACCESS #define CONFIG_QIXIS_I2C_ACCESS
#endif #endif
#if !CONFIG_IS_ENABLED(DM_I2C)
#define CONFIG_SYS_I2C_EARLY_INIT
#endif
#endif #endif
#define I2C_MUX_CH_VOL_MONITOR 0xa #define I2C_MUX_CH_VOL_MONITOR 0xa

7
include/i2c.h
View file

@ -610,6 +610,10 @@ extern struct acpi_ops i2c_acpi_ops;
*/ */
int acpi_i2c_of_to_plat(struct udevice *dev); int acpi_i2c_of_to_plat(struct udevice *dev);
#ifdef CONFIG_SYS_I2C_EARLY_INIT
void i2c_early_init_f(void);
#endif
#if !CONFIG_IS_ENABLED(DM_I2C) #if !CONFIG_IS_ENABLED(DM_I2C)
/* /*
@ -756,9 +760,6 @@ extern struct i2c_bus_hose i2c_bus[];
* Initialization, must be called once on start up, may be called * Initialization, must be called once on start up, may be called
* repeatedly to change the speed and slave addresses. * repeatedly to change the speed and slave addresses.
*/ */
#ifdef CONFIG_SYS_I2C_EARLY_INIT
void i2c_early_init_f(void);
#endif
void i2c_init(int speed, int slaveaddr); void i2c_init(int speed, int slaveaddr);
void i2c_init_board(void); void i2c_init_board(void);