Convert CONFIG_SYS_I2C_BUS_MAX to Kconfig

This converts the following to Kconfig:
   CONFIG_SYS_I2C_BUS_MAX

Signed-off-by: Adam Ford <aford173@gmail.com>
Reviewed-by: Heiko Schocher <hs@denx.de>
[trini: Fix AM43XX drop AM44XX]
Signed-off-by: Tom Rini <trini@konsulko.com>
master
Adam Ford 7 years ago committed by Tom Rini
parent ac1d8ac871
commit fc760cc6e8
  1. 1
      arch/arm/include/asm/arch-am33xx/i2c.h
  2. 1
      arch/arm/include/asm/arch-omap3/i2c.h
  3. 1
      arch/arm/include/asm/arch-omap4/i2c.h
  4. 1
      arch/arm/include/asm/arch-omap5/i2c.h
  5. 10
      drivers/i2c/Kconfig
  6. 1
      include/configs/socfpga_common.h
  7. 1
      include/configs/ti_armv7_keystone2.h

@ -10,7 +10,6 @@
#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 CONFIG_SYS_I2C_BUS_MAX 3
#define I2C_DEFAULT_BASE I2C_BASE1 #define I2C_DEFAULT_BASE I2C_BASE1

@ -7,7 +7,6 @@
#ifndef _OMAP3_I2C_H_ #ifndef _OMAP3_I2C_H_
#define _OMAP3_I2C_H_ #define _OMAP3_I2C_H_
#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,6 @@
#ifndef _OMAP4_I2C_H_ #ifndef _OMAP4_I2C_H_
#define _OMAP4_I2C_H_ #define _OMAP4_I2C_H_
#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,6 @@
#ifndef _OMAP5_I2C_H_ #ifndef _OMAP5_I2C_H_
#define _OMAP5_I2C_H_ #define _OMAP5_I2C_H_
#define CONFIG_SYS_I2C_BUS_MAX 5
#define I2C_DEFAULT_BASE I2C_BASE1 #define I2C_DEFAULT_BASE I2C_BASE1
struct i2c { struct i2c {

@ -227,6 +227,16 @@ config TEGRA186_BPMP_I2C
by the BPMP, and can only be accessed by the main CPU via IPC by the BPMP, and can only be accessed by the main CPU via IPC
requests to the BPMP. This driver covers the latter case. requests to the BPMP. This driver covers the latter case.
config SYS_I2C_BUS_MAX
int "Max I2C busses"
depends on ARCH_KEYSTONE || ARCH_OMAP2PLUS || ARCH_SOCFPGA
default 2 if TI816X
default 3 if OMAP34XX || AM33XX || AM43XX || ARCH_KEYSTONE
default 4 if ARCH_SOCFPGA || OMAP44XX || TI814X
default 5 if OMAP54XX
help
Define the maximum number of available I2C buses.
source "drivers/i2c/muxes/Kconfig" source "drivers/i2c/muxes/Kconfig"
endmenu endmenu

@ -156,7 +156,6 @@
* I2C support * I2C support
*/ */
#define CONFIG_SYS_I2C #define CONFIG_SYS_I2C
#define CONFIG_SYS_I2C_BUS_MAX 4
#define CONFIG_SYS_I2C_BASE SOCFPGA_I2C0_ADDRESS #define CONFIG_SYS_I2C_BASE SOCFPGA_I2C0_ADDRESS
#define CONFIG_SYS_I2C_BASE1 SOCFPGA_I2C1_ADDRESS #define CONFIG_SYS_I2C_BASE1 SOCFPGA_I2C1_ADDRESS
#define CONFIG_SYS_I2C_BASE2 SOCFPGA_I2C2_ADDRESS #define CONFIG_SYS_I2C_BASE2 SOCFPGA_I2C2_ADDRESS

@ -160,7 +160,6 @@
#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 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

Loading…
Cancel
Save