diff options
| author | Tom Rini <trini@konsulko.com> | 2021-02-21 11:17:07 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-02-21 11:17:07 -0500 |
| commit | b732c8780c3f7b47b00bd59e5f6ad7d6ec099d68 (patch) | |
| tree | 2e4d72720d9254f7ba8be5a981368d77d92f91dc /arch/arm/mach-omap2/clocks-common.c | |
| parent | 72993e8e03845f82c3ccf7c72f205c9afd8da6d6 (diff) | |
| parent | 2147a16983d17bcb0438607aa7760494afc27014 (diff) | |
Merge tag 'for-v2021.04' of https://gitlab.denx.de/u-boot/custodians/u-boot-i2c
i2c changes for v2021.04
new feature:
- Allow disabling driver model for I2C in SPL
fixes:
- i2c-gpio: Fix GPIO output
- at91: fix crash when using 'i2c probe'
Diffstat (limited to 'arch/arm/mach-omap2/clocks-common.c')
| -rw-r--r-- | arch/arm/mach-omap2/clocks-common.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/clocks-common.c b/arch/arm/mach-omap2/clocks-common.c index 757fa3801a..14b638a651 100644 --- a/arch/arm/mach-omap2/clocks-common.c +++ b/arch/arm/mach-omap2/clocks-common.c @@ -912,7 +912,7 @@ void prcm_init(void) enable_basic_uboot_clocks(); } -#if !defined(CONFIG_DM_I2C) +#if !CONFIG_IS_ENABLED(DM_I2C) void gpi2c_init(void) { static int gpi2c = 1; |