LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

i2c, fsl_i2c: switch to new multibus/multiadapter support 

- added to fsl_i2c driver new multibus/multiadpater support
- adapted all config files, which uses this driver

Signed-off-by: Heiko Schocher <hs@denx.de>
Cc: Simon Glass <sjg@chromium.org>
Cc: Stephen Warren <swarren@wwwdotorg.org>
This commit is contained in:
Heiko Schocher 2012-10-24 13:48:22 +02:00
parent ea818dbbcd
commit 00f792e0df
100 changed files with 644 additions and 693 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
README
View File

@ -1968,6 +1968,18 @@ CBFS (Coreboot Filesystem) support
CONFIG_SYS_I2C_SOFT_SPEED_4 and CONFIG_SYS_I2C_SOFT_SLAVE_4 CONFIG_SYS_I2C_SOFT_SPEED_4 and CONFIG_SYS_I2C_SOFT_SLAVE_4
for defining speed and slave address for defining speed and slave address
- drivers/i2c/fsl_i2c.c:
- activate i2c driver with CONFIG_SYS_I2C_FSL
define CONFIG_SYS_FSL_I2C_OFFSET for setting the register
offset CONFIG_SYS_FSL_I2C_SPEED for the i2c speed and
CONFIG_SYS_FSL_I2C_SLAVE for the slave addr of the first
bus.
- If your board supports a second fsl i2c bus, define
CONFIG_SYS_FSL_I2C2_OFFSET for the register offset
CONFIG_SYS_FSL_I2C2_SPEED for the speed and
CONFIG_SYS_FSL_I2C2_SLAVE for the slave address of the
second bus.
additional defines: additional defines:
CONFIG_SYS_NUM_I2C_BUSES CONFIG_SYS_NUM_I2C_BUSES
@ -2213,11 +2225,6 @@ CBFS (Coreboot Filesystem) support
If not defined, then U-Boot uses predefined value for If not defined, then U-Boot uses predefined value for
specified DTT device. specified DTT device.
CONFIG_FSL_I2C
Define this option if you want to use Freescale's I2C driver in
drivers/i2c/fsl_i2c.c.
CONFIG_I2C_MUX CONFIG_I2C_MUX
Define this option if you have I2C devices reached over 1 .. n Define this option if you have I2C devices reached over 1 .. n

2
arch/m68k/cpu/mcf5227x/cpu_init.c
View File

@ -105,7 +105,7 @@ void cpu_init_f(void)
out_be32(&fbcs->csmr5, CONFIG_SYS_CS5_MASK); out_be32(&fbcs->csmr5, CONFIG_SYS_CS5_MASK);
#endif #endif
#ifdef CONFIG_FSL_I2C #ifdef CONFIG_SYS_I2C_FSL
out_8(&gpio->par_i2c, GPIO_PAR_I2C_SCL_SCL | GPIO_PAR_I2C_SDA_SDA); out_8(&gpio->par_i2c, GPIO_PAR_I2C_SCL_SCL | GPIO_PAR_I2C_SDA_SDA);
#endif #endif

2
arch/m68k/cpu/mcf5227x/speed.c
View File

@ -134,7 +134,7 @@ int get_clocks(void)
gd->bus_clk = gd->arch.flb_clk; gd->bus_clk = gd->arch.flb_clk;
} }
#ifdef CONFIG_FSL_I2C #ifdef CONFIG_SYS_I2C_FSL
gd->arch.i2c1_clk = gd->bus_clk; gd->arch.i2c1_clk = gd->bus_clk;
#endif #endif

2
arch/m68k/cpu/mcf523x/cpu_init.c
View File

@ -115,7 +115,7 @@ void cpu_init_f(void)
out_be32(&fbcs->csmr7, CONFIG_SYS_CS7_MASK); out_be32(&fbcs->csmr7, CONFIG_SYS_CS7_MASK);
#endif #endif
#ifdef CONFIG_FSL_I2C #ifdef CONFIG_SYS_I2C_FSL
CONFIG_SYS_I2C_PINMUX_REG &= CONFIG_SYS_I2C_PINMUX_CLR; CONFIG_SYS_I2C_PINMUX_REG &= CONFIG_SYS_I2C_PINMUX_CLR;
CONFIG_SYS_I2C_PINMUX_REG |= CONFIG_SYS_I2C_PINMUX_SET; CONFIG_SYS_I2C_PINMUX_REG |= CONFIG_SYS_I2C_PINMUX_SET;
#endif #endif

2
arch/m68k/cpu/mcf523x/speed.c
View File

@ -47,7 +47,7 @@ int get_clocks(void)
gd->bus_clk = CONFIG_SYS_CLK; gd->bus_clk = CONFIG_SYS_CLK;
gd->cpu_clk = (gd->bus_clk * 2); gd->cpu_clk = (gd->bus_clk * 2);
#ifdef CONFIG_FSL_I2C #ifdef CONFIG_SYS_I2C_FSL
gd->arch.i2c1_clk = gd->bus_clk; gd->arch.i2c1_clk = gd->bus_clk;
#endif #endif

4
arch/m68k/cpu/mcf52x2/cpu_init.c
View File

@ -228,7 +228,7 @@ void cpu_init_f(void)
/* FlexBus Chipselect */ /* FlexBus Chipselect */
init_fbcs(); init_fbcs();
#ifdef CONFIG_FSL_I2C #ifdef CONFIG_SYS_I2C_FSL
CONFIG_SYS_I2C_PINMUX_REG = CONFIG_SYS_I2C_PINMUX_REG =
CONFIG_SYS_I2C_PINMUX_REG & CONFIG_SYS_I2C_PINMUX_CLR; CONFIG_SYS_I2C_PINMUX_REG & CONFIG_SYS_I2C_PINMUX_CLR;
CONFIG_SYS_I2C_PINMUX_REG |= CONFIG_SYS_I2C_PINMUX_SET; CONFIG_SYS_I2C_PINMUX_REG |= CONFIG_SYS_I2C_PINMUX_SET;
@ -498,7 +498,7 @@ void cpu_init_f(void)
init_fbcs(); init_fbcs();
#endif /* #ifndef CONFIG_MONITOR_IS_IN_RAM */ #endif /* #ifndef CONFIG_MONITOR_IS_IN_RAM */
#ifdef CONFIG_FSL_I2C #ifdef CONFIG_SYS_I2C_FSL
CONFIG_SYS_I2C_PINMUX_REG &= CONFIG_SYS_I2C_PINMUX_CLR; CONFIG_SYS_I2C_PINMUX_REG &= CONFIG_SYS_I2C_PINMUX_CLR;
CONFIG_SYS_I2C_PINMUX_REG |= CONFIG_SYS_I2C_PINMUX_SET; CONFIG_SYS_I2C_PINMUX_REG |= CONFIG_SYS_I2C_PINMUX_SET;
#endif #endif

4
arch/m68k/cpu/mcf52x2/speed.c
View File

@ -90,9 +90,9 @@ int get_clocks (void)
gd->bus_clk = gd->cpu_clk; gd->bus_clk = gd->cpu_clk;
#endif #endif
#ifdef CONFIG_FSL_I2C #ifdef CONFIG_SYS_I2C_FSL
gd->arch.i2c1_clk = gd->bus_clk; gd->arch.i2c1_clk = gd->bus_clk;
#ifdef CONFIG_SYS_I2C2_OFFSET #ifdef CONFIG_SYS_I2C2_FSL_OFFSET
gd->arch.i2c2_clk = gd->bus_clk; gd->arch.i2c2_clk = gd->bus_clk;
#endif #endif
#endif #endif

4
arch/m68k/cpu/mcf532x/cpu_init.c
View File

@ -98,7 +98,7 @@ void cpu_init_f(void)
out_be32(&fbcs->csmr5, CONFIG_SYS_CS5_MASK); out_be32(&fbcs->csmr5, CONFIG_SYS_CS5_MASK);
#endif #endif
#ifdef CONFIG_FSL_I2C #ifdef CONFIG_SYS_I2C_FSL
out_8(&gpio->par_feci2c, out_8(&gpio->par_feci2c,
GPIO_PAR_FECI2C_SDA_SDA | GPIO_PAR_FECI2C_SCL_SCL); GPIO_PAR_FECI2C_SDA_SDA | GPIO_PAR_FECI2C_SCL_SCL);
#endif #endif
@ -292,7 +292,7 @@ void cpu_init_f(void)
out_be32(&fbcs->csmr5, CONFIG_SYS_CS5_MASK); out_be32(&fbcs->csmr5, CONFIG_SYS_CS5_MASK);
#endif #endif
#ifdef CONFIG_FSL_I2C #ifdef CONFIG_SYS_I2C_FSL
out_8(&gpio->par_feci2c, out_8(&gpio->par_feci2c,
GPIO_PAR_FECI2C_SCL_SCL | GPIO_PAR_FECI2C_SDA_SDA); GPIO_PAR_FECI2C_SCL_SCL | GPIO_PAR_FECI2C_SDA_SDA);
#endif #endif

2
arch/m68k/cpu/mcf532x/speed.c
View File

@ -270,7 +270,7 @@ int get_clocks(void)
gd->bus_clk = clock_pll(CONFIG_SYS_CLK / 1000, 0) * 1000; gd->bus_clk = clock_pll(CONFIG_SYS_CLK / 1000, 0) * 1000;
gd->cpu_clk = (gd->bus_clk * 3); gd->cpu_clk = (gd->bus_clk * 3);
#ifdef CONFIG_FSL_I2C #ifdef CONFIG_SYS_I2C_FSL
gd->arch.i2c1_clk = gd->bus_clk; gd->arch.i2c1_clk = gd->bus_clk;
#endif #endif

2
arch/m68k/cpu/mcf5445x/cpu_init.c
View File

@ -212,7 +212,7 @@ void cpu_init_f(void)
GPIO_PAR_FBCTL_OE | GPIO_PAR_FBCTL_TA_TA | GPIO_PAR_FBCTL_OE | GPIO_PAR_FBCTL_TA_TA |
GPIO_PAR_FBCTL_RW_RW | GPIO_PAR_FBCTL_TS_TS); GPIO_PAR_FBCTL_RW_RW | GPIO_PAR_FBCTL_TS_TS);
#ifdef CONFIG_FSL_I2C #ifdef CONFIG_SYS_FSL_I2C
out_be16(&gpio->par_feci2c, out_be16(&gpio->par_feci2c,
GPIO_PAR_FECI2C_SCL_SCL | GPIO_PAR_FECI2C_SDA_SDA); GPIO_PAR_FECI2C_SCL_SCL | GPIO_PAR_FECI2C_SDA_SDA);
#endif #endif

4
arch/m68k/cpu/mcf5445x/speed.c
View File

@ -273,7 +273,7 @@ void setup_5445x_clocks(void)
#endif #endif
} }
#ifdef CONFIG_FSL_I2C #ifdef CONFIG_SYS_I2C_FSL
gd->arch.i2c1_clk = gd->bus_clk; gd->arch.i2c1_clk = gd->bus_clk;
#endif #endif
} }
@ -289,7 +289,7 @@ int get_clocks(void)
setup_5445x_clocks(); setup_5445x_clocks();
#endif #endif
#ifdef CONFIG_FSL_I2C #ifdef CONFIG_SYS_FSL_I2C
gd->arch.i2c1_clk = gd->bus_clk; gd->arch.i2c1_clk = gd->bus_clk;
#endif #endif

2
arch/m68k/cpu/mcf547x_8x/cpu_init.c
View File

@ -95,7 +95,7 @@ void cpu_init_f(void)
out_be32(&fbcs->csmr5, CONFIG_SYS_CS5_MASK); out_be32(&fbcs->csmr5, CONFIG_SYS_CS5_MASK);
#endif #endif
#ifdef CONFIG_FSL_I2C #ifdef CONFIG_SYS_I2C_FSL
out_be16(&gpio->par_feci2cirq, out_be16(&gpio->par_feci2cirq,
GPIO_PAR_FECI2CIRQ_SCL | GPIO_PAR_FECI2CIRQ_SDA); GPIO_PAR_FECI2CIRQ_SCL | GPIO_PAR_FECI2CIRQ_SDA);
#endif #endif

2
arch/m68k/cpu/mcf547x_8x/speed.c
View File

@ -40,7 +40,7 @@ int get_clocks(void)
gd->bus_clk = CONFIG_SYS_CLK; gd->bus_clk = CONFIG_SYS_CLK;
gd->cpu_clk = (gd->bus_clk * 2); gd->cpu_clk = (gd->bus_clk * 2);
#ifdef CONFIG_FSL_I2C #ifdef CONFIG_SYS_I2C_FSL
gd->arch.i2c1_clk = gd->bus_clk; gd->arch.i2c1_clk = gd->bus_clk;
#endif #endif

2
arch/m68k/include/asm/global_data.h
View File

