mirror of
https://github.com/Fishwaldo/u-boot.git
synced 2025-03-19 13:41:31 +00:00
i2c: Finish dropping use of CONFIG_I2C_HARD
Drop use of this long-deprecated option. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
parent
64a144dcea
commit
69153988a6
5 changed files with 11 additions and 17 deletions
16
README
16
README
|
@ -2204,7 +2204,9 @@ The following options need to be configured:
|
||||||
|
|
||||||
If you do not have i2c muxes on your board, omit this define.
|
If you do not have i2c muxes on your board, omit this define.
|
||||||
|
|
||||||
- Legacy I2C Support: CONFIG_HARD_I2C
|
----under removal:
|
||||||
|
|
||||||
|
- Legacy I2C Support: CONFIG_SOFT_I2C
|
||||||
|
|
||||||
NOTE: It is intended to move drivers to CONFIG_SYS_I2C which
|
NOTE: It is intended to move drivers to CONFIG_SYS_I2C which
|
||||||
provides the following compelling advantages:
|
provides the following compelling advantages:
|
||||||
|
@ -2213,14 +2215,12 @@ The following options need to be configured:
|
||||||
- approved multibus support
|
- approved multibus support
|
||||||
- better i2c mux support
|
- better i2c mux support
|
||||||
|
|
||||||
** CONFIG_HARD_I2C is now being removed **
|
** CONFIG_SOFT_I2C is now being removed **
|
||||||
|
|
||||||
----under removal:
|
With CONFIG_SOFT_I2C you will need to define
|
||||||
|
CONFIG_SYS_I2C_SPEED to be the frequency (in Hz) at which you
|
||||||
In both cases you will need to define CONFIG_SYS_I2C_SPEED
|
wish your i2c bus to run and CONFIG_SYS_I2C_SLAVE to be the
|
||||||
to be the frequency (in Hz) at which you wish your i2c bus
|
address of this node (ie the CPU's i2c node address).
|
||||||
to run and CONFIG_SYS_I2C_SLAVE to be the address of this node (ie
|
|
||||||
the CPU's i2c node address).
|
|
||||||
|
|
||||||
Now, the u-boot i2c code for the mpc8xx
|
Now, the u-boot i2c code for the mpc8xx
|
||||||
(arch/powerpc/cpu/mpc8xx/i2c.c) sets the CPU up as a master node
|
(arch/powerpc/cpu/mpc8xx/i2c.c) sets the CPU up as a master node
|
||||||
|
|
|
@ -73,11 +73,9 @@ void eeprom_init(int bus)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* I2C EEPROM */
|
/* I2C EEPROM */
|
||||||
#if defined(CONFIG_HARD_I2C) || defined(CONFIG_SYS_I2C)
|
|
||||||
#if defined(CONFIG_SYS_I2C)
|
#if defined(CONFIG_SYS_I2C)
|
||||||
if (bus >= 0)
|
if (bus >= 0)
|
||||||
i2c_set_bus_num(bus);
|
i2c_set_bus_num(bus);
|
||||||
#endif
|
|
||||||
i2c_init(CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
|
i2c_init(CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
|
@ -184,7 +184,7 @@ __weak int dram_init_banksize(void)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
#if defined(CONFIG_HARD_I2C) || defined(CONFIG_SYS_I2C)
|
#if defined(CONFIG_SYS_I2C)
|
||||||
static int init_func_i2c(void)
|
static int init_func_i2c(void)
|
||||||
{
|
{
|
||||||
puts("I2C: ");
|
puts("I2C: ");
|
||||||
|
@ -765,7 +765,7 @@ static const init_fnc_t init_sequence_f[] = {
|
||||||
misc_init_f,
|
misc_init_f,
|
||||||
#endif
|
#endif
|
||||||
INIT_FUNC_WATCHDOG_RESET
|
INIT_FUNC_WATCHDOG_RESET
|
||||||
#if defined(CONFIG_HARD_I2C) || defined(CONFIG_SYS_I2C)
|
#if defined(CONFIG_SYS_I2C)
|
||||||
init_func_i2c,
|
init_func_i2c,
|
||||||
#endif
|
#endif
|
||||||
#if defined(CONFIG_HARD_SPI)
|
#if defined(CONFIG_HARD_SPI)
|
||||||
|
|
|
@ -21,7 +21,7 @@
|
||||||
#include <logbuff.h>
|
#include <logbuff.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(CONFIG_HARD_I2C) || defined(CONFIG_SYS_I2C)
|
#if defined(CONFIG_SYS_I2C)
|
||||||
#include <i2c.h>
|
#include <i2c.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -346,9 +346,6 @@ int stdio_add_devices(void)
|
||||||
#ifdef CONFIG_SYS_I2C
|
#ifdef CONFIG_SYS_I2C
|
||||||
i2c_init_all();
|
i2c_init_all();
|
||||||
#else
|
#else
|
||||||
#if defined(CONFIG_HARD_I2C)
|
|
||||||
i2c_init (CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
|
|
||||||
#endif
|
|
||||||
#endif
|
#endif
|
||||||
#ifdef CONFIG_DM_VIDEO
|
#ifdef CONFIG_DM_VIDEO
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -1134,7 +1134,6 @@ CONFIG_G_DNL_UMS_VENDOR_NUM
|
||||||
CONFIG_H264_FREQ
|
CONFIG_H264_FREQ
|
||||||
CONFIG_H8300
|
CONFIG_H8300
|
||||||
CONFIG_HALEAKALA
|
CONFIG_HALEAKALA
|
||||||
CONFIG_HARD_I2C
|
|
||||||
CONFIG_HARD_SPI
|
CONFIG_HARD_SPI
|
||||||
CONFIG_HASH_VERIFY
|
CONFIG_HASH_VERIFY
|
||||||
CONFIG_HAS_DATAFLASH
|
CONFIG_HAS_DATAFLASH
|
||||||
|
|
Loading…
Add table
Reference in a new issue