diff options
author | Igor Opaniuk <igor.opaniuk@foundries.io> | 2021-02-09 14:52:45 +0300 |
---|---|---|
committer | Heiko Schocher <hs@denx.de> | 2021-02-21 08:08:00 +0300 |
commit | 2147a16983d17bcb0438607aa7760494afc27014 (patch) | |
tree | 153470783919253c3a9bbcbc0e34b38c62f138f1 /include | |
parent | a907dce88e462251d96be9cdd72900543e4798df (diff) | |
download | u-boot-2147a16983d17bcb0438607aa7760494afc27014.tar.xz |
dm: i2c: use CONFIG_IS_ENABLED macro for DM_I2C/DM_I2C_GPIO
Use CONFIG_IS_ENABLED() macro, which provides more convenient
way to check $(SPL)DM_I2C/$(SPL)DM_I2C_GPIO configs
for both SPL and U-Boot proper.
CONFIG_IS_ENABLED(DM_I2C) expands to:
- 1 if CONFIG_SPL_BUILD is undefined and CONFIG_DM_I2C is set to 'y',
- 1 if CONFIG_SPL_BUILD is defined and CONFIG_SPL_DM_I2C is set to 'y',
- 0 otherwise.
All occurences were replaced automatically using these bash cmds:
$ find . -type f -exec sed -i
's/ifndef CONFIG_DM_I2C/if !CONFIG_IS_ENABLED(DM_I2C)/g' {} +
$ find . -type f -exec sed -i
's/ifdef CONFIG_DM_I2C/if CONFIG_IS_ENABLED(DM_I2C)/g' {} +
$ find . -type f -exec sed -i
's/defined(CONFIG_DM_I2C)/CONFIG_IS_ENABLED(DM_I2C)/g' {} +
$ find . -type f -exec sed -i
's/ifndef CONFIG_DM_I2C_GPIO/if !CONFIG_IS_ENABLED(DM_I2C_GPIO)/g' {} +
$ find . -type f -exec sed -i
's/ifdef CONFIG_DM_I2C_GPIO/if CONFIG_IS_ENABLED(DM_I2C_GPIO)/g' {} +
$ find . -type f -exec sed -i
's/defined(CONFIG_DM_I2C_GPIO)/CONFIG_IS_ENABLED(DM_I2C_GPIO)/g' {} +
Reviewed-by: Heiko Schocher <hs@denx.de>
Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Igor Opaniuk <igor.opaniuk@foundries.io>
Reviewed-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Priyanka Jain <priyanka.jain@nxp.com>
Diffstat (limited to 'include')
33 files changed, 33 insertions, 33 deletions
diff --git a/include/_exports.h b/include/_exports.h index aeb666c847..8030d70c0b 100644 --- a/include/_exports.h +++ b/include/_exports.h @@ -40,7 +40,7 @@ EXPORT_FUNC(simple_strtol, long, simple_strtol, const char *, char **, unsigned int) EXPORT_FUNC(strcmp, int, strcmp, const char *cs, const char *ct) -#if defined(CONFIG_CMD_I2C) && !defined(CONFIG_DM_I2C) +#if defined(CONFIG_CMD_I2C) && !CONFIG_IS_ENABLED(DM_I2C) EXPORT_FUNC(i2c_write, int, i2c_write, uchar, uint, int , uchar * , int) EXPORT_FUNC(i2c_read, int, i2c_read, uchar, uint, int , uchar * , int) #else diff --git a/include/config_fallbacks.h b/include/config_fallbacks.h index c18f19a550..a318926fe8 100644 --- a/include/config_fallbacks.h +++ b/include/config_fallbacks.h @@ -46,7 +46,7 @@ #define CONFIG_SYS_MAXARGS 16 #endif -#ifdef CONFIG_DM_I2C +#if CONFIG_IS_ENABLED(DM_I2C) # ifdef CONFIG_SYS_I2C # error "Cannot define CONFIG_SYS_I2C when CONFIG_DM_I2C is used" # endif diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h index 4efc182ef8..0605f70ffc 100644 --- a/include/configs/MPC8548CDS.h +++ b/include/configs/MPC8548CDS.h @@ -296,7 +296,7 @@ extern unsigned long get_clock_freq(void); /* * I2C */ -#ifndef CONFIG_DM_I2C +#if !CONFIG_IS_ENABLED(DM_I2C) #define CONFIG_SYS_I2C #define CONFIG_SYS_FSL_I2C_SPEED 400000 #define CONFIG_SYS_FSL_I2C_SLAVE 0x7F diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h index 806d154328..1b68fd1072 100644 --- a/include/configs/P1010RDB.h +++ b/include/configs/P1010RDB.h @@ -525,7 +525,7 @@ extern unsigned long get_sdram_size(void); #define CONFIG_SYS_NS16550_COM2 (CONFIG_SYS_CCSRBAR+0x4600) /* I2C */ -#ifndef CONFIG_DM_I2C +#if !CONFIG_IS_ENABLED(DM_I2C) #define CONFIG_SYS_I2C #define CONFIG_SYS_FSL_I2C_SPEED 400000 #define CONFIG_SYS_FSL_I2C_SLAVE 0x7F diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h index 65d3dfa0f0..3895c2d0c7 100644 --- a/include/configs/P2041RDB.h +++ b/include/configs/P2041RDB.h @@ -259,7 +259,7 @@ unsigned long get_board_sys_clk(unsigned long dummy); #define CONFIG_SYS_NS16550_COM4 (CONFIG_SYS_CCSRBAR+0x11D600) /* I2C */ -#ifndef CONFIG_DM_I2C +#if !CONFIG_IS_ENABLED(DM_I2C) #define CONFIG_SYS_I2C #define CONFIG_SYS_FSL_I2C_SPEED 400000 #define CONFIG_SYS_FSL_I2C_SLAVE 0x7F diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h index 201da871bd..35b11ad88a 100644 --- a/include/configs/T102xRDB.h +++ b/include/configs/T102xRDB.h @@ -422,7 +422,7 @@ unsigned long get_board_ddr_clk(void); #endif /* I2C */ -#ifndef CONFIG_DM_I2C +#if !CONFIG_IS_ENABLED(DM_I2C) #define CONFIG_SYS_I2C #define CONFIG_SYS_FSL_I2C_SPEED 50000 /* I2C speed in Hz */ #define CONFIG_SYS_FSL_I2C_SLAVE 0x7F diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h index cf0f982375..ea239f74c1 100644 --- a/include/configs/T104xRDB.h +++ b/include/configs/T104xRDB.h @@ -452,7 +452,7 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg #endif /* I2C */ -#ifndef CONFIG_DM_I2C +#if !CONFIG_IS_ENABLED(DM_I2C) #define CONFIG_SYS_I2C #define CONFIG_SYS_FSL_I2C_SPEED 400000 /* I2C speed in Hz */ #define CONFIG_SYS_FSL_I2C2_SPEED 400000 diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h index 1735b170fd..f0ef365a85 100644 --- a/include/configs/T208xQDS.h +++ b/include/configs/T208xQDS.h @@ -377,7 +377,7 @@ unsigned long get_board_ddr_clk(void); /* * I2C */ -#ifndef CONFIG_DM_I2C +#if !CONFIG_IS_ENABLED(DM_I2C) #define CONFIG_SYS_I2C #define CONFIG_SYS_FSL_I2C_SLAVE 0x7F #define CONFIG_SYS_FSL_I2C2_SLAVE 0x7F diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h index 30e38444c0..e467ef453d 100644 --- a/include/configs/T208xRDB.h +++ b/include/configs/T208xRDB.h @@ -322,7 +322,7 @@ unsigned long get_board_ddr_clk(void); /* * I2C */ -#ifndef CONFIG_DM_I2C +#if !CONFIG_IS_ENABLED(DM_I2C) #define CONFIG_SYS_I2C #define CONFIG_SYS_FSL_I2C_SLAVE 0x7F #define CONFIG_SYS_FSL_I2C2_SLAVE 0x7F diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h index 7f831fb8bc..a04d9137b3 100644 --- a/include/configs/T4240RDB.h +++ b/include/configs/T4240RDB.h @@ -154,7 +154,7 @@ #define CONFIG_SYS_NS16550_COM4 (CONFIG_SYS_CCSRBAR+0x11D600) /* I2C */ -#ifndef CONFIG_DM_I2C +#if !CONFIG_IS_ENABLED(DM_I2C) #define CONFIG_SYS_I2C #define CONFIG_SYS_FSL_I2C_SLAVE 0x7F #define CONFIG_SYS_FSL_I2C_OFFSET 0x118000 diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h index 8355b4abc0..6df6b49c80 100644 --- a/include/configs/am43xx_evm.h +++ b/include/configs/am43xx_evm.h @@ -26,7 +26,7 @@ #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2 /* Power */ -#ifndef CONFIG_DM_I2C +#if !CONFIG_IS_ENABLED(DM_I2C) #define CONFIG_POWER #define CONFIG_POWER_I2C #endif diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h index 731f884f40..d0843c284e 100644 --- a/include/configs/corenet_ds.h +++ b/include/configs/corenet_ds.h @@ -269,7 +269,7 @@ #define CONFIG_SYS_NS16550_COM4 (CONFIG_SYS_CCSRBAR+0x11D600) /* I2C */ -#ifndef CONFIG_DM_I2C +#if !CONFIG_IS_ENABLED(DM_I2C) #define CONFIG_SYS_I2C #define CONFIG_SYS_FSL_I2C_SPEED 400000 #define CONFIG_SYS_FSL_I2C_SLAVE 0x7F diff --git a/include/configs/ls1012a_common.h b/include/configs/ls1012a_common.h index f6b5d47c25..a908b0acb0 100644 --- a/include/configs/ls1012a_common.h +++ b/include/configs/ls1012a_common.h @@ -55,7 +55,7 @@ CONFIG_SYS_SCSI_MAX_LUN) /* I2C */ -#ifndef CONFIG_DM_I2C +#if !CONFIG_IS_ENABLED(DM_I2C) #define CONFIG_SYS_I2C #else #define CONFIG_I2C_SET_DEFAULT_BUS_NUM diff --git a/include/configs/ls1021aiot.h b/include/configs/ls1021aiot.h index cf4d60ad60..e2ae6e46c0 100644 --- a/include/configs/ls1021aiot.h +++ b/include/configs/ls1021aiot.h @@ -98,7 +98,7 @@ * I2C */ -#ifndef CONFIG_DM_I2C +#if !CONFIG_IS_ENABLED(DM_I2C) #define CONFIG_SYS_I2C #else #define CONFIG_I2C_SET_DEFAULT_BUS_NUM diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h index b4c70333de..7f65845283 100644 --- a/include/configs/ls1021aqds.h +++ b/include/configs/ls1021aqds.h @@ -330,7 +330,7 @@ unsigned long get_board_ddr_clk(void); /* * I2C */ -#ifndef CONFIG_DM_I2C +#if !CONFIG_IS_ENABLED(DM_I2C) #define CONFIG_SYS_I2C #else #define CONFIG_I2C_SET_DEFAULT_BUS_NUM diff --git a/include/configs/ls1021atsn.h b/include/configs/ls1021atsn.h index 996c970ec8..f76d5a1bd7 100644 --- a/include/configs/ls1021atsn.h +++ b/include/configs/ls1021atsn.h @@ -104,7 +104,7 @@ #define CONFIG_SYS_NS16550_CLK get_serial_clock() /* I2C */ -#ifndef CONFIG_DM_I2C +#if !CONFIG_IS_ENABLED(DM_I2C) #define CONFIG_SYS_I2C #else #define CONFIG_I2C_SET_DEFAULT_BUS_NUM diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h index 068e744a61..d6783db2c2 100644 --- a/include/configs/ls1021atwr.h +++ b/include/configs/ls1021atwr.h @@ -208,7 +208,7 @@ /* * I2C */ -#ifndef CONFIG_DM_I2C +#if !CONFIG_IS_ENABLED(DM_I2C) #define CONFIG_SYS_I2C #else #define CONFIG_I2C_SET_DEFAULT_BUS_NUM diff --git a/include/configs/ls1028a_common.h b/include/configs/ls1028a_common.h index 1c4af7d176..31fcdae986 100644 --- a/include/configs/ls1028a_common.h +++ b/include/configs/ls1028a_common.h @@ -44,7 +44,7 @@ #endif /* I2C */ -#ifndef CONFIG_DM_I2C +#if !CONFIG_IS_ENABLED(DM_I2C) #define CONFIG_SYS_I2C #endif diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h index 4e3e1a946b..29a3790c45 100644 --- a/include/configs/ls1043a_common.h +++ b/include/configs/ls1043a_common.h @@ -149,7 +149,7 @@ #endif /* I2C */ -#ifndef CONFIG_DM_I2C +#if !CONFIG_IS_ENABLED(DM_I2C) #define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_MXC_I2C1 /* enable I2C bus 1 */ #define CONFIG_SYS_I2C_MXC_I2C2 /* enable I2C bus 2 */ diff --git a/include/configs/ls1046a_common.h b/include/configs/ls1046a_common.h index 0c32fceec2..0c3978a922 100644 --- a/include/configs/ls1046a_common.h +++ b/include/configs/ls1046a_common.h @@ -133,7 +133,7 @@ #endif /* I2C */ -#ifndef CONFIG_DM_I2C +#if !CONFIG_IS_ENABLED(DM_I2C) #define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_MXC_I2C1 /* enable I2C bus 1 */ #define CONFIG_SYS_I2C_MXC_I2C2 /* enable I2C bus 2 */ diff --git a/include/configs/ls1088a_common.h b/include/configs/ls1088a_common.h index b9a956b90b..d574e7e592 100644 --- a/include/configs/ls1088a_common.h +++ b/include/configs/ls1088a_common.h @@ -61,7 +61,7 @@ #endif /* I2C */ -#ifndef CONFIG_DM_I2C +#if !CONFIG_IS_ENABLED(DM_I2C) #define CONFIG_SYS_I2C #endif diff --git a/include/configs/ls1088aqds.h b/include/configs/ls1088aqds.h index 1626e65056..0dcf844303 100644 --- a/include/configs/ls1088aqds.h +++ b/include/configs/ls1088aqds.h @@ -26,7 +26,7 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_DDR_CLK_FREQ 100000000 #else #define CONFIG_QIXIS_I2C_ACCESS -#ifndef CONFIG_DM_I2C +#if !CONFIG_IS_ENABLED(DM_I2C) #define CONFIG_SYS_I2C_EARLY_INIT #endif #define CONFIG_SYS_CLK_FREQ get_board_sys_clk() diff --git a/include/configs/ls2080a_common.h b/include/configs/ls2080a_common.h index 1042555a8c..2ed6584073 100644 --- a/include/configs/ls2080a_common.h +++ b/include/configs/ls2080a_common.h @@ -74,7 +74,7 @@ #endif /* I2C */ -#ifndef CONFIG_DM_I2C +#if !CONFIG_IS_ENABLED(DM_I2C) #define CONFIG_SYS_I2C #endif diff --git a/include/configs/ls2080aqds.h b/include/configs/ls2080aqds.h index 9e174afb92..b3fce1b7f7 100644 --- a/include/configs/ls2080aqds.h +++ b/include/configs/ls2080aqds.h @@ -16,7 +16,7 @@ unsigned long get_board_ddr_clk(void); #ifdef CONFIG_FSL_QSPI #define CONFIG_QIXIS_I2C_ACCESS -#ifndef CONFIG_DM_I2C +#if !CONFIG_IS_ENABLED(DM_I2C) #define CONFIG_SYS_I2C_EARLY_INIT #endif #define CONFIG_SYS_I2C_IFDR_DIV 0x7e diff --git a/include/configs/ls2080ardb.h b/include/configs/ls2080ardb.h index ab4214c265..8626a1d5e6 100644 --- a/include/configs/ls2080ardb.h +++ b/include/configs/ls2080ardb.h @@ -13,7 +13,7 @@ #ifdef CONFIG_TARGET_LS2081ARDB #define CONFIG_QIXIS_I2C_ACCESS #endif -#ifndef CONFIG_DM_I2C +#if !CONFIG_IS_ENABLED(DM_I2C) #define CONFIG_SYS_I2C_EARLY_INIT #endif #endif diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index a9bf213d8b..066311a97e 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -463,7 +463,7 @@ #define CONFIG_SYS_NS16550_COM2 (CONFIG_SYS_CCSRBAR+0x4600) /* I2C */ -#ifndef CONFIG_DM_I2C +#if !CONFIG_IS_ENABLED(DM_I2C) #define CONFIG_SYS_I2C #define CONFIG_SYS_FSL_I2C_SPEED 400000 #define CONFIG_SYS_FSL_I2C_SLAVE 0x7F diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h index ded5aea551..7b602dd9ea 100644 --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h @@ -198,7 +198,7 @@ defined CONFIG_I2C2_ENABLE || defined CONFIG_I2C3_ENABLE || \ defined CONFIG_I2C4_ENABLE || defined CONFIG_R_I2C_ENABLE #define CONFIG_SYS_I2C_MVTWSI -#ifndef CONFIG_DM_I2C +#if !CONFIG_IS_ENABLED(DM_I2C) #define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_SPEED 400000 #define CONFIG_SYS_I2C_SLAVE 0x7f diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h index 0c9856a11a..f13e9e5264 100644 --- a/include/configs/ti_armv7_common.h +++ b/include/configs/ti_armv7_common.h @@ -87,7 +87,7 @@ #define CONFIG_SYS_PTV 2 /* Divisor: 2^(PTV+1) => 8 */ /* If DM_I2C, enable non-DM I2C support */ -#if !defined(CONFIG_DM_I2C) +#if !CONFIG_IS_ENABLED(DM_I2C) #define CONFIG_I2C #define CONFIG_SYS_I2C #endif diff --git a/include/exports.h b/include/exports.h index 99436e4132..550cafdc7a 100644 --- a/include/exports.h +++ b/include/exports.h @@ -49,7 +49,7 @@ long simple_strtol(const char *cp, char **endp, unsigned int base); int strcmp(const char *cs, const char *ct); unsigned long ustrtoul(const char *cp, char **endp, unsigned int base); unsigned long long ustrtoull(const char *cp, char **endp, unsigned int base); -#if defined(CONFIG_CMD_I2C) && !defined(CONFIG_DM_I2C) +#if defined(CONFIG_CMD_I2C) && !CONFIG_IS_ENABLED(DM_I2C) int i2c_write (uchar, uint, int , uchar* , int); int i2c_read (uchar, uint, int , uchar* , int); #endif diff --git a/include/i2c.h b/include/i2c.h index e45e33f503..7ae0c42706 100644 --- a/include/i2c.h +++ b/include/i2c.h @@ -581,7 +581,7 @@ extern struct acpi_ops i2c_acpi_ops; */ int acpi_i2c_of_to_plat(struct udevice *dev); -#ifndef CONFIG_DM_I2C +#if !CONFIG_IS_ENABLED(DM_I2C) /* * WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING diff --git a/include/palmas.h b/include/palmas.h index 20c7e489c1..e259a4d04b 100644 --- a/include/palmas.h +++ b/include/palmas.h @@ -117,7 +117,7 @@ #define BB_VSEL_VBAT (3 << 1) #define BB_CHRG_EN (1 << 0) -#ifndef CONFIG_DM_I2C +#if !CONFIG_IS_ENABLED(DM_I2C) /* * Functions to read and write from TPS659038/TWL6035/TWL6037 * or other Palmas family of TI PMICs diff --git a/include/twl4030.h b/include/twl4030.h index ef05193996..0a6d85a7c1 100644 --- a/include/twl4030.h +++ b/include/twl4030.h @@ -648,7 +648,7 @@ * examples are TWL4030_PM_RECEIVER_VMMC1_DEV_GRP and * TWL4030_LED_LEDEN. */ -#ifndef CONFIG_DM_I2C +#if !CONFIG_IS_ENABLED(DM_I2C) static inline int twl4030_i2c_write_u8(u8 chip_no, u8 reg, u8 val) { return i2c_write(chip_no, reg, 1, &val, 1); diff --git a/include/twl6030.h b/include/twl6030.h index 41f17de3ab..05d476f804 100644 --- a/include/twl6030.h +++ b/include/twl6030.h @@ -186,7 +186,7 @@ struct twl6030_data{ }; /* Functions to read and write from TWL6030 */ -#ifndef CONFIG_DM_I2C +#if !CONFIG_IS_ENABLED(DM_I2C) static inline int twl6030_i2c_write_u8(u8 chip_no, u8 reg, u8 val) { return i2c_write(chip_no, reg, 1, &val, 1); |