@ -26,7 +26,7 @@
/* Architecture-specific global data */ /* Architecture-specific global data */
struct arch_global_data { struct arch_global_data {
#ifdef CONFIG_FSL_I2C #ifdef CONFIG_SYS_I2C_FSL
unsigned long i2c1_clk; unsigned long i2c1_clk;
unsigned long i2c2_clk; unsigned long i2c2_clk;
#endif #endif

6
board/esd/vme8349/vme8349.c
View File

@ -186,11 +186,11 @@ static spd_eeprom_t default_spd_eeprom = {
int vme8349_read_spd(uchar chip, uint addr, int alen, uchar *buffer, int len) int vme8349_read_spd(uchar chip, uint addr, int alen, uchar *buffer, int len)
{ {
int old_bus = I2C_GET_BUS(); int old_bus = i2c_get_bus_num();
unsigned int l, sum; unsigned int l, sum;
int valid = 0; int valid = 0;
I2C_SET_BUS(0); i2c_set_bus_num(0);
if (i2c_read(chip, addr, alen, buffer, len) == 0) if (i2c_read(chip, addr, alen, buffer, len) == 0)
if (memcmp(&buffer[64], &default_spd_eeprom.mid[0], 8) == 0) { if (memcmp(&buffer[64], &default_spd_eeprom.mid[0], 8) == 0) {
@ -215,7 +215,7 @@ int vme8349_read_spd(uchar chip, uint addr, int alen, uchar *buffer, int len)
buffer[63] = sum; buffer[63] = sum;
} }
I2C_SET_BUS(old_bus); i2c_set_bus_num(old_bus);
return 0; return 0;
} }

2
board/freescale/m52277evb/README
View File

@ -82,7 +82,7 @@ CONFIG_CMD_DATE -- enable to use date feature in u-boot
CONFIG_MCFTMR -- define to use DMA timer CONFIG_MCFTMR -- define to use DMA timer
CONFIG_MCFPIT -- define to use PIT timer CONFIG_MCFPIT -- define to use PIT timer
CONFIG_FSL_I2C -- define to use FSL common I2C driver CONFIG_SYS_I2C_FSL -- define to use FSL common I2C driver
CONFIG_HARD_I2C -- define for I2C hardware support CONFIG_HARD_I2C -- define for I2C hardware support
CONFIG_SYS_I2C_SOFT -- define for I2C bit-banged CONFIG_SYS_I2C_SOFT -- define for I2C bit-banged
CONFIG_SYS_I2C_SPEED -- define for I2C speed CONFIG_SYS_I2C_SPEED -- define for I2C speed

2
board/freescale/m53017evb/README
View File

@ -90,7 +90,7 @@ MCFFEC_TOUT_LOOP -- set FEC timeout loop
CONFIG_MCFTMR -- define to use DMA timer CONFIG_MCFTMR -- define to use DMA timer
CONFIG_MCFPIT -- define to use PIT timer CONFIG_MCFPIT -- define to use PIT timer
CONFIG_FSL_I2C -- define to use FSL common I2C driver CONFIG_SYS_I2C_FSL -- define to use FSL common I2C driver
CONFIG_HARD_I2C -- define for I2C hardware support CONFIG_HARD_I2C -- define for I2C hardware support
CONFIG_SYS_I2C_SOFT -- define for I2C bit-banged CONFIG_SYS_I2C_SOFT -- define for I2C bit-banged
CONFIG_SYS_I2C_SPEED -- define for I2C speed CONFIG_SYS_I2C_SPEED -- define for I2C speed

2
board/freescale/m5373evb/README
View File

@ -89,7 +89,7 @@ MCFFEC_TOUT_LOOP -- set FEC timeout loop
CONFIG_MCFTMR -- define to use DMA timer CONFIG_MCFTMR -- define to use DMA timer
CONFIG_MCFPIT -- define to use PIT timer CONFIG_MCFPIT -- define to use PIT timer
CONFIG_FSL_I2C -- define to use FSL common I2C driver CONFIG_SYS_I2C_FSL -- define to use FSL common I2C driver
CONFIG_HARD_I2C -- define for I2C hardware support CONFIG_HARD_I2C -- define for I2C hardware support
CONFIG_SYS_I2C_SOFT -- define for I2C bit-banged CONFIG_SYS_I2C_SOFT -- define for I2C bit-banged
CONFIG_SYS_I2C_SPEED -- define for I2C speed CONFIG_SYS_I2C_SPEED -- define for I2C speed

2
board/freescale/m54455evb/README
View File

@ -112,7 +112,7 @@ _IO_BASE -- define for IO base address
CONFIG_MCFTMR -- define to use DMA timer CONFIG_MCFTMR -- define to use DMA timer
CONFIG_MCFPIT -- define to use PIT timer CONFIG_MCFPIT -- define to use PIT timer
CONFIG_FSL_I2C -- define to use FSL common I2C driver CONFIG_SYS_FSL_I2C -- define to use FSL common I2C driver
CONFIG_HARD_I2C -- define for I2C hardware support CONFIG_HARD_I2C -- define for I2C hardware support
CONFIG_SYS_I2C_SOFT -- define for I2C bit-banged CONFIG_SYS_I2C_SOFT -- define for I2C bit-banged
CONFIG_SYS_I2C_SPEED -- define for I2C speed CONFIG_SYS_I2C_SPEED -- define for I2C speed

2
board/freescale/m547xevb/README
View File

@ -97,7 +97,7 @@ CONFIG_DOS_PARTITION -- enable DOS read/write
CONFIG_SLTTMR -- define to use SLT timer CONFIG_SLTTMR -- define to use SLT timer
CONFIG_FSL_I2C -- define to use FSL common I2C driver CONFIG_SYS_I2C_FSL -- define to use FSL common I2C driver
CONFIG_HARD_I2C -- define for I2C hardware support CONFIG_HARD_I2C -- define for I2C hardware support
CONFIG_SYS_I2C_SOFT -- define for I2C bit-banged CONFIG_SYS_I2C_SOFT -- define for I2C bit-banged
CONFIG_SYS_I2C_SPEED -- define for I2C speed CONFIG_SYS_I2C_SPEED -- define for I2C speed

3
board/freescale/mpc8349itx/mpc8349itx.c
View File

@ -263,8 +263,7 @@ int misc_init_r(void)
{ {
int rc = 0; int rc = 0;
#ifdef CONFIG_HARD_I2C #if defined(CONFIG_SYS_I2C)
unsigned int orig_bus = i2c_get_bus_num(); unsigned int orig_bus = i2c_get_bus_num();
u8 i2c_data; u8 i2c_data;

2
board/freescale/mpc8349itx/pci.c
View File

@ -87,7 +87,7 @@ void pci_init_board(void)
#endif #endif
u8 reg8; u8 reg8;
#ifdef CONFIG_HARD_I2C #if defined(CONFIG_SYS_I2C)
i2c_set_bus_num(1); i2c_set_bus_num(1);
/* Read the PCI_M66EN jumper setting */ /* Read the PCI_M66EN jumper setting */
if ((i2c_read(CONFIG_SYS_I2C_8574_ADDR2, 0, 0, &reg8, sizeof(reg8)) == 0) || if ((i2c_read(CONFIG_SYS_I2C_8574_ADDR2, 0, 0, &reg8, sizeof(reg8)) == 0) ||

2
board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c
View File

@ -248,7 +248,7 @@ int checkboard(void)
in_8(&cpld_data->pcba_rev) & 0x0F); in_8(&cpld_data->pcba_rev) & 0x0F);
/* Initialize i2c early for rom_loc and flash bank information */ /* Initialize i2c early for rom_loc and flash bank information */
i2c_init(CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE); i2c_set_bus_num(CONFIG_SYS_SPD_BUS_NUM);
if (i2c_read(CONFIG_SYS_I2C_PCA9557_ADDR, 0, 1, &in, 1) < 0 || if (i2c_read(CONFIG_SYS_I2C_PCA9557_ADDR, 0, 1, &in, 1) < 0 ||
i2c_read(CONFIG_SYS_I2C_PCA9557_ADDR, 1, 1, &out, 1) < 0 || i2c_read(CONFIG_SYS_I2C_PCA9557_ADDR, 1, 1, &out, 1) < 0 ||

16
board/keymile/common/ivm.c
View File

@ -314,29 +314,13 @@ int ivm_analyze_eeprom(unsigned char *buf, int len)
int ivm_read_eeprom(void) int ivm_read_eeprom(void)
{ {
#if defined(CONFIG_I2C_MUX)
I2C_MUX_DEVICE *dev = NULL;
#endif
uchar i2c_buffer[CONFIG_SYS_IVM_EEPROM_MAX_LEN]; uchar i2c_buffer[CONFIG_SYS_IVM_EEPROM_MAX_LEN];
char *buf; char *buf;
unsigned long dev_addr = CONFIG_SYS_IVM_EEPROM_ADR; unsigned long dev_addr = CONFIG_SYS_IVM_EEPROM_ADR;
int ret; int ret;
#if defined(CONFIG_SYS_I2C)
buf = getenv("EEprom_ivm"); buf = getenv("EEprom_ivm");
i2c_set_bus_num(buf ? (int)simple_strtol(buf, NULL, 10) : 0); i2c_set_bus_num(buf ? (int)simple_strtol(buf, NULL, 10) : 0);
#else
#if defined(CONFIG_I2C_MUX)
/* First init the Bus, select the Bus */
buf = (unsigned char *) getenv("EEprom_ivm");
if (buf != NULL)
dev = i2c_mux_ident_muxstring(buf);
if (dev == NULL) {
printf("Error couldnt add Bus for IVM\n");
return -1;
}
i2c_set_bus_num(dev->busid);
#endif
/* add deblocking here */ /* add deblocking here */
i2c_make_abort(); i2c_make_abort();

15
board/keymile/km83xx/km83xx.c
View File

@ -95,19 +95,6 @@ const qe_iop_conf_t qe_iop_conf_tab[] = {
{0, 0, 0, 0, QE_IOP_TAB_END}, {0, 0, 0, 0, QE_IOP_TAB_END},
}; };
static int board_init_i2c_busses(void)
{
I2C_MUX_DEVICE *dev = NULL;
uchar *dtt_bus = (uchar *)"pca9547:70:a";
/* Set up the Bus for the DTTs */
dev = i2c_mux_ident_muxstring(dtt_bus);
if (dev == NULL)
printf("Error couldn't add Bus for DTT\n");
return 0;
}
#if defined(CONFIG_SUVD3) #if defined(CONFIG_SUVD3)
const uint upma_table[] = { const uint upma_table[] = {
0x1ffedc00, 0x0ffcdc80, 0x0ffcdc80, 0x0ffcdc04, /* Words 0 to 3 */ 0x1ffedc00, 0x0ffcdc80, 0x0ffcdc80, 0x0ffcdc04, /* Words 0 to 3 */
@ -206,8 +193,6 @@ int board_early_init_r(void)
int misc_init_r(void) int misc_init_r(void)
{ {
/* add board specific i2c busses */
board_init_i2c_busses();
return 0; return 0;
} }

2
drivers/i2c/Makefile
View File

@ -28,7 +28,6 @@ LIB := $(obj)libi2c.o
COBJS-$(CONFIG_BFIN_TWI_I2C) += bfin-twi_i2c.o COBJS-$(CONFIG_BFIN_TWI_I2C) += bfin-twi_i2c.o
COBJS-$(CONFIG_DRIVER_DAVINCI_I2C) += davinci_i2c.o COBJS-$(CONFIG_DRIVER_DAVINCI_I2C) += davinci_i2c.o
COBJS-$(CONFIG_DW_I2C) += designware_i2c.o COBJS-$(CONFIG_DW_I2C) += designware_i2c.o
COBJS-$(CONFIG_FSL_I2C) += fsl_i2c.o
COBJS-$(CONFIG_I2C_MVTWSI) += mvtwsi.o COBJS-$(CONFIG_I2C_MVTWSI) += mvtwsi.o
COBJS-$(CONFIG_I2C_MV) += mv_i2c.o COBJS-$(CONFIG_I2C_MV) += mv_i2c.o
COBJS-$(CONFIG_I2C_MXC) += mxc_i2c.o COBJS-$(CONFIG_I2C_MXC) += mxc_i2c.o
@ -46,6 +45,7 @@ COBJS-$(CONFIG_U8500_I2C) += u8500_i2c.o
COBJS-$(CONFIG_SH_I2C) += sh_i2c.o COBJS-$(CONFIG_SH_I2C) += sh_i2c.o
COBJS-$(CONFIG_SH_SH7734_I2C) += sh_sh7734_i2c.o COBJS-$(CONFIG_SH_SH7734_I2C) += sh_sh7734_i2c.o
COBJS-$(CONFIG_SYS_I2C) += i2c_core.o COBJS-$(CONFIG_SYS_I2C) += i2c_core.o
COBJS-$(CONFIG_SYS_I2C_FSL) += fsl_i2c.o
COBJS-$(CONFIG_SYS_I2C_SOFT) += soft_i2c.o COBJS-$(CONFIG_SYS_I2C_SOFT) += soft_i2c.o
COBJS-$(CONFIG_ZYNQ_I2C) += zynq_i2c.o COBJS-$(CONFIG_ZYNQ_I2C) += zynq_i2c.o

216
drivers/i2c/fsl_i2c.c
View File

@ -1,6 +1,9 @@
/* /*
* Copyright 2006,2009 Freescale Semiconductor, Inc. * Copyright 2006,2009 Freescale Semiconductor, Inc.
* *
* 2012, Heiko Schocher, DENX Software Engineering, hs@denx.de.
* Changes for multibus/multiadapter I2C support.
*
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
* Version 2 as published by the Free Software Foundation. * Version 2 as published by the Free Software Foundation.
@ -17,12 +20,8 @@
*/ */
#include <common.h> #include <common.h>
#ifdef CONFIG_HARD_I2C
#include <command.h> #include <command.h>
#include <i2c.h> /* Functional interface */ #include <i2c.h> /* Functional interface */
#include <asm/io.h> #include <asm/io.h>
#include <asm/fsl_i2c.h> /* HW definitions */ #include <asm/fsl_i2c.h> /* HW definitions */
@ -47,25 +46,10 @@
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
/* Initialize the bus pointer to whatever one the SPD EEPROM is on.
* Default is bus 0. This is necessary because the DDR initialization
* runs from ROM, and we can't switch buses because we can't modify
* the global variables.
*/
#ifndef CONFIG_SYS_SPD_BUS_NUM
#define CONFIG_SYS_SPD_BUS_NUM 0
#endif
static unsigned int i2c_bus_num __attribute__ ((section (".data"))) = CONFIG_SYS_SPD_BUS_NUM;
#if defined(CONFIG_I2C_MUX)
static unsigned int i2c_bus_num_mux __attribute__ ((section ("data"))) = 0;
#endif
static unsigned int i2c_bus_speed[2] = {CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SPEED};
static const struct fsl_i2c *i2c_dev[2] = { static const struct fsl_i2c *i2c_dev[2] = {
(struct fsl_i2c *) (CONFIG_SYS_IMMR + CONFIG_SYS_I2C_OFFSET), (struct fsl_i2c *)(CONFIG_SYS_IMMR + CONFIG_SYS_FSL_I2C_OFFSET),
#ifdef CONFIG_SYS_I2C2_OFFSET #ifdef CONFIG_SYS_FSL_I2C2_OFFSET
(struct fsl_i2c *) (CONFIG_SYS_IMMR + CONFIG_SYS_I2C2_OFFSET) (struct fsl_i2c *)(CONFIG_SYS_IMMR + CONFIG_SYS_FSL_I2C2_OFFSET)
#endif #endif
}; };
@ -222,12 +206,9 @@ static unsigned int get_i2c_clock(int bus)
return gd->arch.i2c1_clk; /* I2C1 clock */ return gd->arch.i2c1_clk; /* I2C1 clock */
} }
void static void fsl_i2c_init(struct i2c_adapter *adap, int speed, int slaveadd)
i2c_init(int speed, int slaveadd)
{ {
const struct fsl_i2c *dev; const struct fsl_i2c *dev;
unsigned int temp;
int bus_num, i;
#ifdef CONFIG_SYS_I2C_INIT_BOARD #ifdef CONFIG_SYS_I2C_INIT_BOARD
/* Call board specific i2c bus reset routine before accessing the /* Call board specific i2c bus reset routine before accessing the
@ -236,23 +217,14 @@ i2c_init(int speed, int slaveadd)
*/ */
i2c_init_board(); i2c_init_board();
#endif #endif
#ifdef CONFIG_SYS_I2C2_OFFSET dev = (struct fsl_i2c *)i2c_dev[adap->hwadapnr];
bus_num = 2;
#else
bus_num = 1;
#endif
for (i = 0; i < bus_num; i++) {
dev = i2c_dev[i];
writeb(0, &dev->cr); /* stop I2C controller */ writeb(0, &dev->cr); /* stop I2C controller */
udelay(5); /* let it shutdown in peace */ udelay(5); /* let it shutdown in peace */
temp = set_i2c_bus_speed(dev, get_i2c_clock(i), speed); set_i2c_bus_speed(dev, get_i2c_clock(adap->hwadapnr), speed);
if (gd->flags & GD_FLG_RELOC) writeb(slaveadd << 1, &dev->adr);/* write slave address */
i2c_bus_speed[i] = temp; writeb(0x0, &dev->sr); /* clear status register */
writeb(slaveadd << 1, &dev->adr);/* write slave address */ writeb(I2C_CR_MEN, &dev->cr); /* start I2C controller */
writeb(0x0, &dev->sr); /* clear status register */
writeb(I2C_CR_MEN, &dev->cr); /* start I2C controller */
}
#ifdef CONFIG_SYS_I2C_BOARD_LATE_INIT #ifdef CONFIG_SYS_I2C_BOARD_LATE_INIT
/* Call board specific i2c bus reset routine AFTER the bus has been /* Call board specific i2c bus reset routine AFTER the bus has been
@ -265,12 +237,13 @@ i2c_init(int speed, int slaveadd)
} }
static int static int
i2c_wait4bus(void) i2c_wait4bus(struct i2c_adapter *adap)
{ {
struct fsl_i2c *dev = (struct fsl_i2c *)i2c_dev[adap->hwadapnr];
unsigned long long timeval = get_ticks(); unsigned long long timeval = get_ticks();
const unsigned long long timeout = usec2ticks(CONFIG_I2C_MBB_TIMEOUT); const unsigned long long timeout = usec2ticks(CONFIG_I2C_MBB_TIMEOUT);
while (readb(&i2c_dev[i2c_bus_num]->sr) & I2C_SR_MBB) { while (readb(&dev->sr) & I2C_SR_MBB) {
if ((get_ticks() - timeval) > timeout) if ((get_ticks() - timeval) > timeout)
return -1; return -1;
} }
@ -279,20 +252,21 @@ i2c_wait4bus(void)
} }
static __inline__ int static __inline__ int
i2c_wait(int write) i2c_wait(struct i2c_adapter *adap, int write)
{ {
u32 csr; u32 csr;
unsigned long long timeval = get_ticks(); unsigned long long timeval = get_ticks();
const unsigned long long timeout = usec2ticks(CONFIG_I2C_TIMEOUT); const unsigned long long timeout = usec2ticks(CONFIG_I2C_TIMEOUT);
struct fsl_i2c *dev = (struct fsl_i2c *)i2c_dev[adap->hwadapnr];
do { do {
csr = readb(&i2c_dev[i2c_bus_num]->sr); csr = readb(&dev->sr);
if (!(csr & I2C_SR_MIF)) if (!(csr & I2C_SR_MIF))
continue; continue;
/* Read again to allow register to stabilise */ /* Read again to allow register to stabilise */
csr = readb(&i2c_dev[i2c_bus_num]->sr); csr = readb(&dev->sr);
writeb(0x0, &i2c_dev[i2c_bus_num]->sr); writeb(0x0, &dev->sr);
if (csr & I2C_SR_MAL) { if (csr & I2C_SR_MAL) {
debug("i2c_wait: MAL\n"); debug("i2c_wait: MAL\n");
@ -317,29 +291,32 @@ i2c_wait(int write)
} }
static __inline__ int static __inline__ int
i2c_write_addr (u8 dev, u8 dir, int rsta) i2c_write_addr(struct i2c_adapter *adap, u8 dev, u8 dir, int rsta)
{ {
struct fsl_i2c *device = (struct fsl_i2c *)i2c_dev[adap->hwadapnr];
writeb(I2C_CR_MEN | I2C_CR_MSTA | I2C_CR_MTX writeb(I2C_CR_MEN | I2C_CR_MSTA | I2C_CR_MTX
| (rsta ? I2C_CR_RSTA : 0), | (rsta ? I2C_CR_RSTA : 0),
&i2c_dev[i2c_bus_num]->cr); &device->cr);
writeb((dev << 1) | dir, &i2c_dev[i2c_bus_num]->dr); writeb((dev << 1) | dir, &device->dr);
if (i2c_wait(I2C_WRITE_BIT) < 0) if (i2c_wait(adap, I2C_WRITE_BIT) < 0)
return 0; return 0;
return 1; return 1;
} }
static __inline__ int static __inline__ int
__i2c_write(u8 *data, int length) __i2c_write(struct i2c_adapter *adap, u8 *data, int length)
{ {
struct fsl_i2c *dev = (struct fsl_i2c *)i2c_dev[adap->hwadapnr];
int i; int i;
for (i = 0; i < length; i++) { for (i = 0; i < length; i++) {
writeb(data[i], &i2c_dev[i2c_bus_num]->dr); writeb(data[i], &dev->dr);
if (i2c_wait(I2C_WRITE_BIT) < 0) if (i2c_wait(adap, I2C_WRITE_BIT) < 0)
break; break;
} }
@ -347,57 +324,60 @@ __i2c_write(u8 *data, int length)
} }
static __inline__ int static __inline__ int
__i2c_read(u8 *data, int length) __i2c_read(struct i2c_adapter *adap, u8 *data, int length)
{ {
struct fsl_i2c *dev = (struct fsl_i2c *)i2c_dev[adap->hwadapnr];
int i; int i;
writeb(I2C_CR_MEN | I2C_CR_MSTA | ((length == 1) ? I2C_CR_TXAK : 0), writeb(I2C_CR_MEN | I2C_CR_MSTA | ((length == 1) ? I2C_CR_TXAK : 0),
&i2c_dev[i2c_bus_num]->cr); &dev->cr);
/* dummy read */ /* dummy read */
readb(&i2c_dev[i2c_bus_num]->dr); readb(&dev->dr);
for (i = 0; i < length; i++) { for (i = 0; i < length; i++) {
if (i2c_wait(I2C_READ_BIT) < 0) if (i2c_wait(adap, I2C_READ_BIT) < 0)
break; break;
/* Generate ack on last next to last byte */ /* Generate ack on last next to last byte */
if (i == length - 2) if (i == length - 2)
writeb(I2C_CR_MEN | I2C_CR_MSTA | I2C_CR_TXAK, writeb(I2C_CR_MEN | I2C_CR_MSTA | I2C_CR_TXAK,
&i2c_dev[i2c_bus_num]->cr); &dev->cr);
/* Do not generate stop on last byte */ /* Do not generate stop on last byte */
if (i == length - 1) if (i == length - 1)
writeb(I2C_CR_MEN | I2C_CR_MSTA | I2C_CR_MTX, writeb(I2C_CR_MEN | I2C_CR_MSTA | I2C_CR_MTX,
&i2c_dev[i2c_bus_num]->cr); &dev->cr);
data[i] = readb(&i2c_dev[i2c_bus_num]->dr); data[i] = readb(&dev->dr);
} }
return i; return i;
} }
int static int
i2c_read(u8 dev, uint addr, int alen, u8 *data, int length) fsl_i2c_read(struct i2c_adapter *adap, u8 dev, uint addr, int alen, u8 *data,
int length)
{ {
struct fsl_i2c *device = (struct fsl_i2c *)i2c_dev[adap->hwadapnr];
int i = -1; /* signal error */ int i = -1; /* signal error */
u8 *a = (u8*)&addr; u8 *a = (u8*)&addr;
if (i2c_wait4bus() < 0) if (i2c_wait4bus(adap) < 0)
return -1; return -1;
if ((!length || alen > 0) if ((!length || alen > 0)
&& i2c_write_addr(dev, I2C_WRITE_BIT, 0) != 0 && i2c_write_addr(adap, dev, I2C_WRITE_BIT, 0) != 0
&& __i2c_write(&a[4 - alen], alen) == alen) && __i2c_write(adap, &a[4 - alen], alen) == alen)
i = 0; /* No error so far */ i = 0; /* No error so far */
if (length && if (length &&
i2c_write_addr(dev, I2C_READ_BIT, alen ? 1 : 0) != 0) i2c_write_addr(adap, dev, I2C_READ_BIT, alen ? 1 : 0) != 0)
i = __i2c_read(data, length); i = __i2c_read(adap, data, length);
writeb(I2C_CR_MEN, &i2c_dev[i2c_bus_num]->cr); writeb(I2C_CR_MEN, &device->cr);
if (i2c_wait4bus()) /* Wait until STOP */ if (i2c_wait4bus(adap)) /* Wait until STOP */
debug("i2c_read: wait4bus timed out\n"); debug("i2c_read: wait4bus timed out\n");
if (i == length) if (i == length)
@ -406,20 +386,22 @@ i2c_read(u8 dev, uint addr, int alen, u8 *data, int length)
return -1; return -1;
} }
int static int
i2c_write(u8 dev, uint addr, int alen, u8 *data, int length) fsl_i2c_write(struct i2c_adapter *adap, u8 dev, uint addr, int alen,
u8 *data, int length)
{ {
struct fsl_i2c *device = (struct fsl_i2c *)i2c_dev[adap->hwadapnr];
int i = -1; /* signal error */ int i = -1; /* signal error */
u8 *a = (u8*)&addr; u8 *a = (u8*)&addr;
if (i2c_wait4bus() >= 0 if (i2c_wait4bus(adap) >= 0 &&
&& i2c_write_addr(dev, I2C_WRITE_BIT, 0) != 0 i2c_write_addr(adap, dev, I2C_WRITE_BIT, 0) != 0 &&
&& __i2c_write(&a[4 - alen], alen) == alen) { __i2c_write(adap, &a[4 - alen], alen) == alen) {
i = __i2c_write(data, length); i = __i2c_write(adap, data, length);
} }
writeb(I2C_CR_MEN, &i2c_dev[i2c_bus_num]->cr); writeb(I2C_CR_MEN, &device->cr);
if (i2c_wait4bus()) /* Wait until STOP */ if (i2c_wait4bus(adap)) /* Wait until STOP */
debug("i2c_write: wait4bus timed out\n"); debug("i2c_write: wait4bus timed out\n");
if (i == length) if (i == length)
@ -428,72 +410,42 @@ i2c_write(u8 dev, uint addr, int alen, u8 *data, int length)
return -1; return -1;
} }
int static int
i2c_probe(uchar chip) fsl_i2c_probe(struct i2c_adapter *adap, uchar chip)
{ {
struct fsl_i2c *dev = (struct fsl_i2c *)i2c_dev[adap->hwadapnr];
/* For unknow reason the controller will ACK when /* For unknow reason the controller will ACK when
* probing for a slave with the same address, so skip * probing for a slave with the same address, so skip
* it. * it.
*/ */
if (chip == (readb(&i2c_dev[i2c_bus_num]->adr) >> 1)) if (chip == (readb(&dev->adr) >> 1))
return -1; return -1;
return i2c_read(chip, 0, 0, NULL, 0); return fsl_i2c_read(adap, chip, 0, 0, NULL, 0);
} }
int i2c_set_bus_num(unsigned int bus) static unsigned int fsl_i2c_set_bus_speed(struct i2c_adapter *adap,
unsigned int speed)
{ {
#if defined(CONFIG_I2C_MUX) struct fsl_i2c *dev = (struct fsl_i2c *)i2c_dev[adap->hwadapnr];
if (bus < CONFIG_SYS_MAX_I2C_BUS) {
i2c_bus_num = bus;
} else {
int ret;
ret = i2x_mux_select_mux(bus); writeb(0, &dev->cr); /* stop controller */
if (ret) set_i2c_bus_speed(dev, get_i2c_clock(adap->hwadapnr), speed);
return ret; writeb(I2C_CR_MEN, &dev->cr); /* start controller */
i2c_bus_num = 0;
}
i2c_bus_num_mux = bus;
#else
#ifdef CONFIG_SYS_I2C2_OFFSET
if (bus > 1) {
#else
if (bus > 0) {
#endif
return -1;
}
i2c_bus_num = bus;
#endif
return 0;
}
int i2c_set_bus_speed(unsigned int speed)
{
unsigned int i2c_clk = (i2c_bus_num == 1)
? gd->arch.i2c2_clk : gd->arch.i2c1_clk;
writeb(0, &i2c_dev[i2c_bus_num]->cr); /* stop controller */
i2c_bus_speed[i2c_bus_num] =
set_i2c_bus_speed(i2c_dev[i2c_bus_num], i2c_clk, speed);
writeb(I2C_CR_MEN, &i2c_dev[i2c_bus_num]->cr); /* start controller */
return 0; return 0;
} }
unsigned int i2c_get_bus_num(void) /*
{ * Register fsl i2c adapters
#if defined(CONFIG_I2C_MUX) */
return i2c_bus_num_mux; U_BOOT_I2C_ADAP_COMPLETE(fsl_0, fsl_i2c_init, fsl_i2c_probe, fsl_i2c_read,
#else fsl_i2c_write, fsl_i2c_set_bus_speed,
return i2c_bus_num; CONFIG_SYS_FSL_I2C_SPEED, CONFIG_SYS_FSL_I2C_SLAVE,
0)
#ifdef CONFIG_SYS_FSL_I2C2_OFFSET
U_BOOT_I2C_ADAP_COMPLETE(fsl_1, fsl_i2c_init, fsl_i2c_probe, fsl_i2c_read,
fsl_i2c_write, fsl_i2c_set_bus_speed,
CONFIG_SYS_FSL_I2C2_SPEED, CONFIG_SYS_FSL_I2C2_SLAVE,
1)
#endif #endif
}
unsigned int i2c_get_bus_speed(void)
{
return i2c_bus_speed[i2c_bus_num];
}
#endif /* CONFIG_HARD_I2C */

16
include/configs/B4860QDS.h
View File

@ -459,14 +459,14 @@ unsigned long get_board_ddr_clk(void);
#define CONFIG_FIT_VERBOSE /* enable fit_format_{error,warning}() */ #define CONFIG_FIT_VERBOSE /* enable fit_format_{error,warning}() */
/* I2C */ /* I2C */
#define CONFIG_FSL_I2C /* Use FSL common I2C driver */ #define CONFIG_SYS_I2C
#define CONFIG_HARD_I2C /* I2C with hardware support */ #define CONFIG_SYS_I2C_FSL /* Use FSL common I2C driver */
#define CONFIG_I2C_MULTI_BUS #define CONFIG_SYS_FSL_I2C_SPEED 400000 /* I2C speed in Hz */
#define CONFIG_I2C_CMD_TREE #define CONFIG_SYS_FSL_I2C_SLAVE 0x7F
#define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed in Hz */ #define CONFIG_SYS_FSL_I2C2_SPEED 400000 /* I2C speed in Hz */
#define CONFIG_SYS_I2C_SLAVE 0x7F #define CONFIG_SYS_FSL_I2C2_SLAVE 0x7F
#define CONFIG_SYS_I2C_OFFSET 0x118000 #define CONFIG_SYS_FSL_I2C_OFFSET 0x118000
#define CONFIG_SYS_I2C2_OFFSET 0x119000 #define CONFIG_SYS_FSL_I2C2_OFFSET 0x119000
/* /*
* RTC configuration * RTC configuration

11
include/configs/BSC9131RDB.h
View File

@ -275,12 +275,11 @@ extern unsigned long get_sdram_size(void);
#define CONFIG_FIT #define CONFIG_FIT
#define CONFIG_FIT_VERBOSE /* enable fit_format_{error,warning}() */ #define CONFIG_FIT_VERBOSE /* enable fit_format_{error,warning}() */
#define CONFIG_FSL_I2C /* Use FSL common I2C driver */ #define CONFIG_SYS_I2C
#define CONFIG_HARD_I2C /* I2C with hardware support */ #define CONFIG_SYS_I2C_FSL
#define CONFIG_I2C_MULTI_BUS #define CONFIG_SYS_FSL_I2C_SPEED 400000
#define CONFIG_I2C_CMD_TREE #define CONFIG_SYS_FSL_I2C_SLAVE 0x7F
#define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed and slave address*/ #define CONFIG_SYS_FSL_I2C_OFFSET 0x3000
#define CONFIG_SYS_I2C_OFFSET 0x3000
/* I2C EEPROM */ /* I2C EEPROM */
#define CONFIG_CMD_EEPROM #define CONFIG_CMD_EEPROM

17
include/configs/BSC9132QDS.h
View File

@ -451,15 +451,14 @@ combinations. this should be removed later
#define CONFIG_FIT #define CONFIG_FIT
#define CONFIG_FIT_VERBOSE /* enable fit_format_{error,warning}() */ #define CONFIG_FIT_VERBOSE /* enable fit_format_{error,warning}() */
#define CONFIG_FSL_I2C /* Use FSL common I2C driver */ #define CONFIG_SYS_I2C
#define CONFIG_HARD_I2C /* I2C with hardware support */ #define CONFIG_SYS_I2C_FSL
#undef CONFIG_SOFT_I2C /* I2C bit-banged */ #define CONFIG_SYS_FSL_I2C_SPEED 400800 /* I2C speed and slave address*/
#define CONFIG_I2C_MULTI_BUS #define CONFIG_SYS_FSL_I2C_SLAVE 0x7F
#define CONFIG_I2C_CMD_TREE #define CONFIG_SYS_FSL_I2C2_SPEED 400800 /* I2C speed and slave address*/
#define CONFIG_SYS_I2C_SPEED 400800 /* I2C speed and slave address*/ #define CONFIG_SYS_FSL_I2C2_SLAVE 0x7F
#define CONFIG_SYS_I2C_SLAVE 0x7F #define CONFIG_SYS_FSL_I2C_OFFSET 0x3000
#define CONFIG_SYS_I2C_OFFSET 0x3000 #define CONFIG_SYS_FSL_I2C2_OFFSET 0x3100
#define CONFIG_SYS_I2C2_OFFSET 0x3100
/* I2C EEPROM */ /* I2C EEPROM */
#define CONFIG_ID_EEPROM #define CONFIG_ID_EEPROM

18
include/configs/HWW1U1A.h
View File

@ -218,16 +218,16 @@
/* -------------------------------------------------------------------- */ /* -------------------------------------------------------------------- */
/* Generic FreeScale hardware I2C support */ /* Generic FreeScale hardware I2C support */
#define CONFIG_HARD_I2C #define CONFIG_SYS_I2C
#define CONFIG_FSL_I2C #define CONFIG_SYS_I2C_FSL
#define CONFIG_SYS_FSL_I2C_SPEED 400000
#define CONFIG_SYS_FSL_I2C_SLAVE 0x7F
#define CONFIG_SYS_FSL_I2C_OFFSET 0x3000
#define CONFIG_SYS_FSL_I2C2_SPEED 400000
#define CONFIG_SYS_FSL_I2C2_SLAVE 0x7F
#define CONFIG_SYS_FSL_I2C2_OFFSET 0x3100
#define CONFIG_SYS_I2C_NOPROBES { {0, 0x29} }
#define CONFIG_CMD_I2C #define CONFIG_CMD_I2C
#define CONFIG_I2C_MULTI_BUS
#define CONFIG_SYS_I2C_OFFSET 0x3000
#define CONFIG_SYS_I2C2_OFFSET 0x3100
/* I2C bus configuration */
#define CONFIG_SYS_I2C_SPEED 400000
#define CONFIG_SYS_I2C_SLAVE 0x7F
/* DDR2 SO-RDIMM SPD EEPROM is at I2C0-0x51 */ /* DDR2 SO-RDIMM SPD EEPROM is at I2C0-0x51 */
#define CONFIG_SYS_SPD_BUS_NUM 0 #define CONFIG_SYS_SPD_BUS_NUM 0

10
include/configs/M5208EVBE.h
View File

@ -82,11 +82,11 @@
#undef CONFIG_MCFPIT #undef CONFIG_MCFPIT
/* I2C */ /* I2C */
#define CONFIG_FSL_I2C #define CONFIG_SYS_I2C
#define CONFIG_HARD_I2C /* I2C with hw support */ #define CONFIG_SYS_I2C_FSL
#define CONFIG_SYS_I2C_SPEED 80000 #define CONFIG_SYS_FSL_I2C_SPEED 80000
#define CONFIG_SYS_I2C_SLAVE 0x7F #define CONFIG_SYS_FSL_I2C_SLAVE 0x7F
#define CONFIG_SYS_I2C_OFFSET 0x58000 #define CONFIG_SYS_FSL_I2C_OFFSET 0x58000
#define CONFIG_SYS_IMMR CONFIG_SYS_MBAR #define CONFIG_SYS_IMMR CONFIG_SYS_MBAR
#define CONFIG_BOOTDELAY 1 /* autoboot after 5 seconds */ #define CONFIG_BOOTDELAY 1 /* autoboot after 5 seconds */

10
include/configs/M52277EVB.h
View File

@ -145,11 +145,11 @@
#undef CONFIG_MCFPIT #undef CONFIG_MCFPIT
/* I2c */ /* I2c */
#define CONFIG_FSL_I2C #define CONFIG_SYS_I2C
#define CONFIG_HARD_I2C /* I2C with hardware support */ #define CONFIG_SYS_I2C_FSL
#define CONFIG_SYS_I2C_SPEED 80000 /* I2C speed and slave address */ #define CONFIG_SYS_FSL_I2C_SPEED 80000
#define CONFIG_SYS_I2C_SLAVE 0x7F #define CONFIG_SYS_FSL_I2C_SLAVE 0x7F
#define CONFIG_SYS_I2C_OFFSET 0x58000 #define CONFIG_SYS_FSL_I2C_OFFSET 0x58000
#define CONFIG_SYS_IMMR CONFIG_SYS_MBAR #define CONFIG_SYS_IMMR CONFIG_SYS_MBAR
/* DSPI and Serial Flash */ /* DSPI and Serial Flash */

10
include/configs/M5235EVB.h
View File

@ -99,11 +99,11 @@
#undef CONFIG_MCFPIT #undef CONFIG_MCFPIT
/* I2C */ /* I2C */
#define CONFIG_FSL_I2C #define CONFIG_SYS_I2C
#define CONFIG_HARD_I2C /* I2C with hw support */ #define CONFIG_SYS_i2C_FSL
#define CONFIG_SYS_I2C_SPEED 80000 #define CONFIG_SYS_FSL_I2C_SPEED 80000
#define CONFIG_SYS_I2C_SLAVE 0x7F #define CONFIG_SYS_FSL_I2C_SLAVE 0x7F
#define CONFIG_SYS_I2C_OFFSET 0x00000300 #define CONFIG_SYS_FSL_I2C_OFFSET 0x00000300
#define CONFIG_SYS_IMMR CONFIG_SYS_MBAR #define CONFIG_SYS_IMMR CONFIG_SYS_MBAR
#define CONFIG_SYS_I2C_PINMUX_REG (gpio->par_qspi) #define CONFIG_SYS_I2C_PINMUX_REG (gpio->par_qspi)
#define CONFIG_SYS_I2C_PINMUX_CLR ~(GPIO_PAR_FECI2C_SCL_MASK | GPIO_PAR_FECI2C_SDA_MASK) #define CONFIG_SYS_I2C_PINMUX_CLR ~(GPIO_PAR_FECI2C_SCL_MASK | GPIO_PAR_FECI2C_SDA_MASK)

10
include/configs/M5253DEMO.h
View File

@ -114,11 +114,11 @@
#define CONFIG_HOSTNAME M5253DEMO #define CONFIG_HOSTNAME M5253DEMO
/* I2C */ /* I2C */
#define CONFIG_FSL_I2C #define CONFIG_SYS_I2C
#define CONFIG_HARD_I2C /* I2C with hw support */ #define CONFIG_SYS_I2C_FSL
#define CONFIG_SYS_I2C_SPEED 80000 #define CONFIG_SYS_FSL_I2C_SPEED 80000
#define CONFIG_SYS_I2C_SLAVE 0x7F #define CONFIG_SYS_FSL_I2C_SLAVE 0x7F
#define CONFIG_SYS_I2C_OFFSET 0x00000280 #define CONFIG_SYS_FSL_I2C_OFFSET 0x00000280
#define CONFIG_SYS_IMMR CONFIG_SYS_MBAR #define CONFIG_SYS_IMMR CONFIG_SYS_MBAR
#define CONFIG_SYS_I2C_PINMUX_REG (*(u32 *) (CONFIG_SYS_MBAR+0x19C)) #define CONFIG_SYS_I2C_PINMUX_REG (*(u32 *) (CONFIG_SYS_MBAR+0x19C))
#define CONFIG_SYS_I2C_PINMUX_CLR (0xFFFFE7FF) #define CONFIG_SYS_I2C_PINMUX_CLR (0xFFFFE7FF)

10
include/configs/M5271EVB.h
View File

@ -109,11 +109,11 @@
#endif #endif
/* I2C */ /* I2C */
#define CONFIG_FSL_I2C #define CONFIG_SYS_I2C
#define CONFIG_HARD_I2C /* I2C with hw support */ #define CONFIG_SYS_I2C_FSL
#define CONFIG_SYS_I2C_SPEED 80000 #define CONFIG_SYS_FSL_I2C_SPEED 80000
#define CONFIG_SYS_I2C_SLAVE 0x7F #define CONFIG_SYS_FSL_I2C_SLAVE 0x7F
#define CONFIG_SYS_I2C_OFFSET 0x00000300 #define CONFIG_SYS_FSL_I2C_OFFSET 0x00000300
#define CONFIG_SYS_IMMR CONFIG_SYS_MBAR #define CONFIG_SYS_IMMR CONFIG_SYS_MBAR
#define CONFIG_BOOTDELAY 1 /* autoboot after 1 seconds */ #define CONFIG_BOOTDELAY 1 /* autoboot after 1 seconds */

10
include/configs/M5275EVB.h
View File

@ -109,11 +109,11 @@
#endif #endif
/* I2C */ /* I2C */
#define CONFIG_FSL_I2C #define CONFIG_SYS_I2C
#define CONFIG_HARD_I2C /* I2C with hw support */ #define CONFIG_SYS_I2C_FSL
#define CONFIG_SYS_I2C_SPEED 80000 #define CONFIG_SYS_FSL_I2C_SPEED 80000
#define CONFIG_SYS_I2C_SLAVE 0x7F #define CONFIG_SYS_FSL_I2C_SLAVE 0x7F
#define CONFIG_SYS_I2C_OFFSET 0x00000300 #define CONFIG_SYS_FSL_I2C_OFFSET 0x00000300
#define CONFIG_SYS_IMMR CONFIG_SYS_MBAR #define CONFIG_SYS_IMMR CONFIG_SYS_MBAR
#define CONFIG_SYS_I2C_PINMUX_REG (gpio_reg->par_feci2c) #define CONFIG_SYS_I2C_PINMUX_REG (gpio_reg->par_feci2c)
#define CONFIG_SYS_I2C_PINMUX_CLR (0xFFF0) #define CONFIG_SYS_I2C_PINMUX_CLR (0xFFF0)

10
include/configs/M53017EVB.h
View File

@ -101,11 +101,11 @@
#undef CONFIG_MCFPIT #undef CONFIG_MCFPIT
/* I2C */ /* I2C */
#define CONFIG_FSL_I2C #define CONFIG_SYS_I2C
#define CONFIG_HARD_I2C /* I2C with hw support */ #define CONFIG_SYS_I2C_FSL
#define CONFIG_SYS_I2C_SPEED 80000 #define CONFIG_SYS_FSL_I2C_SPEED 80000
#define CONFIG_SYS_I2C_SLAVE 0x7F #define CONFIG_SYS_FSL_I2C_SLAVE 0x7F
#define CONFIG_SYS_I2C_OFFSET 0x58000 #define CONFIG_SYS_FSL_I2C_OFFSET 0x58000
#define CONFIG_SYS_IMMR CONFIG_SYS_MBAR #define CONFIG_SYS_IMMR CONFIG_SYS_MBAR
#define CONFIG_BOOTDELAY 1 /* autoboot after 5 seconds */ #define CONFIG_BOOTDELAY 1 /* autoboot after 5 seconds */

10
include/configs/M5329EVB.h
View File

@ -95,11 +95,11 @@
#undef CONFIG_MCFPIT #undef CONFIG_MCFPIT
/* I2C */ /* I2C */
#define CONFIG_FSL_I2C #define CONFIG_SYS_I2C
#define CONFIG_HARD_I2C /* I2C with hw support */ #define CONFIG_SYS_I2C_FSL
#define CONFIG_SYS_I2C_SPEED 80000 #define CONFIG_SYS_FSL_I2C_SPEED 80000
#define CONFIG_SYS_I2C_SLAVE 0x7F #define CONFIG_SYS_FSL_I2C_SLAVE 0x7F
#define CONFIG_SYS_I2C_OFFSET 0x58000 #define CONFIG_SYS_FSL_I2C_OFFSET 0x58000
#define CONFIG_SYS_IMMR CONFIG_SYS_MBAR #define CONFIG_SYS_IMMR CONFIG_SYS_MBAR
#define CONFIG_BOOTDELAY 1 /* autoboot after 5 seconds */ #define CONFIG_BOOTDELAY 1 /* autoboot after 5 seconds */

10
include/configs/M5373EVB.h
View File

@ -95,11 +95,11 @@
#undef CONFIG_MCFPIT #undef CONFIG_MCFPIT
/* I2C */ /* I2C */
#define CONFIG_FSL_I2C #define CONFIG_SYS_I2C
#define CONFIG_HARD_I2C /* I2C with hw support */ #define CONFIG_SYS_I2C_FSL
#define CONFIG_SYS_I2C_SPEED 80000 #define CONFIG_SYS_FSL_I2C_SPEED 80000
#define CONFIG_SYS_I2C_SLAVE 0x7F #define CONFIG_SYS_FSL_I2C_SLAVE 0x7F
#define CONFIG_SYS_I2C_OFFSET 0x58000 #define CONFIG_SYS_FSL_I2C_OFFSET 0x58000
#define CONFIG_SYS_IMMR CONFIG_SYS_MBAR #define CONFIG_SYS_IMMR CONFIG_SYS_MBAR
#define CONFIG_BOOTDELAY 1 /* autoboot after 5 seconds */ #define CONFIG_BOOTDELAY 1 /* autoboot after 5 seconds */

2
include/configs/M54418TWR.h
View File

@ -213,7 +213,7 @@
#undef CONFIG_MCFPIT #undef CONFIG_MCFPIT
/* I2c */ /* I2c */
#undef CONFIG_FSL_I2C #undef CONFIG_SYS_FSL_I2C
#undef CONFIG_HARD_I2C /* I2C with hardware support */ #undef CONFIG_HARD_I2C /* I2C with hardware support */
#undef CONFIG_SYS_I2C_SOFT /* I2C bit-banged */ #undef CONFIG_SYS_I2C_SOFT /* I2C bit-banged */
/* I2C speed and slave address */ /* I2C speed and slave address */

10
include/configs/M54451EVB.h
View File

@ -156,11 +156,11 @@
#undef CONFIG_MCFPIT #undef CONFIG_MCFPIT
/* I2c */ /* I2c */
#define CONFIG_FSL_I2C #define CONFIG_SYS_I2C
#define CONFIG_HARD_I2C /* I2C with hardware support */ #define CONFIG_SYS_I2C_FSL
#define CONFIG_SYS_I2C_SPEED 80000 /* I2C speed and slave address */ #define CONFIG_SYS_FSL_I2C_SPEED 80000
#define CONFIG_SYS_I2C_SLAVE 0x7F #define CONFIG_SYS_FSL_I2C_SLAVE 0x7F
#define CONFIG_SYS_I2C_OFFSET 0x58000 #define CONFIG_SYS_FSL_I2C_OFFSET 0x58000
#define CONFIG_SYS_IMMR CONFIG_SYS_MBAR #define CONFIG_SYS_IMMR CONFIG_SYS_MBAR
/* DSPI and Serial Flash */ /* DSPI and Serial Flash */

10
include/configs/M54455EVB.h
View File

@ -189,11 +189,11 @@
#undef CONFIG_MCFPIT #undef CONFIG_MCFPIT
/* I2c */ /* I2c */
#define CONFIG_FSL_I2C #define CONFIG_SYS_I2C
#define CONFIG_HARD_I2C /* I2C with hardware support */ #define CONFIG_SYS_I2C_FSL
#define CONFIG_SYS_I2C_SPEED 80000 /* I2C speed and slave address */ #define CONFIG_SYS_FSL_I2C_SPEED 80000
#define CONFIG_SYS_I2C_SLAVE 0x7F #define CONFIG_SYS_FSL_I2C_SLAVE 0x7F
#define CONFIG_SYS_I2C_OFFSET 0x58000 #define CONFIG_SYS_FSLI2C_OFFSET 0x58000
#define CONFIG_SYS_IMMR CONFIG_SYS_MBAR #define CONFIG_SYS_IMMR CONFIG_SYS_MBAR
/* DSPI and Serial Flash */ /* DSPI and Serial Flash */

10
include/configs/M5475EVB.h
View File

@ -120,11 +120,11 @@
#endif #endif
/* I2C */ /* I2C */
#define CONFIG_FSL_I2C #define CONFIG_SYS_I2C
#define CONFIG_HARD_I2C /* I2C with hw support */ #define CONFIG_SYS_I2C_FSL
#define CONFIG_SYS_I2C_SPEED 80000 #define CONFIG_SYS_FSL_I2C_SPEED 80000
#define CONFIG_SYS_I2C_SLAVE 0x7F #define CONFIG_SYS_FSL_I2C_SLAVE 0x7F
#define CONFIG_SYS_I2C_OFFSET 0x00008F00 #define CONFIG_SYS_FSL_I2C_OFFSET 0x00008F00
#define CONFIG_SYS_IMMR CONFIG_SYS_MBAR #define CONFIG_SYS_IMMR CONFIG_SYS_MBAR
/* PCI */ /* PCI */

10
include/configs/M5485EVB.h
View File

@ -117,11 +117,11 @@
#endif #endif
/* I2C */ /* I2C */
#define CONFIG_FSL_I2C #define CONFIG_SYS_I2C
#define CONFIG_HARD_I2C /* I2C with hw support */ #define CONFIG_SYS_I2C_FSL
#define CONFIG_SYS_I2C_SPEED 80000 #define CONFIG_SYS_FSL_I2C_SPEED 80000
#define CONFIG_SYS_I2C_SLAVE 0x7F #define CONFIG_SYS_FSL_I2C_SLAVE 0x7F
#define CONFIG_SYS_I2C_OFFSET 0x00008F00 #define CONFIG_SYS_FSL_I2C_OFFSET 0x00008F00
#define CONFIG_SYS_IMMR CONFIG_SYS_MBAR #define CONFIG_SYS_IMMR CONFIG_SYS_MBAR
/* PCI */ /* PCI */

15
include/configs/MERGERBOX.h
View File

@ -224,13 +224,14 @@
#define CONFIG_OF_STDOUT_VIA_ALIAS 1 #define CONFIG_OF_STDOUT_VIA_ALIAS 1
/* I2C */ /* I2C */
#define CONFIG_HARD_I2C #define CONFIG_SYS_I2C
#define CONFIG_FSL_I2C #define CONFIG_SYS_I2C_FSL
#define CONFIG_I2C_MULTI_BUS #define CONFIG_SYS_FSL_I2C_SPEED 400000
#define CONFIG_SYS_I2C_SPEED 120000 #define CONFIG_SYS_FSL_I2C_SLAVE 0x7F
#define CONFIG_SYS_I2C_SLAVE 0x7F #define CONFIG_SYS_FSL_I2C_OFFSET 0x3000
#define CONFIG_SYS_I2C_OFFSET 0x3000 #define CONFIG_SYS_FSL_I2C2_SPEED 400000
#define CONFIG_SYS_I2C2_OFFSET 0x3100 #define CONFIG_SYS_FSL_I2C2_SLAVE 0x7F
#define CONFIG_SYS_FSL_I2C2_OFFSET 0x3100
/* /*
* General PCI * General PCI

17
include/configs/MPC8308RDB.h
View File

@ -350,14 +350,15 @@
#define CONFIG_OF_STDOUT_VIA_ALIAS 1 #define CONFIG_OF_STDOUT_VIA_ALIAS 1
/* I2C */ /* I2C */
#define CONFIG_HARD_I2C /* I2C with hardware support */ #define CONFIG_SYS_I2C
#define CONFIG_FSL_I2C #define CONFIG_SYS_I2C_FSL
#define CONFIG_I2C_MULTI_BUS #define CONFIG_SYS_FSL_I2C_SPEED 400000
#define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed and slave address */ #define CONFIG_SYS_FSL_I2C_SLAVE 0x7F
#define CONFIG_SYS_I2C_SLAVE 0x7F #define CONFIG_SYS_FSL_I2C_OFFSET 0x3000
#define CONFIG_SYS_I2C_NOPROBES { {0, 0x51} } /* Don't probe these addrs */ #define CONFIG_SYS_FSL_I2C2_SPEED 400000
#define CONFIG_SYS_I2C_OFFSET 0x3000 #define CONFIG_SYS_FSL_I2C2_SLAVE 0x7F
#define CONFIG_SYS_I2C2_OFFSET 0x3100 #define CONFIG_SYS_FSL_I2C2_OFFSET 0x3100
#define CONFIG_SYS_I2C_NOPROBES { {0, 0x51} }
/* /*
* SPI on header J8 * SPI on header J8

17
include/configs/MPC8313ERDB.h
View File

@ -403,14 +403,15 @@
#define CONFIG_SYS_HUSH_PARSER #define CONFIG_SYS_HUSH_PARSER
/* I2C */ /* I2C */
#define CONFIG_HARD_I2C /* I2C with hardware support*/ #define CONFIG_SYS_I2C
#define CONFIG_FSL_I2C #define CONFIG_SYS_I2C_FSL
#define CONFIG_I2C_MULTI_BUS #define CONFIG_SYS_FSL_I2C_SPEED 400000
#define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed and slave address */ #define CONFIG_SYS_FSL_I2C_SLAVE 0x7F
#define CONFIG_SYS_I2C_SLAVE 0x7F #define CONFIG_SYS_FSL_I2C_OFFSET 0x3000
#define CONFIG_SYS_I2C_NOPROBES { {0, 0x69} } /* Don't probe these addrs */ #define CONFIG_SYS_FSL_I2C2_SPEED 400000
#define CONFIG_SYS_I2C_OFFSET 0x3000 #define CONFIG_SYS_FSL_I2C2_SLAVE 0x7F
#define CONFIG_SYS_I2C2_OFFSET 0x3100 #define CONFIG_SYS_FSL_I2C2_OFFSET 0x3100
#define CONFIG_SYS_I2C_NOPROBES { {0, 0x69} }
/* /*
* General PCI * General PCI

13
include/configs/MPC8315ERDB.h
View File

@ -347,13 +347,12 @@
#define CONFIG_OF_STDOUT_VIA_ALIAS 1 #define CONFIG_OF_STDOUT_VIA_ALIAS 1
/* I2C */ /* I2C */
#define CONFIG_HARD_I2C /* I2C with hardware support */ #define CONFIG_SYS_I2C
#define CONFIG_FSL_I2C #define CONFIG_SYS_I2C_FSL
#define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed and slave addr */ #define CONFIG_SYS_FSL_I2C_SPEED 400000
#define CONFIG_SYS_I2C_SLAVE 0x7F #define CONFIG_SYS_FSL_I2C_SLAVE 0x7F
#define CONFIG_SYS_I2C_NOPROBES {0x51} /* Don't probe these addrs */ #define CONFIG_SYS_FSL_I2C_OFFSET 0x3000
#define CONFIG_SYS_I2C_OFFSET 0x3000 #define CONFIG_SYS_I2C_NOPROBES { {0, 0x51} }
#define CONFIG_SYS_I2C2_OFFSET 0x3100
/* /*
* Board info - revision and where boot from * Board info - revision and where boot from

12
include/configs/MPC8323ERDB.h
View File

@ -233,12 +233,12 @@
#define CONFIG_OF_STDOUT_VIA_ALIAS 1 #define CONFIG_OF_STDOUT_VIA_ALIAS 1
/* I2C */ /* I2C */
#define CONFIG_HARD_I2C /* I2C with hardware support */ #define CONFIG_SYS_I2C
#define CONFIG_FSL_I2C #define CONFIG_SYS_I2C_FSL
#define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed and slave address */ #define CONFIG_SYS_FSL_I2C_SPEED 400000
#define CONFIG_SYS_I2C_SLAVE 0x7F #define CONFIG_SYS_FSL_I2C_SLAVE 0x7F
#define CONFIG_SYS_I2C_NOPROBES {0x51} /* Don't probe these addrs */ #define CONFIG_SYS_FSL_I2C_OFFSET 0x3000
#define CONFIG_SYS_I2C_OFFSET 0x3000 #define CONFIG_SYS_I2C_NOPROBES { {0, 0x51} }
/* /*
* Config on-board EEPROM * Config on-board EEPROM

12
include/configs/MPC832XEMDS.h
View File

@ -326,12 +326,12 @@
#define CONFIG_OF_STDOUT_VIA_ALIAS 1 #define CONFIG_OF_STDOUT_VIA_ALIAS 1
/* I2C */ /* I2C */
#define CONFIG_HARD_I2C /* I2C with hardware support */ #define CONFIG_SYS_I2C
#define CONFIG_FSL_I2C #define CONFIG_SYS_I2C_FSL
#define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed and slave address */ #define CONFIG_SYS_FSL_I2C_SPEED 400000
#define CONFIG_SYS_I2C_SLAVE 0x7F #define CONFIG_SYS_FSL_I2C_SLAVE 0x7F
#define CONFIG_SYS_I2C_NOPROBES {0x51} /* Don't probe these addrs */ #define CONFIG_SYS_FSL_I2C_OFFSET 0x3000
#define CONFIG_SYS_I2C_OFFSET 0x3000 #define CONFIG_SYS_I2C_NOPROBES { {0, 0x51} }
/* /*
* Config on-board RTC * Config on-board RTC

17
include/configs/MPC8349EMDS.h
View File

@ -354,14 +354,15 @@
#define CONFIG_OF_STDOUT_VIA_ALIAS 1 #define CONFIG_OF_STDOUT_VIA_ALIAS 1
/* I2C */ /* I2C */
#define CONFIG_HARD_I2C /* I2C with hardware support*/ #define CONFIG_SYS_I2C
#define CONFIG_FSL_I2C #define CONFIG_SYS_I2C_FSL
#define CONFIG_I2C_MULTI_BUS #define CONFIG_SYS_FSL_I2C_SPEED 400000
#define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed and slave address */ #define CONFIG_SYS_FSL_I2C_SLAVE 0x7F
#define CONFIG_SYS_I2C_SLAVE 0x7F #define CONFIG_SYS_FSL_I2C_OFFSET 0x3000
#define CONFIG_SYS_I2C_NOPROBES { {0, 0x69} } /* Don't probe these addrs */ #define CONFIG_SYS_FSL_I2C2_SPEED 400000
#define CONFIG_SYS_I2C_OFFSET 0x3000 #define CONFIG_SYS_FSL_I2C2_SLAVE 0x7F
#define CONFIG_SYS_I2C2_OFFSET 0x3100 #define CONFIG_SYS_FSL_I2C2_OFFSET 0x3100
#define CONFIG_SYS_I2C_NOPROBES { {0, 0x69} }
/* SPI */ /* SPI */
#define CONFIG_MPC8XXX_SPI #define CONFIG_MPC8XXX_SPI

22
include/configs/MPC8349ITX.h
View File

@ -90,7 +90,7 @@
#define CONFIG_PCI #define CONFIG_PCI
#define CONFIG_RTC_DS1337 #define CONFIG_RTC_DS1337
#define CONFIG_HARD_I2C #define CONFIG_SYS_I2C
#define CONFIG_TSEC_ENET /* TSEC Ethernet support */ #define CONFIG_TSEC_ENET /* TSEC Ethernet support */
/* /*
@ -98,12 +98,15 @@
*/ */
/* I2C */ /* I2C */
#ifdef CONFIG_HARD_I2C #ifdef CONFIG_SYS_I2C
#define CONFIG_SYS_I2C_FSL
#define CONFIG_SYS_FSL_I2C_SPEED 400000
#define CONFIG_SYS_FSL_I2C_SLAVE 0x7F
#define CONFIG_SYS_FSL_I2C_OFFSET 0x3000
#define CONFIG_SYS_FSL_I2C2_SPEED 400000
#define CONFIG_SYS_FSL_I2C2_SLAVE 0x7F
#define CONFIG_SYS_FSL_I2C2_OFFSET 0x3100
#define CONFIG_FSL_I2C
#define CONFIG_I2C_MULTI_BUS
#define CONFIG_SYS_I2C_OFFSET 0x3000
#define CONFIG_SYS_I2C2_OFFSET 0x3100
#define CONFIG_SYS_SPD_BUS_NUM 1 /* The I2C bus for SPD */ #define CONFIG_SYS_SPD_BUS_NUM 1 /* The I2C bus for SPD */
#define CONFIG_SYS_RTC_BUS_NUM 1 /* The I2C bus for RTC */ #define CONFIG_SYS_RTC_BUS_NUM 1 /* The I2C bus for RTC */
@ -115,9 +118,6 @@
#define CONFIG_SYS_I2C_RTC_ADDR 0x68 /* I2C1, DS1339 RTC*/ #define CONFIG_SYS_I2C_RTC_ADDR 0x68 /* I2C1, DS1339 RTC*/
#define SPD_EEPROM_ADDRESS 0x51 /* I2C1, DDR */ #define SPD_EEPROM_ADDRESS 0x51 /* I2C1, DDR */
#define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed and slave address */
#define CONFIG_SYS_I2C_SLAVE 0x7F
/* Don't probe these addresses: */ /* Don't probe these addresses: */
#define CONFIG_SYS_I2C_NOPROBES { {1, CONFIG_SYS_I2C_8574_ADDR1}, \ #define CONFIG_SYS_I2C_NOPROBES { {1, CONFIG_SYS_I2C_8574_ADDR1}, \
{1, CONFIG_SYS_I2C_8574_ADDR2}, \ {1, CONFIG_SYS_I2C_8574_ADDR2}, \
@ -197,7 +197,7 @@
#define CONFIG_VERY_BIG_RAM #define CONFIG_VERY_BIG_RAM
#define CONFIG_MAX_MEM_MAPPED ((phys_size_t)256 << 20) #define CONFIG_MAX_MEM_MAPPED ((phys_size_t)256 << 20)
#ifdef CONFIG_HARD_I2C #ifdef CONFIG_SYS_I2C
#define CONFIG_SPD_EEPROM /* use SPD EEPROM for DDR setup*/ #define CONFIG_SPD_EEPROM /* use SPD EEPROM for DDR setup*/
#endif #endif
@ -543,7 +543,7 @@ boards, we say we have two, but don't display a message if we find only one. */
#define CONFIG_CMD_PCI #define CONFIG_CMD_PCI
#endif #endif
#ifdef CONFIG_HARD_I2C #ifdef CONFIG_SYS_I2C
#define CONFIG_CMD_I2C #define CONFIG_CMD_I2C
#endif #endif

13
include/configs/MPC8360EMDS.h
View File

@ -423,13 +423,12 @@
#define CONFIG_OF_STDOUT_VIA_ALIAS 1 #define CONFIG_OF_STDOUT_VIA_ALIAS 1
/* I2C */ /* I2C */
#define CONFIG_HARD_I2C /* I2C with hardware support */ #define CONFIG_SYS_I2C
#define CONFIG_FSL_I2C #define CONFIG_SYS_I2C_FSL
#define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed and slave address */ #define CONFIG_SYS_FSL_I2C_SPEED 400000
#define CONFIG_SYS_I2C_SLAVE 0x7F #define CONFIG_SYS_FSL_I2C_SLAVE 0x7F
#define CONFIG_SYS_I2C_NOPROBES {0x52} /* Don't probe these addrs */ #define CONFIG_SYS_FSL_I2C_OFFSET 0x3000
#define CONFIG_SYS_I2C_OFFSET 0x3000 #define CONFIG_SYS_I2C_NOPROBES { {0, 0x52} }
#define CONFIG_SYS_I2C2_OFFSET 0x3100
/* /*
* Config on-board RTC * Config on-board RTC

17
include/configs/MPC8360ERDK.h
View File

@ -287,14 +287,15 @@
#define CONFIG_OF_STDOUT_VIA_ALIAS #define CONFIG_OF_STDOUT_VIA_ALIAS
/* I2C */ /* I2C */
#define CONFIG_HARD_I2C /* I2C with hardware support */ #define CONFIG_SYS_I2C
#define CONFIG_FSL_I2C #define CONFIG_SYS_I2C_FSL
#define CONFIG_I2C_MULTI_BUS #define CONFIG_SYS_FSL_I2C_SPEED 400000
#define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed and slave address */ #define CONFIG_SYS_FSL_I2C_SLAVE 0x7F
#define CONFIG_SYS_I2C_SLAVE 0x7F #define CONFIG_SYS_FSL_I2C_OFFSET 0x3000
#define CONFIG_SYS_I2C_NOPROBES { {0, 0x52} } /* Don't probe these addrs */ #define CONFIG_SYS_FSL_I2C2_SPEED 400000
#define CONFIG_SYS_I2C_OFFSET 0x3000 #define CONFIG_SYS_FSL_I2C2_SLAVE 0x7F
#define CONFIG_SYS_I2C2_OFFSET 0x3100 #define CONFIG_SYS_FSL_I2C2_OFFSET 0x3100
#define CONFIG_SYS_I2C_NOPROBES { {0, 0x52} }
/* /*
* General PCI * General PCI

13
include/configs/MPC837XEMDS.h
View File

@ -341,13 +341,12 @@
#define CONFIG_OF_STDOUT_VIA_ALIAS 1 #define CONFIG_OF_STDOUT_VIA_ALIAS 1
/* I2C */ /* I2C */
#define CONFIG_HARD_I2C /* I2C with hardware support */ #define CONFIG_SYS_I2C
#define CONFIG_FSL_I2C #define CONFIG_SYS_I2C_FSL
#define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed and slave address */ #define CONFIG_SYS_FSL_I2C_SPEED 400000
#define CONFIG_SYS_I2C_SLAVE 0x7F #define CONFIG_SYS_FSL_I2C_SLAVE 0x7F
#define CONFIG_SYS_I2C_NOPROBES {0x51} /* Don't probe these addrs */ #define CONFIG_SYS_FSL_I2C_OFFSET 0x3000
#define CONFIG_SYS_I2C_OFFSET 0x3000 #define CONFIG_SYS_I2C_NOPROBES { {0, 0x51} }
#define CONFIG_SYS_I2C2_OFFSET 0x3100
/* /*
* Config on-board RTC * Config on-board RTC

13
include/configs/MPC837XERDB.h
View File

@ -367,13 +367,12 @@
#define CONFIG_OF_STDOUT_VIA_ALIAS 1 #define CONFIG_OF_STDOUT_VIA_ALIAS 1
/* I2C */ /* I2C */
#define CONFIG_HARD_I2C /* I2C with hardware support */ #define CONFIG_SYS_I2C
#define CONFIG_FSL_I2C #define CONFIG_SYS_I2C_FSL
#define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed and slave address */ #define CONFIG_SYS_FSL_I2C_SPEED 400000
#define CONFIG_SYS_I2C_SLAVE 0x7F #define CONFIG_SYS_FSL_I2C_SLAVE 0x7F
#define CONFIG_SYS_I2C_NOPROBES {0x51} /* Don't probe these addrs */ #define CONFIG_SYS_FSL_I2C_OFFSET 0x3000
#define CONFIG_SYS_I2C_OFFSET 0x3000 #define CONFIG_SYS_I2C_NOPROBES { {0, 0x51} }
#define CONFIG_SYS_I2C2_OFFSET 0x3100
/* /*
* Config on-board RTC * Config on-board RTC

17
include/configs/MPC8536DS.h
View File

@ -434,14 +434,15 @@
/* /*
* I2C * I2C
*/ */
#define CONFIG_FSL_I2C /* Use FSL common I2C driver */ #define CONFIG_SYS_I2C
#define CONFIG_HARD_I2C /* I2C with hardware support */ #define CONFIG_SYS_I2C_FSL
#define CONFIG_I2C_MULTI_BUS #define CONFIG_SYS_FSL_I2C_SPEED 400000
#define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed and slave address */ #define CONFIG_SYS_FSL_I2C_SLAVE 0x7F
#define CONFIG_SYS_I2C_SLAVE 0x7F #define CONFIG_SYS_FSL_I2C_OFFSET 0x3000
#define CONFIG_SYS_I2C_NOPROBES {{0, 0x29}} /* Don't probe these addrs */ #define CONFIG_SYS_FSL_I2C2_SPEED 400000
#define CONFIG_SYS_I2C_OFFSET 0x3000 #define CONFIG_SYS_FSL_I2C2_SLAVE 0x7F
#define CONFIG_SYS_I2C2_OFFSET 0x3100 #define CONFIG_SYS_FSL_I2C2_OFFSET 0x3100
#define CONFIG_SYS_I2C_NOPROBES { {0, 0x29} }
/* /*
* I2C2 EEPROM * I2C2 EEPROM

12
include/configs/MPC8540ADS.h
View File

@ -260,12 +260,12 @@
/* /*
* I2C * I2C
*/ */
#define CONFIG_FSL_I2C /* Use FSL common I2C driver */ #define CONFIG_SYS_I2C
#define CONFIG_HARD_I2C /* I2C with hardware support*/ #define CONFIG_SYS_I2C_FSL
#define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed and slave address */ #define CONFIG_SYS_FSL_I2C_SPEED 400000
#define CONFIG_SYS_I2C_SLAVE 0x7F #define CONFIG_SYS_FSL_I2C_SLAVE 0x7F
#define CONFIG_SYS_I2C_NOPROBES {0x69} /* Don't probe these addrs */ #define CONFIG_SYS_FSL_I2C_OFFSET 0x3000
#define CONFIG_SYS_I2C_OFFSET 0x3000 #define CONFIG_SYS_I2C_NOPROBES { {0, 0x69} }
/* RapidIO MMU */ /* RapidIO MMU */
#define CONFIG_SYS_RIO_MEM_VIRT 0xc0000000 /* base address */ #define CONFIG_SYS_RIO_MEM_VIRT 0xc0000000 /* base address */

12
include/configs/MPC8541CDS.h
View File

@ -283,12 +283,12 @@ extern unsigned long get_clock_freq(void);
/* /*
* I2C * I2C
*/ */
#define CONFIG_FSL_I2C /* Use FSL common I2C driver */ #define CONFIG_SYS_I2C
#define CONFIG_HARD_I2C /* I2C with hardware support*/ #define CONFIG_SYS_I2C_FSL
#define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed and slave address */ #define CONFIG_SYS_FSL_I2C_SPEED 400000
#define CONFIG_SYS_I2C_SLAVE 0x7F #define CONFIG_SYS_FSL_I2C_SLAVE 0x7F
#define CONFIG_SYS_I2C_NOPROBES {0x69} /* Don't probe these addrs */ #define CONFIG_SYS_FSL_I2C_OFFSET 0x3000
#define CONFIG_SYS_I2C_OFFSET 0x3000 #define CONFIG_SYS_I2C_NOPROBES { {0, 0x69} }
/* EEPROM */ /* EEPROM */
#define CONFIG_ID_EEPROM #define CONFIG_ID_EEPROM

12
include/configs/MPC8544DS.h
View File

@ -232,13 +232,13 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
#define CONFIG_OF_STDOUT_VIA_ALIAS 1 #define CONFIG_OF_STDOUT_VIA_ALIAS 1
/* I2C */ /* I2C */
#define CONFIG_FSL_I2C /* Use FSL common I2C driver */ #define CONFIG_SYS_I2C
#define CONFIG_HARD_I2C /* I2C with hardware support */ #define CONFIG_SYS_I2C_FSL
#define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed and slave address */ #define CONFIG_SYS_FSL_I2C_SPEED 400000
#define CONFIG_SYS_FSL_I2C_SLAVE 0x7F
#define CONFIG_SYS_FSL_I2C_OFFSET 0x3000
#define CONFIG_SYS_I2C_NOPROBES { {0, 0x69} }
#define CONFIG_SYS_I2C_EEPROM_ADDR 0x57 #define CONFIG_SYS_I2C_EEPROM_ADDR 0x57
#define CONFIG_SYS_I2C_SLAVE 0x7F
#define CONFIG_SYS_I2C_NOPROBES {0x69} /* Don't probe these addrs */
#define CONFIG_SYS_I2C_OFFSET 0x3100
/* /*
* General PCI * General PCI

12
include/configs/MPC8548CDS.h
View File

@ -358,12 +358,12 @@ extern unsigned long get_clock_freq(void);
/* /*
* I2C * I2C
*/ */
#define CONFIG_FSL_I2C /* Use FSL common I2C driver */ #define CONFIG_SYS_I2C
#define CONFIG_HARD_I2C /* I2C with hardware support*/ #define CONFIG_SYS_I2C_FSL
#define CONFIG_SYS_I2C_SPEED 400000 #define CONFIG_SYS_FSL_I2C_SPEED 400000
#define CONFIG_SYS_I2C_SLAVE 0x7F #define CONFIG_SYS_FSL_I2C_SLAVE 0x7F
#define CONFIG_SYS_I2C_NOPROBES {0x69} /* Don't probe these addrs */ #define CONFIG_SYS_FSL_I2C_OFFSET 0x3000
#define CONFIG_SYS_I2C_OFFSET 0x3000 #define CONFIG_SYS_I2C_NOPROBES { {0, 0x69} }
/* EEPROM */ /* EEPROM */
#define CONFIG_ID_EEPROM #define CONFIG_ID_EEPROM

12
include/configs/MPC8555CDS.h
View File

@ -281,12 +281,12 @@ extern unsigned long get_clock_freq(void);
/* /*
* I2C * I2C
*/ */
#define CONFIG_FSL_I2C /* Use FSL common I2C driver */ #define CONFIG_SYS_I2C
#define CONFIG_HARD_I2C /* I2C with hardware support*/ #define CONFIG_SYS_I2C_FSL
#define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed and slave address */ #define CONFIG_SYS_FSL_I2C_SPEED 400000
#define CONFIG_SYS_I2C_SLAVE 0x7F #define CONFIG_SYS_FSL_I2C_SLAVE 0x7F
#define CONFIG_SYS_I2C_NOPROBES {0x69} /* Don't probe these addrs */ #define CONFIG_SYS_FSL_I2C_OFFSET 0x3000
#define CONFIG_SYS_I2C_OFFSET 0x3000 #define CONFIG_SYS_I2C_NOPROBES { {0, 0x69} }
/* EEPROM */ /* EEPROM */
#define CONFIG_ID_EEPROM #define CONFIG_ID_EEPROM

12
include/configs/MPC8560ADS.h
View File

@ -254,12 +254,12 @@
/* /*
* I2C * I2C
*/ */
#define CONFIG_FSL_I2C /* Use FSL common I2C driver */ #define CONFIG_SYS_I2C
#define CONFIG_HARD_I2C /* I2C with hardware support*/ #define CONFIG_SYS_I2C_FSL
#define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed and slave address */ #define CONFIG_SYS_FSL_I2C_SPEED 400000
#define CONFIG_SYS_I2C_SLAVE 0x7F #define CONFIG_SYS_FSL_I2C_SLAVE 0x7F
#define CONFIG_SYS_I2C_NOPROBES {0x69} /* Don't probe these addrs */ #define CONFIG_SYS_FSL_I2C_OFFSET 0x3000
#define CONFIG_SYS_I2C_OFFSET 0x3000 #define CONFIG_SYS_I2C_NOPROBES { {0, 0x69} }
/* RapidIO MMU */ /* RapidIO MMU */
#define CONFIG_SYS_RIO_MEM_VIRT 0xc0000000 /* base address */ #define CONFIG_SYS_RIO_MEM_VIRT 0xc0000000 /* base address */

17
include/configs/MPC8568MDS.h
View File

@ -266,15 +266,16 @@ extern unsigned long get_clock_freq(void);
/* /*
* I2C * I2C
*/ */
#define CONFIG_FSL_I2C /* Use FSL common I2C driver */ #define CONFIG_SYS_I2C
#define CONFIG_HARD_I2C /* I2C with hardware support*/ #define CONFIG_SYS_I2C_FSL
#define CONFIG_I2C_MULTI_BUS #define CONFIG_SYS_FSL_I2C_SPEED 400000
#define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed and slave address */ #define CONFIG_SYS_FSL_I2C_SLAVE 0x7F
#define CONFIG_SYS_FSL_I2C_OFFSET 0x3000
#define CONFIG_SYS_FSL_I2C2_SPEED 400000
#define CONFIG_SYS_FSL_I2C2_SLAVE 0x7F
#define CONFIG_SYS_FSL_I2C2_OFFSET 0x3100
#define CONFIG_SYS_I2C_NOPROBES { {0, 0x69} }
#define CONFIG_SYS_I2C_EEPROM_ADDR 0x52 #define CONFIG_SYS_I2C_EEPROM_ADDR 0x52
#define CONFIG_SYS_I2C_SLAVE 0x7F
#define CONFIG_SYS_I2C_NOPROBES {{0,0x69}} /* Don't probe these addrs */
#define CONFIG_SYS_I2C_OFFSET 0x3000
#define CONFIG_SYS_I2C2_OFFSET 0x3100
/* /*
* General PCI * General PCI

17
include/configs/MPC8569MDS.h
View File

@ -302,14 +302,15 @@ extern unsigned long get_clock_freq(void);
/* /*
* I2C * I2C
*/ */
#define CONFIG_FSL_I2C /* Use FSL common I2C driver */ #define CONFIG_SYS_I2C
#define CONFIG_HARD_I2C /* I2C with hardware support*/ #define CONFIG_SYS_I2C_FSL
#define CONFIG_I2C_MULTI_BUS #define CONFIG_SYS_FSL_I2C_SPEED 400000
#define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed and slave address */ #define CONFIG_SYS_FSL_I2C_SLAVE 0x7F
#define CONFIG_SYS_I2C_SLAVE 0x7F #define CONFIG_SYS_FSL_I2C2_SPEED 400000
#define CONFIG_SYS_I2C_NOPROBES {{0,0x69}} /* Don't probe these addrs */ #define CONFIG_SYS_FSL_I2C2_SLAVE 0x7F
#define CONFIG_SYS_I2C_OFFSET 0x3000 #define CONFIG_SYS_FSL_I2C_OFFSET 0x3000
#define CONFIG_SYS_I2C2_OFFSET 0x3100 #define CONFIG_SYS_FSL_I2C2_OFFSET 0x3100
#define CONFIG_SYS_I2C_NOPROBES { {0, 0x69} }
/* /*
* I2C2 EEPROM * I2C2 EEPROM

17
include/configs/MPC8572DS.h
View File

@ -431,15 +431,16 @@
#define CONFIG_FIT_VERBOSE 1 /* enable fit_format_{error,warning}() */ #define CONFIG_FIT_VERBOSE 1 /* enable fit_format_{error,warning}() */
/* I2C */ /* I2C */
#define CONFIG_FSL_I2C /* Use FSL common I2C driver */ #define CONFIG_SYS_I2C
#define CONFIG_HARD_I2C /* I2C with hardware support */ #define CONFIG_SYS_I2C_FSL
#define CONFIG_I2C_MULTI_BUS #define CONFIG_SYS_FSL_I2C_SPEED 400000
#define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed and slave address */ #define CONFIG_SYS_FSL_I2C_SLAVE 0x7F
#define CONFIG_SYS_FSL_I2C_OFFSET 0x3000
#define CONFIG_SYS_FSL_I2C2_SPEED 400000
#define CONFIG_SYS_FSL_I2C2_SLAVE 0x7F
#define CONFIG_SYS_FSL_I2C2_OFFSET 0x3100
#define CONFIG_SYS_I2C_NOPROBES { {0, 0x29} }
#define CONFIG_SYS_I2C_EEPROM_ADDR 0x57 #define CONFIG_SYS_I2C_EEPROM_ADDR 0x57
#define CONFIG_SYS_I2C_SLAVE 0x7F
#define CONFIG_SYS_I2C_NOPROBES {{0,0x29}}/* Don't probe these addrs */
#define CONFIG_SYS_I2C_OFFSET 0x3000
#define CONFIG_SYS_I2C2_OFFSET 0x3100
/* /*
* I2C2 EEPROM * I2C2 EEPROM

12
include/configs/MPC8610HPCD.h
View File

@ -252,12 +252,12 @@
/* /*
* I2C * I2C
*/ */
#define CONFIG_FSL_I2C /* Use FSL common I2C driver */ #define CONFIG_SYS_I2C
#define CONFIG_HARD_I2C /* I2C with hardware support*/ #define CONFIG_SYS_I2C_FSL
#define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed and slave address */ #define CONFIG_SYS_FSL_I2C_SPEED 400000
#define CONFIG_SYS_I2C_SLAVE 0x7F #define CONFIG_SYS_FSL_I2C_SLAVE 0x7F
#define CONFIG_SYS_I2C_NOPROBES {0x69} /* Don't probe these addrs */ #define CONFIG_SYS_FSL_I2C_OFFSET 0x3000
#define CONFIG_SYS_I2C_OFFSET 0x3000 #define CONFIG_SYS_I2C_NOPROBES { {0, 0x69} }
/* /*
* General PCI * General PCI

12
include/configs/MPC8641HPCN.h
View File

@ -298,12 +298,12 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
/* /*
* I2C * I2C
*/ */
#define CONFIG_FSL_I2C /* Use FSL common I2C driver */ #define CONFIG_SYS_I2C
#define CONFIG_HARD_I2C /* I2C with hardware support*/ #define CONFIG_SYS_I2C_FSL
#define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed and slave address */ #define CONFIG_SYS_FSL_I2C_SPEED 400000
#define CONFIG_SYS_I2C_SLAVE 0x7F #define CONFIG_SYS_FSL_I2C_SLAVE 0x7F
#define CONFIG_SYS_I2C_NOPROBES {0x69} /* Don't probe these addrs */ #define CONFIG_SYS_FSL_I2C_OFFSET 0x3100
#define CONFIG_SYS_I2C_OFFSET 0x3100 #define CONFIG_SYS_I2C_NOPROBES { {0, 0x69} }
/* /*
* RapidIO MMU * RapidIO MMU

16
include/configs/MVBLM7.h
View File

@ -44,7 +44,6 @@
#define CONFIG_PCI #define CONFIG_PCI
#define CONFIG_PCI_INDIRECT_BRIDGE #define CONFIG_PCI_INDIRECT_BRIDGE
#define CONFIG_PCI_SKIP_HOST_BRIDGE #define CONFIG_PCI_SKIP_HOST_BRIDGE
#define CONFIG_HARD_I2C
#define CONFIG_TSEC_ENET #define CONFIG_TSEC_ENET
#define CONFIG_MPC8XXX_SPI #define CONFIG_MPC8XXX_SPI
#define CONFIG_HARD_SPI #define CONFIG_HARD_SPI
@ -52,13 +51,14 @@
#define CONFIG_MISC_INIT_R #define CONFIG_MISC_INIT_R
/* I2C */ /* I2C */
#define CONFIG_FSL_I2C #define CONFIG_SYS_I2C
#define CONFIG_I2C_MULTI_BUS #define CONFIG_SYS_I2C_FSL
#define CONFIG_SYS_I2C_OFFSET 0x3000 #define CONFIG_SYS_FSL_I2C_SPEED 100000
#define CONFIG_SYS_I2C2_OFFSET 0x3100 #define CONFIG_SYS_FSL_I2C_SLAVE 0x7F
#define CONFIG_SYS_FSL_I2C_OFFSET 0x3000
#define CONFIG_SYS_I2C_SPEED 100000 #define CONFIG_SYS_FSL_I2C2_SPEED 100000
#define CONFIG_SYS_I2C_SLAVE 0x7F #define CONFIG_SYS_FSL_I2C2_SLAVE 0x7F
#define CONFIG_SYS_FSL_I2C2_OFFSET 0x3100
/* /*
* DDR Setup * DDR Setup

17
include/configs/P1010RDB.h
View File

@ -489,14 +489,15 @@ extern unsigned long get_sdram_size(void);
#define CONFIG_FIT #define CONFIG_FIT
#define CONFIG_FIT_VERBOSE /* enable fit_format_{error,warning}() */ #define CONFIG_FIT_VERBOSE /* enable fit_format_{error,warning}() */
#define CONFIG_FSL_I2C /* Use FSL common I2C driver */ /* I2C */
#define CONFIG_HARD_I2C /* I2C with hardware support */ #define CONFIG_SYS_I2C
#define CONFIG_I2C_MULTI_BUS #define CONFIG_SYS_I2C_FSL
#define CONFIG_I2C_CMD_TREE #define CONFIG_SYS_FSL_I2C_SPEED 400000
#define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed and slave address*/ #define CONFIG_SYS_FSL_I2C_SLAVE 0x7F
#define CONFIG_SYS_I2C_SLAVE 0x7F #define CONFIG_SYS_FSL_I2C_OFFSET 0x3000
#define CONFIG_SYS_I2C_OFFSET 0x3000 #define CONFIG_SYS_FSL_I2C2_SPEED 400000
#define CONFIG_SYS_I2C2_OFFSET 0x3100 #define CONFIG_SYS_FSL_I2C2_SLAVE 0x7F
#define CONFIG_SYS_FSL_I2C2_OFFSET 0x3100
/* I2C EEPROM */ /* I2C EEPROM */
#undef CONFIG_ID_EEPROM #undef CONFIG_ID_EEPROM

16
include/configs/P1022DS.h
View File

@ -361,15 +361,15 @@
#define CONFIG_FIT_VERBOSE #define CONFIG_FIT_VERBOSE
/* I2C */ /* I2C */
#define CONFIG_FSL_I2C #define CONFIG_SYS_I2C
#define CONFIG_HARD_I2C #define CONFIG_SYS_I2C_FSL
#define CONFIG_I2C_MULTI_BUS #define CONFIG_SYS_FSL_I2C_SPEED 400000
#define CONFIG_SYS_I2C_SPEED 400000 #define CONFIG_SYS_FSL_I2C_SLAVE 0x7F
#define CONFIG_SYS_I2C_EEPROM_ADDR 0x57 #define CONFIG_SYS_FSL_I2C_OFFSET 0x3000
#define CONFIG_SYS_I2C_SLAVE 0x7F #define CONFIG_SYS_FSL_I2C2_SPEED 400000
#define CONFIG_SYS_FSL_I2C2_SLAVE 0x7F
#define CONFIG_SYS_FSL_I2C2_OFFSET 0x3100
#define CONFIG_SYS_I2C_NOPROBES {{0, 0x29}} #define CONFIG_SYS_I2C_NOPROBES {{0, 0x29}}
#define CONFIG_SYS_I2C_OFFSET 0x3000
#define CONFIG_SYS_I2C2_OFFSET 0x3100
/* /*
* I2C2 EEPROM * I2C2 EEPROM

15
include/configs/P1023RDB.h
View File

@ -204,13 +204,14 @@ extern unsigned long get_clock_freq(void);
#define CONFIG_FIT_VERBOSE /* enable fit_format_{error,warning}() */ #define CONFIG_FIT_VERBOSE /* enable fit_format_{error,warning}() */
/* I2C */ /* I2C */
#define CONFIG_FSL_I2C /* Use FSL common I2C driver */ #define CONFIG_SYS_I2C
#define CONFIG_HARD_I2C /* I2C with hardware support */ #define CONFIG_SYS_I2C_FSL
#define CONFIG_I2C_MULTI_BUS #define CONFIG_SYS_FSL_I2C_SPEED 400000
#define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed and slave address */ #define CONFIG_SYS_FSL_I2C_SLAVE 0x7F
#define CONFIG_SYS_I2C_SLAVE 0x7F #define CONFIG_SYS_FSL_I2C_OFFSET 0x3000
#define CONFIG_SYS_I2C_OFFSET 0x3000 #define CONFIG_SYS_FSL_I2C2_SPEED 400000
#define CONFIG_SYS_I2C2_OFFSET 0x3100 #define CONFIG_SYS_FSL_I2C2_SLAVE 0x7F
#define CONFIG_SYS_FSL_I2C2_OFFSET 0x3100
/* /*
* I2C2 EEPROM * I2C2 EEPROM

15
include/configs/P1023RDS.h
View File

@ -313,14 +313,15 @@ extern unsigned long get_clock_freq(void);
#define CONFIG_FIT_VERBOSE /* enable fit_format_{error,warning}() */ #define CONFIG_FIT_VERBOSE /* enable fit_format_{error,warning}() */
/* I2C */ /* I2C */
#define CONFIG_FSL_I2C /* Use FSL common I2C driver */ #define CONFIG_SYS_I2C
#define CONFIG_HARD_I2C /* I2C with hardware support */ #define CONFIG_SYS_I2C_FSL
#define CONFIG_I2C_MULTI_BUS #define CONFIG_SYS_FSL_I2C_SPEED 400000
#define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed and slave address */ #define CONFIG_SYS_FSL_I2C_SLAVE 0x7F
#define CONFIG_SYS_FSL_I2C_OFFSET 0x3000
#define CONFIG_SYS_FSL_I2C2_SPEED 400000
#define CONFIG_SYS_FSL_I2C2_SLAVE 0x7F
#define CONFIG_SYS_FSL_I2C2_OFFSET 0x3100
#define CONFIG_SYS_I2C_EEPROM_ADDR 0x51 #define CONFIG_SYS_I2C_EEPROM_ADDR 0x51
#define CONFIG_SYS_I2C_SLAVE 0x7F
#define CONFIG_SYS_I2C_OFFSET 0x3000
#define CONFIG_SYS_I2C2_OFFSET 0x3100
/* /*
* I2C2 EEPROM * I2C2 EEPROM

18
include/configs/P1_P2_RDB.h
View File

@ -367,15 +367,15 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
#define CONFIG_FIT_VERBOSE 1 /* enable fit_format_{error,warning}() */ #define CONFIG_FIT_VERBOSE 1 /* enable fit_format_{error,warning}() */
/* I2C */ /* I2C */
#define CONFIG_FSL_I2C /* Use FSL common I2C driver */ #define CONFIG_SYS_I2C
#define CONFIG_HARD_I2C /* I2C with hardware support */ #define CONFIG_SYS_I2C_FSL
#define CONFIG_I2C_MULTI_BUS #define CONFIG_SYS_FSL_I2C_OFFSET 0x3000
#define CONFIG_I2C_CMD_TREE #define CONFIG_SYS_FSL_I2C_SPEED 400000
#define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed and slave address*/ #define CONFIG_SYS_FSL_I2C_SLAVE 0x7F
#define CONFIG_SYS_I2C_SLAVE 0x7F #define CONFIG_SYS_FSL_I2C2_OFFSET 0x3100
#define CONFIG_SYS_I2C_NOPROBES {{0,0x29}} /* Don't probe these addrs */ #define CONFIG_SYS_FSL_I2C2_SPEED 400000
#define CONFIG_SYS_I2C_OFFSET 0x3000 #define CONFIG_SYS_FSL_I2C2_SLAVE 0x7F
#define CONFIG_SYS_I2C2_OFFSET 0x3100 #define CONFIG_SYS_I2C_NOPROBES { {0, 0x29} }
/* /*
* I2C2 EEPROM * I2C2 EEPROM

16
include/configs/P2020COME.h
View File

@ -225,15 +225,15 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
#define CONFIG_FIT_VERBOSE 1 #define CONFIG_FIT_VERBOSE 1
/* I2C */ /* I2C */
#define CONFIG_FSL_I2C /* Use FSL common I2C driver */ #define CONFIG_SYS_I2C
#define CONFIG_HARD_I2C /* I2C with hardware support */ #define CONFIG_SYS_I2C_FSL
#define CONFIG_I2C_MULTI_BUS #define CONFIG_SYS_FSL_I2C_SPEED 400000
#define CONFIG_I2C_CMD_TREE #define CONFIG_SYS_FSL_I2C_SLAVE 0x7F
#define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed and slave address*/ #define CONFIG_SYS_FSL_I2C_OFFSET 0x3000
#define CONFIG_SYS_I2C_SLAVE 0x7F #define CONFIG_SYS_FSL_I2C2_SPEED 400000
#define CONFIG_SYS_FSL_I2C2_SLAVE 0x7F
#define CONFIG_SYS_FSL_I2C2_OFFSET 0x3100
#define CONFIG_SYS_I2C_NOPROBES { {0, 0x29} } #define CONFIG_SYS_I2C_NOPROBES { {0, 0x29} }
#define CONFIG_SYS_I2C_OFFSET 0x3000
#define CONFIG_SYS_I2C2_OFFSET 0x3100
/* /*
* I2C2 EEPROM * I2C2 EEPROM

17
include/configs/P2020DS.h
View File

@ -387,15 +387,16 @@
#define CONFIG_OF_STDOUT_VIA_ALIAS 1 #define CONFIG_OF_STDOUT_VIA_ALIAS 1
/* I2C */ /* I2C */
#define CONFIG_FSL_I2C /* Use FSL common I2C driver */ #define CONFIG_SYS_I2C
#define CONFIG_HARD_I2C /* I2C with hardware support */ #define CONFIG_SYS_I2C_FSL
#define CONFIG_I2C_MULTI_BUS #define CONFIG_SYS_FSL_I2C_OFFSET 0x3000
#define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed and slave address */ #define CONFIG_SYS_FSL_I2C2_OFFSET 0x3100
#define CONFIG_SYS_FSL_I2C_SPEED 400000
#define CONFIG_SYS_FSL_I2C_SLAVE 0x7F
#define CONFIG_SYS_FSL_I2C2_SPEED 400000
#define CONFIG_SYS_FSL_I2C2_SLAVE 0x7F
#define CONFIG_SYS_I2C_EEPROM_ADDR 0x57 #define CONFIG_SYS_I2C_EEPROM_ADDR 0x57
#define CONFIG_SYS_I2C_SLAVE 0x7F #define CONFIG_SYS_I2C_NOPROBES { {0, 0x29} }
#define CONFIG_SYS_I2C_NOPROBES {{0,0x29}}/* Don't probe these addrs */
#define CONFIG_SYS_I2C_OFFSET 0x3000
#define CONFIG_SYS_I2C2_OFFSET 0x3100
/* /*
* I2C2 EEPROM * I2C2 EEPROM

16
include/configs/P2041RDB.h
View File

@ -367,14 +367,14 @@ unsigned long get_board_sys_clk(unsigned long dummy);
#define CONFIG_FIT_VERBOSE /* enable fit_format_{error,warning}() */ #define CONFIG_FIT_VERBOSE /* enable fit_format_{error,warning}() */
/* I2C */ /* I2C */
#define CONFIG_FSL_I2C /* Use FSL common I2C driver */ #define CONFIG_SYS_I2C
#define CONFIG_HARD_I2C /* I2C with hardware support */ #define CONFIG_SYS_I2C_FSL
#define CONFIG_I2C_MULTI_BUS #define CONFIG_SYS_FSL_I2C_SPEED 400000
#define CONFIG_I2C_CMD_TREE #define CONFIG_SYS_FSL_I2C_SLAVE 0x7F
#define CONFIG_SYS_I2C_SPEED 400000 #define CONFIG_SYS_FSL_I2C_OFFSET 0x3000
#define CONFIG_SYS_I2C_SLAVE 0x7F #define CONFIG_SYS_FSL_I2C2_SPEED 400000
#define CONFIG_SYS_I2C_OFFSET 0x118000 #define CONFIG_SYS_FSL_I2C2_SLAVE 0x7F
#define CONFIG_SYS_I2C2_OFFSET 0x118100 #define CONFIG_SYS_FSL_I2C2_OFFSET 0x3100
/* /*
* RapidIO * RapidIO

17
include/configs/SIMPC8313.h
View File

@ -245,14 +245,15 @@
#define CONFIG_SYS_HUSH_PARSER #define CONFIG_SYS_HUSH_PARSER
/* I2C */ /* I2C */
#define CONFIG_HARD_I2C /* I2C with hardware support*/ #define CONFIG_SYS_I2C
#define CONFIG_FSL_I2C #define CONFIG_SYS_I2C_FSL
#define CONFIG_I2C_MULTI_BUS #define CONFIG_SYS_FSL_I2C_SPEED 400000
#define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed and slave address */ #define CONFIG_SYS_FSL_I2C_SLAVE 0x7F
#define CONFIG_SYS_I2C_SLAVE 0x7F #define CONFIG_SYS_FSL_I2C_OFFSET 0x3000
#define CONFIG_SYS_I2C_NOPROBES { {0, 0x69} } /* Don't probe these addrs */ #define CONFIG_SYS_FSL_I2C2_SPEED 400000
#define CONFIG_SYS_I2C_OFFSET 0x3000 #define CONFIG_SYS_FSL_I2C2_SLAVE 0x7F
#define CONFIG_SYS_I2C2_OFFSET 0x3100 #define CONFIG_SYS_FSL_I2C2_OFFSET 0x3100
#define CONFIG_SYS_I2C_NOPROBES { {0, 0x69} }
/* /*
* General PCI * General PCI

10
include/configs/TQM834x.h
View File

@ -187,11 +187,11 @@
/* /*
* I2C * I2C
*/ */
#define CONFIG_HARD_I2C /* I2C with hardware support */ #define CONFIG_SYS_I2C
#define CONFIG_FSL_I2C #define CONFIG_SYS_I2C_FSL
#define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed: 400KHz */ #define CONFIG_SYS_FSL_I2C_SPEED 400000
#define CONFIG_SYS_I2C_SLAVE 0x7F /* slave address */ #define CONFIG_SYS_FSL_I2C_SLAVE 0x7F
#define CONFIG_SYS_I2C_OFFSET 0x3000 #define CONFIG_SYS_FSL_I2C_OFFSET 0x3000
/* I2C EEPROM, configuration for onboard EEPROMs 24C256 and 24C32 */ /* I2C EEPROM, configuration for onboard EEPROMs 24C256 and 24C32 */
#define CONFIG_SYS_I2C_EEPROM_ADDR 0x50 /* 1010000x */ #define CONFIG_SYS_I2C_EEPROM_ADDR 0x50 /* 1010000x */

10
include/configs/astro_mcf5373l.h
View File

@ -116,11 +116,11 @@
#undef CONFIG_MCFPIT #undef CONFIG_MCFPIT
/* I2C */ /* I2C */
#define CONFIG_FSL_I2C #define CONFIG_SYS_I2C
#define CONFIG_HARD_I2C /* I2C with hw support */ #define CONFIG_SYS_I2C_FSL
#define CONFIG_SYS_I2C_SPEED 80000 #define CONFIG_SYS_FSL_I2C_SPEED 80000
#define CONFIG_SYS_I2C_SLAVE 0x7F #define CONFIG_SYS_FSL_I2C_SLAVE 0x7F
#define CONFIG_SYS_I2C_OFFSET 0x58000 #define CONFIG_SYS_FSL_I2C_OFFSET 0x58000
#define CONFIG_SYS_IMMR CONFIG_SYS_MBAR #define CONFIG_SYS_IMMR CONFIG_SYS_MBAR
/* /*

17
include/configs/controlcenterd.h
View File

@ -192,15 +192,14 @@
/* /*
* I2C * I2C
*/ */
#define CONFIG_HARD_I2C #define CONFIG_SYS_I2C
#define CONFIG_I2C_MULTI_BUS #define CONFIG_SYS_I2C_FSL
#define CONFIG_CMD_I2C #define CONFIG_SYS_FSL_I2C_SPEED 400000
#define CONFIG_SYS_FSL_I2C_SLAVE 0x7F
#define CONFIG_FSL_I2C #define CONFIG_SYS_FSL_I2C_OFFSET 0x3000
#define CONFIG_SYS_I2C_OFFSET 0x3000 #define CONFIG_SYS_FSL_I2C2_SPEED 400000
#define CONFIG_SYS_I2C2_OFFSET 0x3100 #define CONFIG_SYS_FSL_I2C2_SLAVE 0x7F
#define CONFIG_SYS_I2C_SPEED 400000 #define CONFIG_SYS_FSL_I2C2_OFFSET 0x3100
#define CONFIG_SYS_I2C_SLAVE 0x7F
/* Probing DP501 I2C-Bridge will hang */ /* Probing DP501 I2C-Bridge will hang */
#define CONFIG_SYS_I2C_NOPROBES { {0, 0x30}, {0, 0x37}, {0, 0x3a}, \ #define CONFIG_SYS_I2C_NOPROBES { {0, 0x30}, {0, 0x37}, {0, 0x3a}, \
{0, 0x3b}, {0, 0x50} } {0, 0x3b}, {0, 0x50} }

16
include/configs/corenet_ds.h
View File

@ -362,14 +362,14 @@
#define CONFIG_FIT_VERBOSE /* enable fit_format_{error,warning}() */ #define CONFIG_FIT_VERBOSE /* enable fit_format_{error,warning}() */
/* I2C */ /* I2C */
#define CONFIG_FSL_I2C /* Use FSL common I2C driver */ #define CONFIG_SYS_I2C
#define CONFIG_HARD_I2C /* I2C with hardware support */ #define CONFIG_SYS_I2C_FSL
#define CONFIG_I2C_MULTI_BUS #define CONFIG_SYS_FSL_I2C_SPEED 400000
#define CONFIG_I2C_CMD_TREE #define CONFIG_SYS_FSL_I2C_SLAVE 0x7F
#define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed and slave address */ #define CONFIG_SYS_FSL_I2C_OFFSET 0x118000
#define CONFIG_SYS_I2C_SLAVE 0x7F #define CONFIG_SYS_FSL_I2C2_SPEED 400000
#define CONFIG_SYS_I2C_OFFSET 0x118000 #define CONFIG_SYS_FSL_I2C2_SLAVE 0x7F
#define CONFIG_SYS_I2C2_OFFSET 0x118100 #define CONFIG_SYS_FSL_I2C2_OFFSET 0x118100
/* /*
* RapidIO * RapidIO

10
include/configs/eb_cpu5282.h
View File

@ -262,14 +262,14 @@
* I2C * I2C
*/ */
#define CONFIG_HARD_I2C #define CONFIG_SYS_I2C
#define CONFIG_FSL_I2C #define CONFIG_SYS_I2C_FSL
#define CONFIG_SYS_I2C_OFFSET 0x00000300 #define CONFIG_SYS_FSL_I2C_OFFSET 0x00000300
#define CONFIG_SYS_IMMR CONFIG_SYS_MBAR #define CONFIG_SYS_IMMR CONFIG_SYS_MBAR
#define CONFIG_SYS_I2C_SPEED 100000 #define CONFIG_SYS_FSL_I2C_SPEED 100000
#define CONFIG_SYS_I2C_SLAVE 0 #define CONFIG_SYS_FSL_I2C_SLAVE 0
#ifdef CONFIG_CMD_DATE #ifdef CONFIG_CMD_DATE
#define CONFIG_RTC_DS1338 #define CONFIG_RTC_DS1338

27
include/configs/km/km83xx-common.h
View File

@ -204,14 +204,21 @@
#endif /* CFG_SYS_RAMBOOT */ #endif /* CFG_SYS_RAMBOOT */
/* I2C */ /* I2C */
#define CONFIG_HARD_I2C /* I2C with hardware support */ #define CONFIG_SYS_I2C
#define CONFIG_FSL_I2C #define CONFIG_SYS_NUM_I2C_BUSES 4
#define CONFIG_SYS_I2C_SPEED 200000 /* I2C speed and slave address */ #define CONFIG_SYS_I2C_MAX_HOPS 1
#define CONFIG_SYS_I2C_SLAVE 0x7F #define CONFIG_SYS_I2C_FSL
#define CONFIG_SYS_I2C_OFFSET 0x3000 #define CONFIG_SYS_FSL_I2C_SPEED 200000
#define CONFIG_I2C_MULTI_BUS #define CONFIG_SYS_FSL_I2C_SLAVE 0x7F
#define CONFIG_SYS_MAX_I2C_BUS 1 #define CONFIG_SYS_FSL_I2C_OFFSET 0x3000
#define CONFIG_I2C_MUX #define CONFIG_SYS_I2C_OFFSET 0x3000
#define CONFIG_SYS_FSL_I2C2_SPEED 200000
#define CONFIG_SYS_FSL_I2C2_SLAVE 0x7F
#define CONFIG_SYS_FSL_I2C2_OFFSET 0x3100
#define CONFIG_SYS_I2C_BUSES {{0, {I2C_NULL_HOP} }, \
{0, {{I2C_MUX_PCA9547, 0x70, 2} } }, \
{0, {{I2C_MUX_PCA9547, 0x70, 1} } }, \
{1, {I2C_NULL_HOP} } }
/* I2C SYSMON (LM75, AD7414 is almost compatible) */ /* I2C SYSMON (LM75, AD7414 is almost compatible) */
#define CONFIG_DTT_LM75 /* ON Semi's LM75 */ #define CONFIG_DTT_LM75 /* ON Semi's LM75 */
@ -219,7 +226,7 @@
#define CONFIG_SYS_DTT_MAX_TEMP 70 #define CONFIG_SYS_DTT_MAX_TEMP 70
#define CONFIG_SYS_DTT_LOW_TEMP -30 #define CONFIG_SYS_DTT_LOW_TEMP -30
#define CONFIG_SYS_DTT_HYSTERESIS 3 #define CONFIG_SYS_DTT_HYSTERESIS 3
#define CONFIG_SYS_DTT_BUS_NUM (CONFIG_SYS_MAX_I2C_BUS) #define CONFIG_SYS_DTT_BUS_NUM 1
#if defined(CONFIG_CMD_NAND) #if defined(CONFIG_CMD_NAND)
#define CONFIG_NAND_KMETER1 #define CONFIG_NAND_KMETER1
@ -315,7 +322,7 @@
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
CONFIG_KM_DEF_ENV \ CONFIG_KM_DEF_ENV \
CONFIG_KM_DEF_ARCH \ CONFIG_KM_DEF_ARCH \
"EEprom_ivm=pca9547:70:9\0" \ "EEprom_ivm=2\0" \
"newenv=" \ "newenv=" \
"prot off 0xF00C0000 +0x40000 && " \ "prot off 0xF00C0000 +0x40000 && " \
"era 0xF00C0000 +0x40000\0" \ "era 0xF00C0000 +0x40000\0" \

15
include/configs/mpc8308_p1m.h
View File

@ -327,13 +327,14 @@
#define CONFIG_OF_STDOUT_VIA_ALIAS 1 #define CONFIG_OF_STDOUT_VIA_ALIAS 1
/* I2C */ /* I2C */
#define CONFIG_HARD_I2C /* I2C with hardware support */ #define CONFIG_SYS_I2C
#define CONFIG_FSL_I2C #define CONFIG_SYS_I2C_FSL
#define CONFIG_I2C_MULTI_BUS #define CONFIG_SYS_FSL_I2C_SPEED 400000
#define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed and slave address */ #define CONFIG_SYS_FSL_I2C_SLAVE 0x7F
#define CONFIG_SYS_I2C_SLAVE 0x7F #define CONFIG_SYS_FSL_I2C2_SPEED 400000
#define CONFIG_SYS_I2C_OFFSET 0x3000 #define CONFIG_SYS_FSL_I2C2_SLAVE 0x7F
#define CONFIG_SYS_I2C2_OFFSET 0x3100 #define CONFIG_SYS_FSL_I2C_OFFSET 0x3000
#define CONFIG_SYS_FSL_I2C2_OFFSET 0x3100
/* /*
* General PCI * General PCI

16
include/configs/mpq101.h
View File

@ -221,13 +221,15 @@
/* /*
* I2C buses and peripherals * I2C buses and peripherals
*/ */
#define CONFIG_FSL_I2C /* Use FSL common I2C driver */ #define CONFIG_SYS_I2C
#define CONFIG_HARD_I2C /* I2C with hardware support*/ #define CONFIG_SYS_I2C_FSL
#define CONFIG_I2C_MULTI_BUS #define CONFIG_SYS_FSL_I2C_SPEED 400000
#define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed and slave address */ #define CONFIG_SYS_FSL_I2C_SLAVE 0x7F
#define CONFIG_SYS_I2C_SLAVE 0x7f #define CONFIG_SYS_FSL_I2C_OFFSET 0x3000
#define CONFIG_SYS_I2C_OFFSET 0x3000 #define CONFIG_SYS_FSL_I2C2_SPEED 400000
#define CONFIG_SYS_I2C2_OFFSET 0x3100 #define CONFIG_SYS_FSL_I2C2_SLAVE 0x7F
#define CONFIG_SYS_FSL_I2C2_OFFSET 0x3100
#define CONFIG_SYS_I2C_NOPROBES { {0, 0x69} }
/* I2C RTC - M41T81 */ /* I2C RTC - M41T81 */
#define CONFIG_RTC_M41T62 #define CONFIG_RTC_M41T62

18
include/configs/p1_p2_rdb_pc.h
View File

@ -534,16 +534,16 @@
#define CONFIG_FIT_VERBOSE /* enable fit_format_{error,warning}() */ #define CONFIG_FIT_VERBOSE /* enable fit_format_{error,warning}() */
/* I2C */ /* I2C */
#define CONFIG_FSL_I2C /* Use FSL common I2C driver */ #define CONFIG_SYS_I2C
#define CONFIG_HARD_I2C /* I2C with hardware support */ #define CONFIG_SYS_I2C_FSL
#define CONFIG_I2C_MULTI_BUS #define CONFIG_SYS_FSL_I2C_SPEED 400000
#define CONFIG_I2C_CMD_TREE #define CONFIG_SYS_FSL_I2C_SLAVE 0x7F
#define CONFIG_SYS_I2C_SPEED 400000 /* I2C spd and slave address */ #define CONFIG_SYS_FSL_I2C_OFFSET 0x3000
#define CONFIG_SYS_FSL_I2C2_SPEED 400000
#define CONFIG_SYS_FSL_I2C2_SLAVE 0x7F
#define CONFIG_SYS_FSL_I2C2_OFFSET 0x3100
#define CONFIG_SYS_I2C_NOPROBES { {0, 0x29} }
#define CONFIG_SYS_I2C_EEPROM_ADDR 0x52 #define CONFIG_SYS_I2C_EEPROM_ADDR 0x52
#define CONFIG_SYS_I2C_SLAVE 0x7F
#define CONFIG_SYS_I2C_NOPROBES {{0, 0x29}} /* Don't probe this addr */
#define CONFIG_SYS_I2C_OFFSET 0x3000
#define CONFIG_SYS_I2C2_OFFSET 0x3100
#define CONFIG_SYS_SPD_BUS_NUM 1 /* For rom_loc and flash bank */ #define CONFIG_SYS_SPD_BUS_NUM 1 /* For rom_loc and flash bank */
/* /*

17
include/configs/sbc8349.h
View File

@ -304,14 +304,15 @@
#define CONFIG_OF_STDOUT_VIA_ALIAS 1 #define CONFIG_OF_STDOUT_VIA_ALIAS 1
/* I2C */ /* I2C */
#define CONFIG_HARD_I2C /* I2C with hardware support*/ #define CONFIG_SYS_I2C
#define CONFIG_FSL_I2C #define CONFIG_SYS_I2C_FSL
#define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed and slave address */ #define CONFIG_SYS_FSL_I2C_SPEED 400000
#define CONFIG_SYS_I2C_SLAVE 0x7F #define CONFIG_SYS_FSL_I2C_SLAVE 0x7F
#define CONFIG_SYS_I2C_NOPROBES {0x69} /* Don't probe these addrs */ #define CONFIG_SYS_FSL_I2C_OFFSET 0x3000
#define CONFIG_SYS_I2C1_OFFSET 0x3000 #define CONFIG_SYS_FSL_I2C2_SPEED 400000
#define CONFIG_SYS_I2C2_OFFSET 0x3100 #define CONFIG_SYS_FSL_I2C2_SLAVE 0x7F
#define CONFIG_SYS_I2C_OFFSET CONFIG_SYS_I2C2_OFFSET #define CONFIG_SYS_FSL_I2C2_OFFSET 0x3100
#define CONFIG_SYS_I2C_NOPROBES { {0, 0x69}, {1, 0x69} }
/* could also use CONFIG_I2C_MULTI_BUS and CONFIG_SYS_SPD_BUS_NUM... */ /* could also use CONFIG_I2C_MULTI_BUS and CONFIG_SYS_SPD_BUS_NUM... */
/* TSEC */ /* TSEC */

10
include/configs/sbc8548.h
View File

@ -444,12 +444,12 @@
/* /*
* I2C * I2C
*/ */
#define CONFIG_FSL_I2C /* Use FSL common I2C driver */ #define CONFIG_SYS_I2C
#define CONFIG_HARD_I2C /* I2C with hardware support*/ #define CONFIG_SYS_I2C_FSL
#define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed and slave address */ #define CONFIG_SYS_FSL_I2C_SPEED 400000
#define CONFIG_SYS_FSL_I2C_SLAVE 0x7F
#define CONFIG_SYS_FSL_I2C_OFFSET 0x3000
#define CONFIG_SYS_I2C_EEPROM_ADDR 0x50 #define CONFIG_SYS_I2C_EEPROM_ADDR 0x50
#define CONFIG_SYS_I2C_SLAVE 0x7F
#define CONFIG_SYS_I2C_OFFSET 0x3000
/* /*
* General PCI * General PCI

12
include/configs/sbc8641d.h
View File

@ -289,12 +289,12 @@
/* /*
* I2C * I2C
*/ */
#define CONFIG_FSL_I2C /* Use FSL common I2C driver */ #define CONFIG_SYS_I2C
#define CONFIG_HARD_I2C /* I2C with hardware support*/ #define CONFIG_SYS_I2C_FSL
#define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed and slave address */ #define CONFIG_SYS_FSL_I2C_SPEED 400000
#define CONFIG_SYS_I2C_SLAVE 0x7F #define CONFIG_SYS_FSL_I2C_SLAVE 0x7F
#define CONFIG_SYS_I2C_NOPROBES {0x69} /* Don't probe these addrs */ #define CONFIG_SYS_FSL_I2C_OFFSET 0x3100
#define CONFIG_SYS_I2C_OFFSET 0x3100 #define CONFIG_SYS_I2C_NOPROBES { {0, 0x69} }
/* /*
* RapidIO MMU * RapidIO MMU

16
include/configs/socrates.h
View File

@ -235,14 +235,14 @@
/* /*
* I2C * I2C
*/ */
#define CONFIG_FSL_I2C /* Use FSL common I2C driver */ #define CONFIG_SYS_I2C
#define CONFIG_HARD_I2C /* I2C with hardware support */ #define CONFIG_SYS_I2C_FSL
#define CONFIG_SYS_I2C_SPEED 102124 /* I2C speed and slave address */ #define CONFIG_SYS_FSL_I2C_SPEED 102124
#define CONFIG_SYS_I2C_SLAVE 0x7F #define CONFIG_SYS_FSL_I2C_SLAVE 0x7F
#define CONFIG_SYS_I2C_OFFSET 0x3000 #define CONFIG_SYS_FSL_I2C_OFFSET 0x3000
#define CONFIG_SYS_FSL_I2C2_SPEED 102124
#define CONFIG_I2C_MULTI_BUS #define CONFIG_SYS_FSL_I2C2_SLAVE 0x7F
#define CONFIG_SYS_I2C2_OFFSET 0x3100 #define CONFIG_SYS_FSL_I2C2_OFFSET 0x3100
/* I2C RTC */ /* I2C RTC */
#define CONFIG_RTC_RX8025 /* Use Epson rx8025 rtc via i2c */ #define CONFIG_RTC_RX8025 /* Use Epson rx8025 rtc via i2c */

11
include/configs/stxgp3.h
View File

@ -178,17 +178,18 @@
/* /*
* I2C * I2C
*/ */
#define CONFIG_FSL_I2C /* Use FSL common I2C driver */ #define CONFIG_SYS_I2C
#define CONFIG_HARD_I2C /* I2C with hardware support*/ #define CONFIG_SYS_I2C_FSL
#define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed and slave address */ #define CONFIG_SYS_FSL_I2C_SPEED 400000
#define CONFIG_SYS_I2C_SLAVE 0x7F #define CONFIG_SYS_FSL_I2C_SLAVE 0x7F
#define CONFIG_SYS_FSL_I2C_OFFSET 0x3000
#if 0 #if 0
#define CONFIG_SYS_I2C_NOPROBES {0x00} /* Don't probe these addrs */ #define CONFIG_SYS_I2C_NOPROBES {0x00} /* Don't probe these addrs */
#else #else
/* I did the 'if 0' so we could keep the syntax above if ever needed. */ /* I did the 'if 0' so we could keep the syntax above if ever needed. */
#undef CONFIG_SYS_I2C_NOPROBES #undef CONFIG_SYS_I2C_NOPROBES
#endif #endif
#define CONFIG_SYS_I2C_OFFSET 0x3000
/* RapdIO Map configuration, mapped 1:1. /* RapdIO Map configuration, mapped 1:1.
*/ */

10
include/configs/stxssa.h
View File

@ -198,12 +198,12 @@
/* /*
* I2C * I2C
*/ */
#define CONFIG_FSL_I2C /* Use FSL common I2C driver */ #define CONFIG_SYS_I2C
#define CONFIG_HARD_I2C /* I2C with hardware support*/ #define CONFIG_SYS_I2C_FSL
#define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed and slave address */ #define CONFIG_SYS_FSL_I2C_SPEED 400000
#define CONFIG_SYS_I2C_SLAVE 0x7F #define CONFIG_SYS_FSL_I2C_SLAVE 0x7F
#define CONFIG_SYS_FSL_I2C_OFFSET 0x3000
#undef CONFIG_SYS_I2C_NOPROBES #undef CONFIG_SYS_I2C_NOPROBES
#define CONFIG_SYS_I2C_OFFSET 0x3000
/* I2C RTC */ /* I2C RTC */
#define CONFIG_RTC_DS1337 /* This is really a DS1339 RTC */ #define CONFIG_RTC_DS1337 /* This is really a DS1339 RTC */

17
include/configs/t4qds.h
View File

@ -445,14 +445,15 @@ unsigned long get_board_ddr_clk(void);
#define CONFIG_FIT_VERBOSE /* enable fit_format_{error,warning}() */ #define CONFIG_FIT_VERBOSE /* enable fit_format_{error,warning}() */
/* I2C */ /* I2C */
#define CONFIG_FSL_I2C /* Use FSL common I2C driver */ #define CONFIG_SYS_I2C
#define CONFIG_HARD_I2C /* I2C with hardware support */ #define CONFIG_SYS_I2C_FSL
#define CONFIG_I2C_MULTI_BUS #define CONFIG_SYS_FSL_I2C_SPEED 100000
#define CONFIG_I2C_CMD_TREE #define CONFIG_SYS_FSL_I2C_SLAVE 0x7F
#define CONFIG_SYS_I2C_SPEED 100000 /* I2C speed */ #define CONFIG_SYS_FSL_I2C_OFFSET 0x118000
#define CONFIG_SYS_I2C_SLAVE 0x7F #define CONFIG_SYS_FSL_I2C2_SPEED 100000
#define CONFIG_SYS_I2C_OFFSET 0x118000 #define CONFIG_SYS_FSL_I2C2_SLAVE 0x7F
#define CONFIG_SYS_I2C2_OFFSET 0x118100 #define CONFIG_SYS_FSL_I2C2_OFFSET 0x118100
#define I2C_MUX_PCA_ADDR_PRI 0x77 /* I2C bus multiplexer,primary */ #define I2C_MUX_PCA_ADDR_PRI 0x77 /* I2C bus multiplexer,primary */
#define I2C_MUX_PCA_ADDR_SEC 0x76 /* I2C bus multiplexer,secondary */ #define I2C_MUX_PCA_ADDR_SEC 0x76 /* I2C bus multiplexer,secondary */

19
include/configs/vme8349.h
View File

@ -237,16 +237,15 @@
#define CONFIG_OF_STDOUT_VIA_ALIAS #define CONFIG_OF_STDOUT_VIA_ALIAS
/* I2C */ /* I2C */
#define CONFIG_I2C_MULTI_BUS #define CONFIG_SYS_I2C
#define CONFIG_HARD_I2C /* I2C with hardware support*/ #define CONFIG_SYS_I2C_FSL
#define CONFIG_FSL_I2C #define CONFIG_SYS_FSL_I2C_SPEED 400000
#define CONFIG_I2C_CMD_TREE #define CONFIG_SYS_FSL_I2C_SLAVE 0x7F
#define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed and slave address */ #define CONFIG_SYS_FSL_I2C_OFFSET 0x3000
#define CONFIG_SYS_I2C_SLAVE 0x7F #define CONFIG_SYS_FSL_I2C2_SPEED 400000
#define CONFIG_SYS_I2C_NOPROBES { {0, 0x69} } /* Don't probe these addrs */ #define CONFIG_SYS_FSL_I2C2_SLAVE 0x7F
#define CONFIG_SYS_I2C1_OFFSET 0x3000 #define CONFIG_SYS_FSL_I2C2_OFFSET 0x3100
#define CONFIG_SYS_I2C2_OFFSET 0x3100 #define CONFIG_SYS_I2C_NOPROBES { {0, 0x69} }
#define CONFIG_SYS_I2C_OFFSET CONFIG_SYS_I2C1_OFFSET
/* could also use CONFIG_I2C_MULTI_BUS and CONFIG_SYS_SPD_BUS_NUM... */ /* could also use CONFIG_I2C_MULTI_BUS and CONFIG_SYS_SPD_BUS_NUM... */
#define CONFIG_SYS_I2C_8574_ADDR2 0x20 /* I2C1, PCF8574 */ #define CONFIG_SYS_I2C_8574_ADDR2 0x20 /* I2C1, PCF8574 */

15
include/configs/xpedite517x.h
View File

@ -258,13 +258,14 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
/* /*
* I2C * I2C
*/ */
#define CONFIG_FSL_I2C /* Use FSL common I2C driver */ #define CONFIG_SYS_I2C
#define CONFIG_HARD_I2C /* I2C with hardware support */ #define CONFIG_SYS_I2C_FSL
#define CONFIG_SYS_I2C_SPEED 100000 /* M41T00 only supports 100 KHz */ #define CONFIG_SYS_FSL_I2C_SPEED 100000
#define CONFIG_SYS_I2C_SLAVE 0x7F #define CONFIG_SYS_FSL_I2C_SLAVE 0x7F
#define CONFIG_SYS_I2C_OFFSET 0x3000 #define CONFIG_SYS_FSL_I2C_OFFSET 0x3000
#define CONFIG_SYS_I2C2_OFFSET 0x3100 #define CONFIG_SYS_FSL_I2C2_SPEED 100000
#define CONFIG_I2C_MULTI_BUS #define CONFIG_SYS_FSL_I2C2_SLAVE 0x7F
#define CONFIG_SYS_FSL_I2C2_OFFSET 0x3100
/* PEX8518 slave I2C interface */ /* PEX8518 slave I2C interface */
#define CONFIG_SYS_I2C_PEX8518_ADDR 0x70 #define CONFIG_SYS_I2C_PEX8518_ADDR 0x70

15
include/configs/xpedite520x.h
View File

@ -220,13 +220,14 @@
/* /*
* I2C * I2C
*/ */
#define CONFIG_FSL_I2C /* Use FSL common I2C driver */ #define CONFIG_SYS_I2C
#define CONFIG_HARD_I2C /* I2C with hardware support */ #define CONFIG_SYS_I2C_FSL
#define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed and slave address */ #define CONFIG_SYS_FSL_I2C_SPEED 400000
#define CONFIG_SYS_I2C_SLAVE 0x7F #define CONFIG_SYS_FSL_I2C_SLAVE 0x7F
#define CONFIG_SYS_I2C_OFFSET 0x3000 #define CONFIG_SYS_FSL_I2C_OFFSET 0x3000
#define CONFIG_SYS_I2C2_OFFSET 0x3100 #define CONFIG_SYS_FSL_I2C2_SPEED 400000
#define CONFIG_I2C_MULTI_BUS #define CONFIG_SYS_FSL_I2C2_SLAVE 0x7F
#define CONFIG_SYS_FSL_I2C2_OFFSET 0x3100
/* I2C EEPROM */ /* I2C EEPROM */
#define CONFIG_SYS_I2C_EEPROM_ADDR 0x50 #define CONFIG_SYS_I2C_EEPROM_ADDR 0x50

16
include/configs/xpedite537x.h
View File

@ -258,13 +258,15 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);
/* /*
* I2C * I2C
*/ */
#define CONFIG_FSL_I2C /* Use FSL common I2C driver */ #define CONFIG_SYS_I2C
#define CONFIG_HARD_I2C /* I2C with hardware support */ #define CONFIG_SYS_I2C_FSL
#define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed and slave address */ #define CONFIG_SYS_FSL_I2C_SPEED 400000
#define CONFIG_SYS_I2C_SLAVE 0x7F #define CONFIG_SYS_FSL_I2C_SLAVE 0x7F
#define CONFIG_SYS_I2C_OFFSET 0x3000 #define CONFIG_SYS_FSL_I2C_OFFSET 0x3000
#define CONFIG_SYS_I2C2_OFFSET 0x3100 #define CONFIG_SYS_FSL_I2C2_SPEED 400000
#define CONFIG_I2C_MULTI_BUS #define CONFIG_SYS_FSL_I2C2_SLAVE 0x7F
#define CONFIG_SYS_FSL_I2C2_OFFSET 0x3100
#define CONFIG_SYS_I2C_NOPROBES { {0, 0x69} }
/* PEX8518 slave I2C interface */ /* PEX8518 slave I2C interface */
#define CONFIG_SYS_I2C_PEX8518_ADDR 0x70 #define CONFIG_SYS_I2C_PEX8518_ADDR 0x70

15
include/configs/xpedite550x.h
View File

@ -249,13 +249,14 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);
/* /*
* I2C * I2C
*/ */
#define CONFIG_FSL_I2C /* Use FSL common I2C driver */ #define CONFIG_SYS_I2C
#define CONFIG_HARD_I2C /* I2C with hardware support */ #define CONFIG_SYS_I2C_FSL
#define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed and slave address */ #define CONFIG_SYS_FSL_I2C_SPEED 400000
#define CONFIG_SYS_I2C_SLAVE 0x7F #define CONFIG_SYS_FSL_I2C_SLAVE 0x7F
#define CONFIG_SYS_I2C_OFFSET 0x3000 #define CONFIG_SYS_FSL_I2C_OFFSET 0x3000
#define CONFIG_SYS_I2C2_OFFSET 0x3100 #define CONFIG_SYS_FSL_I2C2_SPEED 400000
#define CONFIG_I2C_MULTI_BUS #define CONFIG_SYS_FSL_I2C2_SLAVE 0x7F
#define CONFIG_SYS_FSL_I2C2_OFFSET 0x3100
/* I2C DS7505 temperature sensor */ /* I2C DS7505 temperature sensor */
#define CONFIG_DTT_LM75 #define CONFIG_DTT_LM75