From: Adam Ford Date: Fri, 11 Aug 2017 11:39:13 +0000 (-0500) Subject: Configs: Migrate I2C_BUS_MAX to CONFIG_SYS_I2C_BUS_MAX X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=ac1d8ac8712e9268cc20ec96e692264da2f479f3;p=project%2Fbcm63xx%2Fu-boot.git 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: Adam Ford --- diff --git a/arch/arm/include/asm/arch-am33xx/i2c.h b/arch/arm/include/asm/arch-am33xx/i2c.h index 8642c8f872..a34282adc8 100644 --- a/arch/arm/include/asm/arch-am33xx/i2c.h +++ b/arch/arm/include/asm/arch-am33xx/i2c.h @@ -10,7 +10,7 @@ #define I2C_BASE1 0x44E0B000 #define I2C_BASE2 0x4802A000 #define I2C_BASE3 0x4819C000 -#define I2C_BUS_MAX 3 +#define CONFIG_SYS_I2C_BUS_MAX 3 #define I2C_DEFAULT_BASE I2C_BASE1 diff --git a/arch/arm/include/asm/arch-omap3/i2c.h b/arch/arm/include/asm/arch-omap3/i2c.h index 6b3a3da3f2..d1421757db 100644 --- a/arch/arm/include/asm/arch-omap3/i2c.h +++ b/arch/arm/include/asm/arch-omap3/i2c.h @@ -7,7 +7,7 @@ #ifndef _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 struct i2c { diff --git a/arch/arm/include/asm/arch-omap4/i2c.h b/arch/arm/include/asm/arch-omap4/i2c.h index 463e979758..1c5ed9b17a 100644 --- a/arch/arm/include/asm/arch-omap4/i2c.h +++ b/arch/arm/include/asm/arch-omap4/i2c.h @@ -7,7 +7,7 @@ #ifndef _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 struct i2c { diff --git a/arch/arm/include/asm/arch-omap5/i2c.h b/arch/arm/include/asm/arch-omap5/i2c.h index 2b55edf7f0..5122cd6aa4 100644 --- a/arch/arm/include/asm/arch-omap5/i2c.h +++ b/arch/arm/include/asm/arch-omap5/i2c.h @@ -7,7 +7,7 @@ #ifndef _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 struct i2c { diff --git a/drivers/i2c/davinci_i2c.c b/drivers/i2c/davinci_i2c.c index 2df07bbe8c..a35ec467c6 100644 --- a/drivers/i2c/davinci_i2c.c +++ b/drivers/i2c/davinci_i2c.c @@ -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) { switch (adap->hwadapnr) { -#if I2C_BUS_MAX >= 3 +#if CONFIG_SYS_I2C_BUS_MAX >= 3 case 2: return (struct i2c_regs *)I2C2_BASE; #endif -#if I2C_BUS_MAX >= 2 +#if CONFIG_SYS_I2C_BUS_MAX >= 2 case 1: return (struct i2c_regs *)I2C1_BASE; #endif @@ -412,7 +412,7 @@ U_BOOT_I2C_ADAP_COMPLETE(davinci_0, davinci_i2c_init, davinci_i2c_probe_chip, CONFIG_SYS_DAVINCI_I2C_SLAVE, 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, davinci_i2c_read, davinci_i2c_write, davinci_i2c_setspeed, @@ -421,7 +421,7 @@ U_BOOT_I2C_ADAP_COMPLETE(davinci_1, davinci_i2c_init, davinci_i2c_probe_chip, 1) #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, davinci_i2c_read, davinci_i2c_write, davinci_i2c_setspeed, diff --git a/drivers/i2c/omap24xx_i2c.c b/drivers/i2c/omap24xx_i2c.c index f71e0a5a26..c98c6276dd 100644 --- a/drivers/i2c/omap24xx_i2c.c +++ b/drivers/i2c/omap24xx_i2c.c @@ -706,15 +706,15 @@ static struct i2c *omap24_get_base(struct i2c_adapter *adap) case 1: return (struct i2c *)I2C_BASE2; break; -#if (I2C_BUS_MAX > 2) +#if (CONFIG_SYS_I2C_BUS_MAX > 2) case 2: return (struct i2c *)I2C_BASE3; break; -#if (I2C_BUS_MAX > 3) +#if (CONFIG_SYS_I2C_BUS_MAX > 3) case 3: return (struct i2c *)I2C_BASE4; break; -#if (I2C_BUS_MAX > 4) +#if (CONFIG_SYS_I2C_BUS_MAX > 4) case 4: return (struct i2c *)I2C_BASE5; break; @@ -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_SLAVE1, 1) -#if (I2C_BUS_MAX > 2) +#if (CONFIG_SYS_I2C_BUS_MAX > 2) #if !defined(CONFIG_SYS_OMAP24_I2C_SPEED2) #define CONFIG_SYS_OMAP24_I2C_SPEED2 CONFIG_SYS_OMAP24_I2C_SPEED #endif @@ -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_SLAVE2, 2) -#if (I2C_BUS_MAX > 3) +#if (CONFIG_SYS_I2C_BUS_MAX > 3) #if !defined(CONFIG_SYS_OMAP24_I2C_SPEED3) #define CONFIG_SYS_OMAP24_I2C_SPEED3 CONFIG_SYS_OMAP24_I2C_SPEED #endif @@ -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_SLAVE3, 3) -#if (I2C_BUS_MAX > 4) +#if (CONFIG_SYS_I2C_BUS_MAX > 4) #if !defined(CONFIG_SYS_OMAP24_I2C_SPEED4) #define CONFIG_SYS_OMAP24_I2C_SPEED4 CONFIG_SYS_OMAP24_I2C_SPEED #endif diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h index 935815485e..f3563446c1 100644 --- a/include/configs/ti_armv7_keystone2.h +++ b/include/configs/ti_armv7_keystone2.h @@ -160,7 +160,7 @@ #define CONFIG_SYS_DAVINCI_I2C_SLAVE1 0x10 /* SMBus host address */ #define CONFIG_SYS_DAVINCI_I2C_SPEED2 100000 #define CONFIG_SYS_DAVINCI_I2C_SLAVE2 0x10 /* SMBus host address */ -#define I2C_BUS_MAX 3 +#define CONFIG_SYS_I2C_BUS_MAX 3 /* EEPROM definitions */ #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2