提交 ac1d8ac8 编写于 作者: A Adam Ford 提交者: Tom Rini

Configs: Migrate I2C_BUS_MAX to CONFIG_SYS_I2C_BUS_MAX

For consistency with other platforms and in preparation of Kconfig
migration, let's change Several TI platforms that use I2C_BUS_MAX
to CONFIG_SYS_I2C_BUS_MAX
Signed-off-by: NAdam Ford <aford173@gmail.com>
上级 48f6232e
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
#define I2C_BASE1 0x44E0B000 #define I2C_BASE1 0x44E0B000
#define I2C_BASE2 0x4802A000 #define I2C_BASE2 0x4802A000
#define I2C_BASE3 0x4819C000 #define I2C_BASE3 0x4819C000
#define I2C_BUS_MAX 3 #define CONFIG_SYS_I2C_BUS_MAX 3
#define I2C_DEFAULT_BASE I2C_BASE1 #define I2C_DEFAULT_BASE I2C_BASE1
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
#ifndef _OMAP3_I2C_H_ #ifndef _OMAP3_I2C_H_
#define _OMAP3_I2C_H_ #define _OMAP3_I2C_H_
#define I2C_BUS_MAX 3 #define CONFIG_SYS_I2C_BUS_MAX 3
#define I2C_DEFAULT_BASE I2C_BASE1 #define I2C_DEFAULT_BASE I2C_BASE1
struct i2c { struct i2c {
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
#ifndef _OMAP4_I2C_H_ #ifndef _OMAP4_I2C_H_
#define _OMAP4_I2C_H_ #define _OMAP4_I2C_H_
#define I2C_BUS_MAX 4 #define CONFIG_SYS_I2C_BUS_MAX 4
#define I2C_DEFAULT_BASE I2C_BASE1 #define I2C_DEFAULT_BASE I2C_BASE1
struct i2c { struct i2c {
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
#ifndef _OMAP5_I2C_H_ #ifndef _OMAP5_I2C_H_
#define _OMAP5_I2C_H_ #define _OMAP5_I2C_H_
#define I2C_BUS_MAX 5 #define CONFIG_SYS_I2C_BUS_MAX 5
#define I2C_DEFAULT_BASE I2C_BASE1 #define I2C_DEFAULT_BASE I2C_BASE1
struct i2c { struct i2c {
......
...@@ -343,11 +343,11 @@ static int _davinci_i2c_probe_chip(struct i2c_regs *i2c_base, uint8_t chip) ...@@ -343,11 +343,11 @@ static int _davinci_i2c_probe_chip(struct i2c_regs *i2c_base, uint8_t chip)
static struct i2c_regs *davinci_get_base(struct i2c_adapter *adap) static struct i2c_regs *davinci_get_base(struct i2c_adapter *adap)
{ {
switch (adap->hwadapnr) { switch (adap->hwadapnr) {
#if I2C_BUS_MAX >= 3 #if CONFIG_SYS_I2C_BUS_MAX >= 3
case 2: case 2:
return (struct i2c_regs *)I2C2_BASE; return (struct i2c_regs *)I2C2_BASE;
#endif #endif
#if I2C_BUS_MAX >= 2 #if CONFIG_SYS_I2C_BUS_MAX >= 2
case 1: case 1:
return (struct i2c_regs *)I2C1_BASE; return (struct i2c_regs *)I2C1_BASE;
#endif #endif
...@@ -412,7 +412,7 @@ U_BOOT_I2C_ADAP_COMPLETE(davinci_0, davinci_i2c_init, davinci_i2c_probe_chip, ...@@ -412,7 +412,7 @@ U_BOOT_I2C_ADAP_COMPLETE(davinci_0, davinci_i2c_init, davinci_i2c_probe_chip,
CONFIG_SYS_DAVINCI_I2C_SLAVE, CONFIG_SYS_DAVINCI_I2C_SLAVE,
0) 0)
#if I2C_BUS_MAX >= 2 #if CONFIG_SYS_I2C_BUS_MAX >= 2
U_BOOT_I2C_ADAP_COMPLETE(davinci_1, davinci_i2c_init, davinci_i2c_probe_chip, U_BOOT_I2C_ADAP_COMPLETE(davinci_1, davinci_i2c_init, davinci_i2c_probe_chip,
davinci_i2c_read, davinci_i2c_write, davinci_i2c_read, davinci_i2c_write,
davinci_i2c_setspeed, davinci_i2c_setspeed,
...@@ -421,7 +421,7 @@ U_BOOT_I2C_ADAP_COMPLETE(davinci_1, davinci_i2c_init, davinci_i2c_probe_chip, ...@@ -421,7 +421,7 @@ U_BOOT_I2C_ADAP_COMPLETE(davinci_1, davinci_i2c_init, davinci_i2c_probe_chip,
1) 1)
#endif #endif
#if I2C_BUS_MAX >= 3 #if CONFIG_SYS_I2C_BUS_MAX >= 3
U_BOOT_I2C_ADAP_COMPLETE(davinci_2, davinci_i2c_init, davinci_i2c_probe_chip, U_BOOT_I2C_ADAP_COMPLETE(davinci_2, davinci_i2c_init, davinci_i2c_probe_chip,
davinci_i2c_read, davinci_i2c_write, davinci_i2c_read, davinci_i2c_write,
davinci_i2c_setspeed, davinci_i2c_setspeed,
......
...@@ -706,15 +706,15 @@ static struct i2c *omap24_get_base(struct i2c_adapter *adap) ...@@ -706,15 +706,15 @@ static struct i2c *omap24_get_base(struct i2c_adapter *adap)
case 1: case 1:
return (struct i2c *)I2C_BASE2; return (struct i2c *)I2C_BASE2;
break; break;
#if (I2C_BUS_MAX > 2) #if (CONFIG_SYS_I2C_BUS_MAX > 2)
case 2: case 2:
return (struct i2c *)I2C_BASE3; return (struct i2c *)I2C_BASE3;
break; break;
#if (I2C_BUS_MAX > 3) #if (CONFIG_SYS_I2C_BUS_MAX > 3)
case 3: case 3:
return (struct i2c *)I2C_BASE4; return (struct i2c *)I2C_BASE4;
break; break;
#if (I2C_BUS_MAX > 4) #if (CONFIG_SYS_I2C_BUS_MAX > 4)
case 4: case 4:
return (struct i2c *)I2C_BASE5; return (struct i2c *)I2C_BASE5;
break; break;
...@@ -795,7 +795,7 @@ U_BOOT_I2C_ADAP_COMPLETE(omap24_1, omap24_i2c_init, omap24_i2c_probe, ...@@ -795,7 +795,7 @@ U_BOOT_I2C_ADAP_COMPLETE(omap24_1, omap24_i2c_init, omap24_i2c_probe,
CONFIG_SYS_OMAP24_I2C_SPEED1, CONFIG_SYS_OMAP24_I2C_SPEED1,
CONFIG_SYS_OMAP24_I2C_SLAVE1, CONFIG_SYS_OMAP24_I2C_SLAVE1,
1) 1)
#if (I2C_BUS_MAX > 2) #if (CONFIG_SYS_I2C_BUS_MAX > 2)
#if !defined(CONFIG_SYS_OMAP24_I2C_SPEED2) #if !defined(CONFIG_SYS_OMAP24_I2C_SPEED2)
#define CONFIG_SYS_OMAP24_I2C_SPEED2 CONFIG_SYS_OMAP24_I2C_SPEED #define CONFIG_SYS_OMAP24_I2C_SPEED2 CONFIG_SYS_OMAP24_I2C_SPEED
#endif #endif
...@@ -808,7 +808,7 @@ U_BOOT_I2C_ADAP_COMPLETE(omap24_2, omap24_i2c_init, omap24_i2c_probe, ...@@ -808,7 +808,7 @@ U_BOOT_I2C_ADAP_COMPLETE(omap24_2, omap24_i2c_init, omap24_i2c_probe,
CONFIG_SYS_OMAP24_I2C_SPEED2, CONFIG_SYS_OMAP24_I2C_SPEED2,
CONFIG_SYS_OMAP24_I2C_SLAVE2, CONFIG_SYS_OMAP24_I2C_SLAVE2,
2) 2)
#if (I2C_BUS_MAX > 3) #if (CONFIG_SYS_I2C_BUS_MAX > 3)
#if !defined(CONFIG_SYS_OMAP24_I2C_SPEED3) #if !defined(CONFIG_SYS_OMAP24_I2C_SPEED3)
#define CONFIG_SYS_OMAP24_I2C_SPEED3 CONFIG_SYS_OMAP24_I2C_SPEED #define CONFIG_SYS_OMAP24_I2C_SPEED3 CONFIG_SYS_OMAP24_I2C_SPEED
#endif #endif
...@@ -821,7 +821,7 @@ U_BOOT_I2C_ADAP_COMPLETE(omap24_3, omap24_i2c_init, omap24_i2c_probe, ...@@ -821,7 +821,7 @@ U_BOOT_I2C_ADAP_COMPLETE(omap24_3, omap24_i2c_init, omap24_i2c_probe,
CONFIG_SYS_OMAP24_I2C_SPEED3, CONFIG_SYS_OMAP24_I2C_SPEED3,
CONFIG_SYS_OMAP24_I2C_SLAVE3, CONFIG_SYS_OMAP24_I2C_SLAVE3,
3) 3)
#if (I2C_BUS_MAX > 4) #if (CONFIG_SYS_I2C_BUS_MAX > 4)
#if !defined(CONFIG_SYS_OMAP24_I2C_SPEED4) #if !defined(CONFIG_SYS_OMAP24_I2C_SPEED4)
#define CONFIG_SYS_OMAP24_I2C_SPEED4 CONFIG_SYS_OMAP24_I2C_SPEED #define CONFIG_SYS_OMAP24_I2C_SPEED4 CONFIG_SYS_OMAP24_I2C_SPEED
#endif #endif
......
...@@ -160,7 +160,7 @@ ...@@ -160,7 +160,7 @@
#define CONFIG_SYS_DAVINCI_I2C_SLAVE1 0x10 /* SMBus host address */ #define CONFIG_SYS_DAVINCI_I2C_SLAVE1 0x10 /* SMBus host address */
#define CONFIG_SYS_DAVINCI_I2C_SPEED2 100000 #define CONFIG_SYS_DAVINCI_I2C_SPEED2 100000
#define CONFIG_SYS_DAVINCI_I2C_SLAVE2 0x10 /* SMBus host address */ #define CONFIG_SYS_DAVINCI_I2C_SLAVE2 0x10 /* SMBus host address */
#define I2C_BUS_MAX 3 #define CONFIG_SYS_I2C_BUS_MAX 3
/* EEPROM definitions */ /* EEPROM definitions */
#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2 #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册