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/am33xx/clk_synthesizer.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/am33xx/clk_synthesizer.c')
| -rw-r--r-- | arch/arm/mach-omap2/am33xx/clk_synthesizer.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/am33xx/clk_synthesizer.c b/arch/arm/mach-omap2/am33xx/clk_synthesizer.c index ff1bfaf84b..59f0d8ea71 100644 --- a/arch/arm/mach-omap2/am33xx/clk_synthesizer.c +++ b/arch/arm/mach-omap2/am33xx/clk_synthesizer.c @@ -29,7 +29,7 @@ static int clk_synthesizer_reg_read(struct udevice *dev, int addr, u8 *buf) /* Enable Bye read */ addr = addr | CLK_SYNTHESIZER_BYTE_MODE; -#ifndef CONFIG_DM_I2C +#if !CONFIG_IS_ENABLED(DM_I2C) /* Send the command byte */ rc = i2c_write(CLK_SYNTHESIZER_I2C_ADDR, addr, 1, buf, 1); if (rc) @@ -72,7 +72,7 @@ static int clk_synthesizer_reg_write(struct udevice *dev, int addr, u8 val) cmd[0] = addr | CLK_SYNTHESIZER_BYTE_MODE; cmd[1] = val; -#ifndef CONFIG_DM_I2C +#if !CONFIG_IS_ENABLED(DM_I2C) rc = i2c_write(CLK_SYNTHESIZER_I2C_ADDR, addr, 1, cmd, 2); #else rc = dm_i2c_write(dev, addr, cmd, 2); @@ -96,7 +96,7 @@ int setup_clock_synthesizer(struct clk_synth *data) int rc; u8 val = 0; struct udevice *dev = NULL; -#ifndef CONFIG_DM_I2C +#if !CONFIG_IS_ENABLED(DM_I2C) rc = i2c_probe(CLK_SYNTHESIZER_I2C_ADDR); if (rc) { printf("i2c probe failed at address 0x%x\n", |