i2c, ppc4xx_i2c: switch to new multibus/multiadapter support
PATCH 1/16 i2c, ppc4xx_i2c: switch to new multibus/multiadapter support
---
This patch is based on http://git.denx.de/?p=u-boot/u-boot-i2c.git;a=shortlog;h=refs/heads/20130416_multibus_v2.
Heiko said:
"... and if the merge window opens
I post this patch with the other patches for this new
i2c framework on the ML."
So, Heiko, the merge window is wide open, your turn now :)
arch/powerpc/cpu/ppc4xx/40x_spd_sdram.c | 6 +- arch/powerpc/cpu/ppc4xx/44x_spd_ddr.c | 6 +- arch/powerpc/cpu/ppc4xx/44x_spd_ddr2.c | 3 +- arch/powerpc/cpu/ppc4xx/cmd_chip_config.c | 2 +- arch/powerpc/cpu/ppc4xx/denali_spd_ddr2.c | 3 +- arch/powerpc/include/asm/ppc4xx-i2c.h | 18 - board/csb272/csb272.c | 2 +- board/esd/du440/du440.c | 2 - board/lwmon5/kbd.c | 2 +- board/mpl/pip405/pip405.c | 2 +- board/sandburst/common/ppc440gx_i2c.c | 510 ----------------------------- board/sandburst/common/ppc440gx_i2c.h | 60 ---- board/sandburst/common/sb_common.c | 103 +++--- board/sandburst/common/sb_common.h | 1 - board/sandburst/karef/Makefile | 3 +- board/sandburst/karef/karef.c | 5 - board/sandburst/metrobox/Makefile | 3 +- board/sandburst/metrobox/metrobox.c | 6 - drivers/i2c/Makefile | 2 +- drivers/i2c/ppc4xx_i2c.c | 193 ++++++------ include/configs/APC405.h | 9 +- include/configs/ASH405.h | 9 +- include/configs/CANBT.h | 9 +- include/configs/CATcenter.h | 9 +- include/configs/CMS700.h | 9 +- include/configs/CPCI2DP.h | 9 +- include/configs/CPCI405.h | 9 +- include/configs/CPCI4052.h | 9 +- include/configs/CPCI405AB.h | 9 +- include/configs/CPCI405DT.h | 9 +- include/configs/CPCIISER4.h | 9 +- include/configs/CRAYL1.h | 9 +- include/configs/DP405.h | 9 +- include/configs/DU405.h | 9 +- include/configs/DU440.h | 18 +- include/configs/G2000.h | 9 +- include/configs/HH405.h | 11 +- include/configs/HUB405.h | 9 +- include/configs/JSE.h | 9 +- include/configs/KAREF.h | 16 +- include/configs/METROBOX.h | 16 +- include/configs/MIP405.h | 9 +- include/configs/OCRTC.h | 9 +- include/configs/ORSG.h | 9 +- include/configs/PCI405.h | 9 +- include/configs/PIP405.h | 9 +- include/configs/PLU405.h | 9 +- include/configs/PMC405.h | 9 +- include/configs/PMC405DE.h | 9 +- include/configs/PMC440.h | 14 +- include/configs/PPChameleonEVB.h | 9 +- include/configs/VOH405.h | 9 +- include/configs/VOM405.h | 9 +- include/configs/W7OLMC.h | 9 +- include/configs/W7OLMG.h | 9 +- include/configs/WUH405.h | 9 +- include/configs/acadia.h | 2 +- include/configs/alpr.h | 11 +- include/configs/amcc-common.h | 7 +- include/configs/bamboo.h | 2 +- include/configs/bluestone.h | 2 +- include/configs/bubinga.h | 4 +- include/configs/canyonlands.h | 2 +- include/configs/csb272.h | 9 +- include/configs/csb472.h | 9 +- include/configs/dlvision-10g.h | 2 +- include/configs/dlvision.h | 2 +- include/configs/ebony.h | 2 +- include/configs/gdppc440etx.h | 2 +- include/configs/icon.h | 3 +- include/configs/intip.h | 2 +- include/configs/io.h | 2 +- include/configs/io64.h | 2 +- include/configs/iocon.h | 8 +- include/configs/katmai.h | 3 +- include/configs/kilauea.h | 2 +- include/configs/korat.h | 9 +- include/configs/luan.h | 2 +- include/configs/lwmon5.h | 9 +- include/configs/makalu.h | 2 +- include/configs/neo.h | 2 +- include/configs/ocotea.h | 2 +- include/configs/p3p440.h | 11 +- include/configs/pcs440ep.h | 9 +- include/configs/quad100hd.h | 9 +- include/configs/redwood.h | 4 +- include/configs/sbc405.h | 9 +- include/configs/sc3.h | 9 +- include/configs/sequoia.h | 2 +- include/configs/t3corp.h | 2 +- include/configs/taihu.h | 4 +- include/configs/taishan.h | 2 +- include/configs/walnut.h | 2 +- include/configs/xpedite1000.h | 10 +- include/configs/yosemite.h | 2 +- include/configs/yucca.h | 4 +- include/configs/zeus.h | 9 +- 97 files changed, 457 insertions(+), 1021 deletions(-) delete mode 100644 board/sandburst/common/ppc440gx_i2c.c delete mode 100644 board/sandburst/common/ppc440gx_i2c.h
arch/powerpc/cpu/ppc4xx/40x_spd_sdram.c +1 -5
@@ -52,10 +52,6 @@/* * Set default values */ -#ifndef CONFIG_SYS_I2C_SPEED -#define CONFIG_SYS_I2C_SPEED 50000 -#endif -#define ONE_BILLION 1000000000#define SDRAM0_CFG_DCE 0x80000000
@@ -158,7 +154,7 @@ long int spd_sdram(int(read_spd)(uint addr))* Make sure I2C controller is initialized * before continuing. */ -i2c_init (CONFIG_SYS_I2C_SPEED ,CONFIG_SYS_I2C_SLAVE ); +i2c_set_bus_num (CONFIG_SYS_SPD_BUS_NUM ); }/* Make shure we are using SDRAM */
arch/powerpc/cpu/ppc4xx/44x_spd_ddr.c +1 -5
@@ -62,10 +62,6 @@/* * Set default values */ -#ifndef CONFIG_SYS_I2C_SPEED -#define CONFIG_SYS_I2C_SPEED 50000 -#endif -#define ONE_BILLION 1000000000/*
@@ -168,7 +164,7 @@ long int spd_sdram(void) {* Make sure I2C controller is initialized * before continuing. */ -i2c_init (CONFIG_SYS_I2C_SPEED ,CONFIG_SYS_I2C_SLAVE ); +i2c_set_bus_num (CONFIG_SYS_SPD_BUS_NUM );/* * Read the SPD information using I2C interface. Check to see if the
arch/powerpc/cpu/ppc4xx/44x_spd_ddr2.c +1 -2
@@ -459,8 +459,7 @@ phys_size_t initdram(int board_type)*/ /* switch to correct I2C bus */ -I2C_SET_BUS (CONFIG_SYS_SPD_BUS_NUM ); -i2c_init (CONFIG_SYS_I2C_SPEED ,CONFIG_SYS_I2C_SLAVE ); +i2c_set_bus_num (CONFIG_SYS_SPD_BUS_NUM );/*------------------------------------------------------------------ * Clear out the serial presence detect buffers.
arch/powerpc/cpu/ppc4xx/cmd_chip_config.c +1 -1
@@ -56,7 +56,7 @@ static int do_chip_config(cmd_tbl_t *cmdtp, int flag, int argc, char * const arg* First switch to correct I2C bus. This is I2C bus 0 * for all currently available 4xx derivats. */ -I2C_SET_BUS (0 ); +i2c_set_bus_num (0 );#ifdef CONFIG_CMD_EEPROM ret = eeprom_read(CONFIG_4xx_CONFIG_I2C_EEPROM_ADDR,
arch/powerpc/cpu/ppc4xx/denali_spd_ddr2.c +1 -2
@@ -1041,8 +1041,7 @@ phys_size_t initdram(int board_type)* before continuing. */ /* switch to correct I2C bus */ -I2C_SET_BUS (CONFIG_SYS_SPD_BUS_NUM ); -i2c_init (CONFIG_SYS_I2C_SPEED ,CONFIG_SYS_I2C_SLAVE ); +i2c_set_bus_num (CONFIG_SYS_SPD_BUS_NUM );/*------------------------------------------------------------------ * Clear out the serial presence detect buffers.
arch/powerpc/include/asm/ppc4xx-i2c.h +0 -18
@@ -34,24 +34,6 @@#define IIC_TIMEOUT 1/* 1 second */ -#if defined(CONFIG_I2C_MULTI_BUS ) -#define I2C_BUS_OFFS (i2c_bus_num * 0x100) -#else -#define I2C_BUS_OFFS (0x000) -#endif /* CONFIG_I2C_MULTI_BUS */ - -#if defined(CONFIG_440EP ) || defined(CONFIG_440GR ) || \ - defined(CONFIG_440EPX ) || defined(CONFIG_440GRX ) || \ - defined(CONFIG_460EX ) || defined(CONFIG_460GT ) -#define I2C_BASE_ADDR (CONFIG_SYS_PERIPHERAL_BASE + 0x00000700 + I2C_BUS_OFFS) -#elif defined(CONFIG_440 ) || defined(CONFIG_405EX ) -/* all remaining 440 variants */ -#define I2C_BASE_ADDR (CONFIG_SYS_PERIPHERAL_BASE + 0x00000400 + I2C_BUS_OFFS) -#else -/* all 405 variants */ -#define I2C_BASE_ADDR (0xEF600500 + I2C_BUS_OFFS) -#endif -struct ppc4xx_i2c {u8 mdbuf;u8 res1;
board/csb272/csb272.c +1 -1
@@ -51,7 +51,7 @@ uchar pll_fs6377_regs[16] = {*/ int pll_init (void ) { -i2c_init (CONFIG_SYS_I2C_SPEED ,CONFIG_SYS_I2C_SLAVE ); +i2c_set_bus_num (0 );return i2c_write (CONFIG_SYS_I2C_PLL_ADDR ,0 ,1 , (uchar *) pll_fs6377_regs,sizeof (pll_fs6377_regs));
board/esd/du440/du440.c +0 -2
@@ -385,7 +385,6 @@ int last_stage_init(void)return 0 ; } -#if defined(CONFIG_I2C_MULTI_BUS )/* * read field strength from I2C ADC */
@@ -500,7 +499,6 @@ U_BOOT_CMD("Initialize USB hub" ,"" ); -#endif /* CONFIG_I2C_MULTI_BUS */ #define CONFIG_SYS_BOOT_EEPROM_PAGE_WRITE_BITS 3 int boot_eeprom_write (unsigned dev_addr,
board/lwmon5/kbd.c +1 -1
@@ -111,7 +111,7 @@ static void kbd_init (void)uchar val, errcd;int i; -i2c_init (CONFIG_SYS_I2C_SPEED ,CONFIG_SYS_I2C_SLAVE ); +i2c_set_bus_num (0 ); gd->arch.kbd_status =0 ;
board/mpl/pip405/pip405.c +1 -1
@@ -209,7 +209,7 @@ int board_early_init_f (void)#endif /* Read Serial Presence Detect Information */ -i2c_init (CONFIG_SYS_I2C_SPEED ,CONFIG_SYS_I2C_SLAVE ); +i2c_set_bus_num (0 );for (i =0 ; i <128 ; i++) datain[i] =127 ;i2c_read (SPD_EEPROM_ADDRESS ,0 ,1 ,datain,128 );
board/sandburst/common/ppc440gx_i2c.c deleted +0 -510
510 lines not on this page · raw message
board/sandburst/common/ppc440gx_i2c.h deleted +0 -60
60 lines not on this page · raw message
board/sandburst/common/sb_common.c +52 -51
158 lines not on this page · raw message
board/sandburst/common/sb_common.h +0 -1
@@ -28,7 +28,6 @@#include <asm/io.h> #include <spd_sdram.h> #include <i2c.h> -#include "ppc440gx_i2c.h" /* * GPIO Settings
board/sandburst/karef/Makefile +1 -2
@@ -40,8 +40,7 @@ CFLAGS += -DBUILDUSER='"$(BUILDUSER)"' LIB = $(obj)lib$(BOARD).o -COBJS = $(BOARD).o ../common/flash.o ../common/ppc440gx_i2c.o \ - ../common/sb_common.o +COBJS = $(BOARD).o ../common/flash.o ../common/sb_common.o SOBJS = init.o
board/sandburst/karef/karef.c +0 -5
@@ -337,11 +337,6 @@ int checkboard (void)************************************************************************/ int misc_init_f (void ) { -/* Turn on i2c bus 1 */ -puts ("I2C1: " ); -i2c1_init (CONFIG_SYS_I2C_SPEED ,CONFIG_SYS_I2C_SLAVE ); -puts ("ready\n" ); -/* Turn on fans 3 & 4 */ sbcommon_fans ();
board/sandburst/metrobox/Makefile +1 -2
@@ -39,8 +39,7 @@ CFLAGS += -DBUILDUSER='"$(BUILDUSER)"' LIB = $(obj)lib$(BOARD).o -COBJS = $(BOARD).o ../common/flash.o ../common/ppc440gx_i2c.o \ - ../common/sb_common.o +COBJS = $(BOARD).o ../common/flash.o ../common/sb_common.o SOBJS = init.o SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
board/sandburst/metrobox/metrobox.c +0 -6
@@ -30,7 +30,6 @@#include <asm/io.h> #include <spd_sdram.h> #include <i2c.h> -#include "../common/ppc440gx_i2c.h" #include "../common/sb_common.h" #if defined(CONFIG_HAS_ETH0 ) || defined(CONFIG_HAS_ETH1 ) || \ defined(CONFIG_HAS_ETH2 ) || defined(CONFIG_HAS_ETH3 )
@@ -305,11 +304,6 @@ int checkboard (void)************************************************************************/ int misc_init_f (void ) { -/* Turn on i2c bus 1 */ -puts ("I2C1: " ); -i2c1_init (CONFIG_SYS_I2C_SPEED ,CONFIG_SYS_I2C_SLAVE ); -puts ("ready\n" ); -/* Turn on fans */ sbcommon_fans ();
drivers/i2c/Makefile +1 -1
@@ -36,7 +36,6 @@ COBJS-$(CONFIG_DRIVER_OMAP1510_I2C) += omap1510_i2c.o COBJS-$(CONFIG_DRIVER_OMAP24XX_I2C) += omap24xx_i2c.o COBJS-$(CONFIG_DRIVER_OMAP34XX_I2C) += omap24xx_i2c.o COBJS-$(CONFIG_PCA9564_I2C) += pca9564_i2c.o -COBJS-$(CONFIG_PPC4XX_I2C) += ppc4xx_i2c.o COBJS-$(CONFIG_DRIVER_S3C24X0_I2C) += s3c24x0_i2c.o COBJS-$(CONFIG_S3C44B0_I2C) += s3c44b0_i2c.o COBJS-$(CONFIG_TSI108_I2C) += tsi108_i2c.o
@@ -45,6 +44,7 @@ COBJS-$(CONFIG_SH_I2C) += sh_i2c.o COBJS-$(CONFIG_SH_SH7734_I2C) += sh_sh7734_i2c.o COBJS-$(CONFIG_SYS_I2C) += i2c_core.o COBJS-$(CONFIG_SYS_I2C_FSL) += fsl_i2c.o +COBJS-$(CONFIG_SYS_I2C_PPC4XX) += ppc4xx_i2c.o COBJS-$(CONFIG_SYS_I2C_SOFT) += soft_i2c.o COBJS-$(CONFIG_SYS_I2C_TEGRA) += tegra_i2c.o
drivers/i2c/ppc4xx_i2c.c +96 -97
276 lines not on this page · raw message
include/configs/APC405.h +5 -4
@@ -305,10 +305,11 @@/* * I2C EEPROM (CAT24WC16) for environment */ -#define CONFIG_HARD_I2C /* I2c with hardware support */ -#define CONFIG_PPC4XX_I2C /* use PPC4xx driver */ -#define CONFIG_SYS_I2C_SPEED 100000/* I2C speed and slave address */ -#define CONFIG_SYS_I2C_SLAVE 0x7F +#define CONFIG_SYS_I2C +#define CONFIG_SYS_I2C_PPC4XX +#define CONFIG_SYS_I2C_PPC4XX_CH0 +#define CONFIG_SYS_I2C_PPC4XX_SPEED_0 100000 +#define CONFIG_SYS_I2C_PPC4XX_SLAVE_0 0x7F#define CONFIG_SYS_I2C_EEPROM_ADDR 0x50/* EEPROM CAT28WC08 */ #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1/* Bytes of address */
include/configs/ASH405.h +5 -4
@@ -246,10 +246,11 @@/*----------------------------------------------------------------------- * I2C EEPROM (CAT24WC16) for environment */ -#define CONFIG_HARD_I2C /* I2c with hardware support */ -#define CONFIG_PPC4XX_I2C /* use PPC4xx driver */ -#define CONFIG_SYS_I2C_SPEED 400000/* I2C speed and slave address */ -#define CONFIG_SYS_I2C_SLAVE 0x7F +#define CONFIG_SYS_I2C +#define CONFIG_SYS_I2C_PPC4XX +#define CONFIG_SYS_I2C_PPC4XX_CH0 +#define CONFIG_SYS_I2C_PPC4XX_SPEED_0 400000 +#define CONFIG_SYS_I2C_PPC4XX_SLAVE_0 0x7F#define CONFIG_SYS_I2C_EEPROM_ADDR 0x50/* EEPROM CAT28WC08 */ #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1/* Bytes of address */
include/configs/CANBT.h +5 -4
@@ -184,10 +184,11 @@#define CONFIG_SYS_I2C_SOFT /* Software I2C support enabled */ #endif #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1/* Bytes of address */ -#define CONFIG_HARD_I2C /* I2C with hardware support */ -#define CONFIG_PPC4XX_I2C /* use PPC4xx driver */ -#define CONFIG_SYS_I2C_SPEED 400000/* I2C speed and slave address */ -#define CONFIG_SYS_I2C_SLAVE 0x7F +#define CONFIG_SYS_I2C +#define CONFIG_SYS_I2C_PPC4XX +#define CONFIG_SYS_I2C_PPC4XX_CH0 +#define CONFIG_SYS_I2C_PPC4XX_SPEED_0 400000 +#define CONFIG_SYS_I2C_PPC4XX_SLAVE_0 0x7F#define CONFIG_SYS_I2C_EEPROM_ADDR 0x50/* EEPROM CAT28WC08 */ #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1/* bytes of address */
include/configs/CATcenter.h +5 -4
@@ -401,10 +401,11 @@/*----------------------------------------------------------------------- * I2C EEPROM (CAT24WC16) for environment */ -#define CONFIG_HARD_I2C /* I2c with hardware support */ -#define CONFIG_PPC4XX_I2C /* use PPC4xx driver */ -#define CONFIG_SYS_I2C_SPEED 400000/* I2C speed and slave address */ -#define CONFIG_SYS_I2C_SLAVE 0x7F +#define CONFIG_SYS_I2C +#define CONFIG_SYS_I2C_PPC4XX +#define CONFIG_SYS_I2C_PPC4XX_CH0 +#define CONFIG_SYS_I2C_PPC4XX_SPEED_0 400000 +#define CONFIG_SYS_I2C_PPC4XX_SLAVE_0 0x7F#define CONFIG_SYS_I2C_EEPROM_ADDR 0x50/* EEPROM CAT28WC08 */ #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1/* Bytes of address */
include/configs/CMS700.h +5 -4
@@ -226,10 +226,11 @@/*----------------------------------------------------------------------- * I2C EEPROM (CAT24WC16) for environment */ -#define CONFIG_HARD_I2C /* I2c with hardware support */ -#define CONFIG_PPC4XX_I2C /* use PPC4xx driver */ -#define CONFIG_SYS_I2C_SPEED 100000/* I2C speed and slave address */ -#define CONFIG_SYS_I2C_SLAVE 0x7F +#define CONFIG_SYS_I2C +#define CONFIG_SYS_I2C_PPC4XX +#define CONFIG_SYS_I2C_PPC4XX_CH0 +#define CONFIG_SYS_I2C_PPC4XX_SPEED_0 100000 +#define CONFIG_SYS_I2C_PPC4XX_SLAVE_0 0x7F#define CONFIG_SYS_I2C_EEPROM_ADDR 0x50/* EEPROM CAT28WC08 */ #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1/* Bytes of address */
include/configs/CPCI2DP.h +5 -4
@@ -210,10 +210,11 @@/*----------------------------------------------------------------------- * I2C EEPROM (CAT24WC16) for environment */ -#define CONFIG_HARD_I2C /* I2c with hardware support */ -#define CONFIG_PPC4XX_I2C /* use PPC4xx driver */ -#define CONFIG_SYS_I2C_SPEED 400000/* I2C speed and slave address */ -#define CONFIG_SYS_I2C_SLAVE 0x7F +#define CONFIG_SYS_I2C +#define CONFIG_SYS_I2C_PPC4XX +#define CONFIG_SYS_I2C_PPC4XX_CH0 +#define CONFIG_SYS_I2C_PPC4XX_SPEED_0 400000 +#define CONFIG_SYS_I2C_PPC4XX_SLAVE_0 0x7F#define CONFIG_SYS_I2C_EEPROM_ADDR 0x50/* EEPROM CAT28WC08 */ #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1/* Bytes of address */
include/configs/CPCI405.h +5 -4
@@ -259,10 +259,11 @@/*----------------------------------------------------------------------- * I2C EEPROM (CAT24WC08) for environment */ -#define CONFIG_HARD_I2C /* I2c with hardware support */ -#define CONFIG_PPC4XX_I2C /* use PPC4xx driver */ -#define CONFIG_SYS_I2C_SPEED 400000/* I2C speed and slave address */ -#define CONFIG_SYS_I2C_SLAVE 0x7F +#define CONFIG_SYS_I2C +#define CONFIG_SYS_I2C_PPC4XX +#define CONFIG_SYS_I2C_PPC4XX_CH0 +#define CONFIG_SYS_I2C_PPC4XX_SPEED_0 400000 +#define CONFIG_SYS_I2C_PPC4XX_SLAVE_0 0x7F#define CONFIG_SYS_I2C_EEPROM_ADDR 0x50/* EEPROM CAT28WC08 */ #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1/* Bytes of address */
include/configs/CPCI4052.h +5 -4
@@ -286,10 +286,11 @@/*----------------------------------------------------------------------- * I2C EEPROM (CAT24WC16) for environment */ -#define CONFIG_HARD_I2C /* I2c with hardware support */ -#define CONFIG_PPC4XX_I2C /* use PPC4xx driver */ -#define CONFIG_SYS_I2C_SPEED 400000/* I2C speed and slave address */ -#define CONFIG_SYS_I2C_SLAVE 0x7F +#define CONFIG_SYS_I2C +#define CONFIG_SYS_I2C_PPC4XX +#define CONFIG_SYS_I2C_PPC4XX_CH0 +#define CONFIG_SYS_I2C_PPC4XX_SPEED_0 400000 +#define CONFIG_SYS_I2C_PPC4XX_SLAVE_0 0x7F#define CONFIG_SYS_I2C_EEPROM_ADDR 0x50/* EEPROM CAT28WC08 */ #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1/* Bytes of address */
include/configs/CPCI405AB.h +5 -4
@@ -262,10 +262,11 @@/*----------------------------------------------------------------------- * I2C EEPROM (CAT24WC32) for environment */ -#define CONFIG_HARD_I2C /* I2c with hardware support */ -#define CONFIG_PPC4XX_I2C /* use PPC4xx driver */ -#define CONFIG_SYS_I2C_SPEED 100000/* I2C speed and slave address */ -#define CONFIG_SYS_I2C_SLAVE 0x7F +#define CONFIG_SYS_I2C +#define CONFIG_SYS_I2C_PPC4XX +#define CONFIG_SYS_I2C_PPC4XX_CH0 +#define CONFIG_SYS_I2C_PPC4XX_SPEED_0 100000 +#define CONFIG_SYS_I2C_PPC4XX_SLAVE_0 0x7F#define CONFIG_SYS_I2C_EEPROM_ADDR 0x50/* EEPROM CAT28WC32 */ #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2/* Bytes of address */
include/configs/CPCI405DT.h +5 -4
@@ -281,10 +281,11 @@/*----------------------------------------------------------------------- * I2C EEPROM (CAT24WC16) for environment */ -#define CONFIG_HARD_I2C /* I2c with hardware support */ -#define CONFIG_PPC4XX_I2C /* use PPC4xx driver */ -#define CONFIG_SYS_I2C_SPEED 400000/* I2C speed and slave address */ -#define CONFIG_SYS_I2C_SLAVE 0x7F +#define CONFIG_SYS_I2C +#define CONFIG_SYS_I2C_PPC4XX +#define CONFIG_SYS_I2C_PPC4XX_CH0 +#define CONFIG_SYS_I2C_PPC4XX_SPEED_0 400000 +#define CONFIG_SYS_I2C_PPC4XX_SLAVE_0 0x7F#define CONFIG_SYS_I2C_EEPROM_ADDR 0x50/* EEPROM CAT28WC08 */ #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1/* Bytes of address */
include/configs/CPCIISER4.h +5 -4
@@ -195,10 +195,11 @@/*----------------------------------------------------------------------- * I2C EEPROM (CAT24WC08) for environment */ -#define CONFIG_HARD_I2C /* I2C with hardware support */ -#define CONFIG_PPC4XX_I2C /* use PPC4xx driver */ -#define CONFIG_SYS_I2C_SPEED 400000/* I2C speed and slave address */ -#define CONFIG_SYS_I2C_SLAVE 0x7F +#define CONFIG_SYS_I2C +#define CONFIG_SYS_I2C_PPC4XX +#define CONFIG_SYS_I2C_PPC4XX_CH0 +#define CONFIG_SYS_I2C_PPC4XX_SPEED_0 400000 +#define CONFIG_SYS_I2C_PPC4XX_SLAVE_0 0x7F#define CONFIG_SYS_I2C_EEPROM_ADDR 0x50/* EEPROM CAT28WC08 */ #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1/* Bytes of address */
include/configs/CRAYL1.h +5 -4
@@ -76,11 +76,12 @@#define CONFIG_SERVERIP 10.0.0.1 #define CONFIG_ETHADDR 00:40:a6:80:14:5 */ -#define CONFIG_HARD_I2C 1/* hardware support for i2c */ -#define CONFIG_PPC4XX_I2C /* use PPC4xx driver */ +#define CONFIG_SYS_I2C +#define CONFIG_SYS_I2C_PPC4XX +#define CONFIG_SYS_I2C_PPC4XX_CH0 #define CONFIG_SDRAM_BANK0 1 -#define CONFIG_SYS_I2C_SPEED 400000/* I2C speed and slave address */ -#define CONFIG_SYS_I2C_SLAVE 0x7F +#define CONFIG_SYS_I2C_PPC4XX_SPEED_0 400000 +#define CONFIG_SYS_I2C_PPC4XX_SLAVE_0 0x7F#define CONFIG_SYS_I2C_EEPROM_ADDR 0x57#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1#define CONFIG_IDENT_STRING "Cray L1"
include/configs/DP405.h +5 -4
@@ -178,10 +178,11 @@/*----------------------------------------------------------------------- * I2C EEPROM (CAT24WC16) for environment */ -#define CONFIG_HARD_I2C /* I2c with hardware support */ -#define CONFIG_PPC4XX_I2C /* use PPC4xx driver */ -#define CONFIG_SYS_I2C_SPEED 400000/* I2C speed and slave address */ -#define CONFIG_SYS_I2C_SLAVE 0x7F +#define CONFIG_SYS_I2C +#define CONFIG_SYS_I2C_PPC4XX +#define CONFIG_SYS_I2C_PPC4XX_CH0 +#define CONFIG_SYS_I2C_PPC4XX_SPEED_0 400000 +#define CONFIG_SYS_I2C_PPC4XX_SLAVE_0 0x7F#define CONFIG_SYS_I2C_EEPROM_ADDR 0x50/* EEPROM CAT28WC08 */ #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1/* Bytes of address */
include/configs/DU405.h +5 -4
@@ -197,10 +197,11 @@/*----------------------------------------------------------------------- * I2C EEPROM (CAT24WC08) for environment */ -#define CONFIG_HARD_I2C /* I2c with hardware support */ -#define CONFIG_PPC4XX_I2C /* use PPC4xx driver */ -#define CONFIG_SYS_I2C_SPEED 400000/* I2C speed and slave address */ -#define CONFIG_SYS_I2C_SLAVE 0x7F +#define CONFIG_SYS_I2C +#define CONFIG_SYS_I2C_PPC4XX +#define CONFIG_SYS_I2C_PPC4XX_CH0 +#define CONFIG_SYS_I2C_PPC4XX_SPEED_0 400000 +#define CONFIG_SYS_I2C_PPC4XX_SLAVE_0 0x7F#define CONFIG_SYS_I2C_EEPROM_ADDR 0x50/* EEPROM CAT28WC08 */ #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1/* Bytes of address */
include/configs/DU440.h +10 -8
@@ -170,18 +170,20 @@/* * I2C */ -#define CONFIG_HARD_I2C 1/* I2C with hardware support */ -#define CONFIG_PPC4XX_I2C /* use PPC4xx driver */ -#define CONFIG_SYS_I2C_SPEED 100000/* I2C speed and slave address */ -#define CONFIG_SYS_I2C_SLAVE 0x7F -#define CONFIG_I2C_MULTI_BUS 1 +#define CONFIG_SYS_I2C +#define CONFIG_SYS_I2C_PPC4XX +#define CONFIG_SYS_I2C_PPC4XX_CH0 +#define CONFIG_SYS_I2C_PPC4XX_SPEED_0 100000 +#define CONFIG_SYS_I2C_PPC4XX_SLAVE_0 0x7F +#define CONFIG_SYS_I2C_PPC4XX_CH1 +#define CONFIG_SYS_I2C_PPC4XX_SPEED_1 100000 +#define CONFIG_SYS_I2C_PPC4XX_SLAVE_1 0x7F#define CONFIG_SYS_SPD_BUS_NUM 0#define IIC1_MCP3021_ADDR 0x4d#define IIC1_USB2507_ADDR 0x2c -#ifdef CONFIG_I2C_MULTI_BUS -#define CONFIG_SYS_I2C_NOPROBES {{1, IIC1_USB2507_ADDR}} -#endif +#define CONFIG_SYS_I2C_NOPROBES { {1, IIC1_USB2507_ADDR} } +#define CONFIG_SYS_I2C_MULTI_EEPROMS #define CONFIG_SYS_I2C_EEPROM_ADDR 0x54#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2
include/configs/G2000.h +5 -4
@@ -297,10 +297,11 @@/*----------------------------------------------------------------------- * I2C EEPROM (CAT24WC16) for environment */ -#define CONFIG_HARD_I2C /* I2c with hardware support */ -#define CONFIG_PPC4XX_I2C /* use PPC4xx driver */ -#define CONFIG_SYS_I2C_SPEED 400000/* I2C speed and slave address */ -#define CONFIG_SYS_I2C_SLAVE 0x7F +#define CONFIG_SYS_I2C +#define CONFIG_SYS_I2C_PPC4XX +#define CONFIG_SYS_I2C_PPC4XX_CH0 +#define CONFIG_SYS_I2C_PPC4XX_SPEED_0 400000 +#define CONFIG_SYS_I2C_PPC4XX_SLAVE_0 0x7F#define CONFIG_SYS_I2C_EEPROM_ADDR 0x50/* EEPROM CAT24WC08 */ /* CAT24WC08/16... */
include/configs/HH405.h +6 -5
@@ -333,14 +333,15 @@/*----------------------------------------------------------------------- * I2C EEPROM (CAT24WC16) for environment */ -#define CONFIG_HARD_I2C /* I2c with hardware support */ -#define CONFIG_PPC4XX_I2C /* use PPC4xx driver */ +#define CONFIG_SYS_I2C +#define CONFIG_SYS_I2C_PPC4XX +#define CONFIG_SYS_I2C_PPC4XX_CH0 #if 0 /* test-only */ -#define CONFIG_SYS_I2C_SPEED 400000/* I2C speed and slave address */ +#define CONFIG_SYS_I2C_PPC4XX_SPEED_0 400000#else -#define CONFIG_SYS_I2C_SPEED 100000/* I2C speed and slave address */ +#define CONFIG_SYS_I2C_PPC4XX_SPEED_0 100000#endif -#define CONFIG_SYS_I2C_SLAVE 0x7F +#define CONFIG_SYS_I2C_PPC4XX_SLAVE_0 0x7F#define CONFIG_SYS_I2C_EEPROM_ADDR 0x50/* EEPROM CAT24WC08 */ #define CONFIG_SYS_EEPROM_WREN 1
include/configs/HUB405.h +5 -4
@@ -246,10 +246,11 @@/*----------------------------------------------------------------------- * I2C EEPROM (CAT24WC16) for environment */ -#define CONFIG_HARD_I2C /* I2c with hardware support */ -#define CONFIG_PPC4XX_I2C /* use PPC4xx driver */ -#define CONFIG_SYS_I2C_SPEED 400000/* I2C speed and slave address */ -#define CONFIG_SYS_I2C_SLAVE 0x7F +#define CONFIG_SYS_I2C +#define CONFIG_SYS_I2C_PPC4XX +#define CONFIG_SYS_I2C_PPC4XX_CH0 +#define CONFIG_SYS_I2C_PPC4XX_SPEED_0 400000 +#define CONFIG_SYS_I2C_PPC4XX_SLAVE_0 0x7F#define CONFIG_SYS_I2C_EEPROM_ADDR 0x50/* EEPROM CAT28WC08 */ #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1/* Bytes of address */
include/configs/JSE.h +5 -4
@@ -210,10 +210,11 @@#define CONFIG_SYS_HZ 1000/* decrementer freq: 1 ms ticks */ -#define CONFIG_HARD_I2C 1/* I2C with hardware support */ -#define CONFIG_PPC4XX_I2C /* use PPC4xx driver */ -#define CONFIG_SYS_I2C_SPEED 400000/* I2C speed and slave address */ -#define CONFIG_SYS_I2C_SLAVE 0x7F +#define CONFIG_SYS_I2C +#define CONFIG_SYS_I2C_PPC4XX +#define CONFIG_SYS_I2C_PPC4XX_CH0 +#define CONFIG_SYS_I2C_PPC4XX_SPEED_0 400000 +#define CONFIG_SYS_I2C_PPC4XX_SLAVE_0 0x7F/*-----------------------------------------------------------------------
include/configs/KAREF.h +9 -7
@@ -133,13 +133,15 @@/*----------------------------------------------------------------------- * I2C *----------------------------------------------------------------------*/ -#define CONFIG_HARD_I2C 1/* I2C hardware support */ -#define CONFIG_PPC4XX_I2C /* use PPC4xx driver */ -#define CONFIG_SYS_I2C_SPEED 400000/* I2C speed 400kHz */ -#define CONFIG_SYS_I2C_SLAVE 0x7F/* I2C slave address */ -#define CONFIG_SYS_I2C_NOPROBES {0x69}/* Don't probe these addrs */ -#define CONFIG_I2C_BUS1 1/* Include i2c bus 1 supp */ - +#define CONFIG_SYS_I2C +#define CONFIG_SYS_I2C_PPC4XX +#define CONFIG_SYS_I2C_PPC4XX_CH0 +#define CONFIG_SYS_I2C_PPC4XX_SPEED_0 400000 +#define CONFIG_SYS_I2C_PPC4XX_SLAVE_0 0x7F +#define CONFIG_SYS_I2C_PPC4XX_CH1 +#define CONFIG_SYS_I2C_PPC4XX_SPEED_1 400000/* I2C speed 400kHz */ +#define CONFIG_SYS_I2C_PPC4XX_SLAVE_1 0x7F +#define CONFIG_SYS_I2C_NOPROBES { { 0, 0x69} }/* Don't probe these addrs */ /*----------------------------------------------------------------------- * Environment
include/configs/METROBOX.h +9 -7
@@ -195,13 +195,15 @@/*----------------------------------------------------------------------- * I2C *----------------------------------------------------------------------*/ -#define CONFIG_HARD_I2C 1/* I2C hardware support */ -#define CONFIG_PPC4XX_I2C /* use PPC4xx driver */ -#define CONFIG_SYS_I2C_SPEED 400000/* I2C speed 400kHz */ -#define CONFIG_SYS_I2C_SLAVE 0x7F/* I2C slave address */ -#define CONFIG_SYS_I2C_NOPROBES {0x69}/* Don't probe these addrs */ -#define CONFIG_I2C_BUS1 1/* Include i2c bus 1 supp */ - +#define CONFIG_SYS_I2C +#define CONFIG_SYS_I2C_PPC4XX +#define CONFIG_SYS_I2C_PPC4XX_CH0 +#define CONFIG_SYS_I2C_PPC4XX_SPEED_0 400000 +#define CONFIG_SYS_I2C_PPC4XX_SLAVE_0 0x7F +#define CONFIG_SYS_I2C_PPC4XX_CH1 +#define CONFIG_SYS_I2C_PPC4XX_SPEED_1 400000/* I2C speed 400kHz */ +#define CONFIG_SYS_I2C_PPC4XX_SLAVE_1 0x7F +#define CONFIG_SYS_I2C_NOPROBES { { 0, 0x69} }/* Don't probe these addrs */ /*----------------------------------------------------------------------- * Environment
include/configs/MIP405.h +5 -4
@@ -98,10 +98,11 @@* The Atmel EEPROM uses 16Bit addressing. ***************************************************************/ -#define CONFIG_HARD_I2C /* I2c with hardware support */ -#define CONFIG_PPC4XX_I2C /* use PPC4xx driver */ -#define CONFIG_SYS_I2C_SPEED 50000/* I2C speed and slave address */ -#define CONFIG_SYS_I2C_SLAVE 0x7F +#define CONFIG_SYS_I2C +#define CONFIG_SYS_I2C_PPC4XX +#define CONFIG_SYS_I2C_PPC4XX_CH0 +#define CONFIG_SYS_I2C_PPC4XX_SPEED_0 50000 +#define CONFIG_SYS_I2C_PPC4XX_SLAVE_0 0x7F#define CONFIG_SYS_I2C_EEPROM_ADDR 0x53/* EEPROM 24C128/256 */ #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2/* Bytes of address */
include/configs/OCRTC.h +5 -4
@@ -216,10 +216,11 @@/*----------------------------------------------------------------------- * I2C EEPROM (CAT24WC08) for environment */ -#define CONFIG_HARD_I2C /* I2c with hardware support */ -#define CONFIG_PPC4XX_I2C /* use PPC4xx driver */ -#define CONFIG_SYS_I2C_SPEED 400000/* I2C speed and slave address */ -#define CONFIG_SYS_I2C_SLAVE 0x7F +#define CONFIG_SYS_I2C +#define CONFIG_SYS_I2C_PPC4XX +#define CONFIG_SYS_I2C_PPC4XX_CH0 +#define CONFIG_SYS_I2C_PPC4XX_SPEED_0 400000 +#define CONFIG_SYS_I2C_PPC4XX_SLAVE_0 0x7F#define CONFIG_SYS_I2C_EEPROM_ADDR 0x50/* EEPROM CAT28WC08 */ #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1/* Bytes of address */
include/configs/ORSG.h +5 -4
@@ -212,10 +212,11 @@/*----------------------------------------------------------------------- * I2C EEPROM (CAT24WC08) for environment */ -#define CONFIG_HARD_I2C /* I2c with hardware support */ -#define CONFIG_PPC4XX_I2C /* use PPC4xx driver */ -#define CONFIG_SYS_I2C_SPEED 400000/* I2C speed and slave address */ -#define CONFIG_SYS_I2C_SLAVE 0x7F +#define CONFIG_SYS_I2C +#define CONFIG_SYS_I2C_PPC4XX +#define CONFIG_SYS_I2C_PPC4XX_CH0 +#define CONFIG_SYS_I2C_PPC4XX_SPEED_0 400000 +#define CONFIG_SYS_I2C_PPC4XX_SLAVE_0 0x7F#define CONFIG_SYS_I2C_EEPROM_ADDR 0x50/* EEPROM CAT28WC08 */ #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1/* Bytes of address */
include/configs/PCI405.h +5 -4
@@ -208,10 +208,11 @@/*----------------------------------------------------------------------- * I2C EEPROM (CAT24WC16) for environment */ -#define CONFIG_HARD_I2C /* I2c with hardware support */ -#define CONFIG_PPC4XX_I2C /* use PPC4xx driver */ -#define CONFIG_SYS_I2C_SPEED 400000/* I2C speed and slave address */ -#define CONFIG_SYS_I2C_SLAVE 0x7F +#define CONFIG_SYS_I2C +#define CONFIG_SYS_I2C_PPC4XX +#define CONFIG_SYS_I2C_PPC4XX_CH0 +#define CONFIG_SYS_I2C_PPC4XX_SPEED_0 400000 +#define CONFIG_SYS_I2C_PPC4XX_SLAVE_0 0x7F#define CONFIG_SYS_I2C_EEPROM_ADDR 0x50/* EEPROM CAT28WC08 */ #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1/* Bytes of address */
include/configs/PIP405.h +5 -4
@@ -87,10 +87,11 @@* EEPROM of the SDRAM * The Atmel EEPROM uses 16Bit addressing. ***************************************************************/ -#define CONFIG_HARD_I2C /* I2c with hardware support */ -#define CONFIG_PPC4XX_I2C /* use PPC4xx driver */ -#define CONFIG_SYS_I2C_SPEED 50000/* I2C speed and slave address */ -#define CONFIG_SYS_I2C_SLAVE 0x7F +#define CONFIG_SYS_I2C +#define CONFIG_SYS_I2C_PPC4XX +#define CONFIG_SYS_I2C_PPC4XX_CH0 +#define CONFIG_SYS_I2C_PPC4XX_SPEED_0 50000 +#define CONFIG_SYS_I2C_PPC4XX_SLAVE_0 0x7F#define CONFIG_SYS_I2C_EEPROM_ADDR 0x53#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2
include/configs/PLU405.h +5 -4
@@ -280,10 +280,11 @@/* * I2C EEPROM (24WC16) for environment */ -#define CONFIG_HARD_I2C /* I2c with hardware support */ -#define CONFIG_PPC4XX_I2C /* use PPC4xx driver */ -#define CONFIG_SYS_I2C_SPEED 400000/* I2C speed and slave address */ -#define CONFIG_SYS_I2C_SLAVE 0x7F +#define CONFIG_SYS_I2C +#define CONFIG_SYS_I2C_PPC4XX +#define CONFIG_SYS_I2C_PPC4XX_CH0 +#define CONFIG_SYS_I2C_PPC4XX_SPEED_0 400000 +#define CONFIG_SYS_I2C_PPC4XX_SLAVE_0 0x7F#define CONFIG_SYS_I2C_EEPROM_ADDR 0x50/* EEPROM 24WC16 */ #define CONFIG_SYS_EEPROM_WREN 1
include/configs/PMC405.h +5 -4
@@ -238,10 +238,11 @@/* * I2C EEPROM (CAT24WC16) for environment */ -#define CONFIG_HARD_I2C /* I2c with hardware support */ -#define CONFIG_PPC4XX_I2C /* use PPC4xx driver */ -#define CONFIG_SYS_I2C_SPEED 100000/* I2C speed and slave address */ -#define CONFIG_SYS_I2C_SLAVE 0x7F +#define CONFIG_SYS_I2C +#define CONFIG_SYS_I2C_PPC4XX +#define CONFIG_SYS_I2C_PPC4XX_CH0 +#define CONFIG_SYS_I2C_PPC4XX_SPEED_0 100000 +#define CONFIG_SYS_I2C_PPC4XX_SLAVE_0 0x7F#define CONFIG_SYS_I2C_EEPROM_ADDR 0x50/* EEPROM CAT24W16 */ #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1/* Bytes of address */
include/configs/PMC405DE.h +5 -4
@@ -216,10 +216,11 @@/* * I2C EEPROM (24W16) for environment */ -#define CONFIG_HARD_I2C /* I2c with hardware support */ -#define CONFIG_PPC4XX_I2C /* use PPC4xx driver */ -#define CONFIG_SYS_I2C_SPEED 400000/* I2C speed and slave address */ -#define CONFIG_SYS_I2C_SLAVE 0x7F +#define CONFIG_SYS_I2C +#define CONFIG_SYS_I2C_PPC4XX +#define CONFIG_SYS_I2C_PPC4XX_CH0 +#define CONFIG_SYS_I2C_PPC4XX_SPEED_0 400000 +#define CONFIG_SYS_I2C_PPC4XX_SLAVE_0 0x7F#define CONFIG_SYS_I2C_EEPROM_ADDR 0x50/* EEPROM 24W16 */ #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1/* Bytes of address */
include/configs/PMC440.h +8 -6
@@ -225,12 +225,14 @@/*----------------------------------------------------------------------- * I2C *----------------------------------------------------------------------*/ -#define CONFIG_HARD_I2C 1/* I2C with hardware support */ -#define CONFIG_PPC4XX_I2C /* use PPC4xx driver */ -#define CONFIG_SYS_I2C_SPEED 400000/* I2C speed and slave address */ -#define CONFIG_SYS_I2C_SLAVE 0x7F - -#define CONFIG_I2C_MULTI_BUS 1 +#define CONFIG_SYS_I2C +#define CONFIG_SYS_I2C_PPC4XX +#define CONFIG_SYS_I2C_PPC4XX_CH0 +#define CONFIG_SYS_I2C_PPC4XX_SPEED_0 400000 +#define CONFIG_SYS_I2C_PPC4XX_SLAVE_0 0x7F +#define CONFIG_SYS_I2C_PPC4XX_CH1 +#define CONFIG_SYS_I2C_PPC4XX_SPEED_1 400000 +#define CONFIG_SYS_I2C_PPC4XX_SLAVE_1 0x7F#define CONFIG_SYS_I2C_MULTI_EEPROMS
include/configs/PPChameleonEVB.h +5 -4
@@ -418,10 +418,11 @@/*----------------------------------------------------------------------- * I2C EEPROM (CAT24WC16) for environment */ -#define CONFIG_HARD_I2C /* I2c with hardware support */ -#define CONFIG_PPC4XX_I2C /* use PPC4xx driver */ -#define CONFIG_SYS_I2C_SPEED 400000/* I2C speed and slave address */ -#define CONFIG_SYS_I2C_SLAVE 0x7F +#define CONFIG_SYS_I2C +#define CONFIG_SYS_I2C_PPC4XX +#define CONFIG_SYS_I2C_PPC4XX_CH0 +#define CONFIG_SYS_I2C_PPC4XX_SPEED_0 400000 +#define CONFIG_SYS_I2C_PPC4XX_SLAVE_0 0x7F#define CONFIG_SYS_I2C_EEPROM_ADDR 0x50/* EEPROM CAT28WC08 */ #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1/* Bytes of address */
include/configs/VOH405.h +5 -4
@@ -279,10 +279,11 @@/*----------------------------------------------------------------------- * I2C EEPROM (CAT24WC16) for environment */ -#define CONFIG_HARD_I2C /* I2c with hardware support */ -#define CONFIG_PPC4XX_I2C /* use PPC4xx driver */ -#define CONFIG_SYS_I2C_SPEED 100000/* I2C speed and slave address */ -#define CONFIG_SYS_I2C_SLAVE 0x7F +#define CONFIG_SYS_I2C +#define CONFIG_SYS_I2C_PPC4XX +#define CONFIG_SYS_I2C_PPC4XX_CH0 +#define CONFIG_SYS_I2C_PPC4XX_SPEED_0 100000 +#define CONFIG_SYS_I2C_PPC4XX_SLAVE_0 0x7F#define CONFIG_SYS_I2C_EEPROM_ADDR 0x50/* EEPROM CAT24WC08 */ #define CONFIG_SYS_EEPROM_WREN 1
include/configs/VOM405.h +5 -4
@@ -205,10 +205,11 @@/* * I2C EEPROM (CAT24WC16) for environment */ -#define CONFIG_HARD_I2C /* I2c with hardware support */ -#define CONFIG_PPC4XX_I2C /* use PPC4xx driver */ -#define CONFIG_SYS_I2C_SPEED 400000/* I2C speed and slave address */ -#define CONFIG_SYS_I2C_SLAVE 0x7F +#define CONFIG_SYS_I2C +#define CONFIG_SYS_I2C_PPC4XX +#define CONFIG_SYS_I2C_PPC4XX_CH0 +#define CONFIG_SYS_I2C_PPC4XX_SPEED_0 400000 +#define CONFIG_SYS_I2C_PPC4XX_SLAVE_0 0x7F#define CONFIG_SYS_I2C_EEPROM_ADDR 0x50/* EEPROM CAT28WC08 */ #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1/* Bytes of address */
include/configs/W7OLMC.h +5 -4
@@ -278,10 +278,11 @@/*----------------------------------------------------------------------- * I2C EEPROM (CAT24WC08) for environment */ -#define CONFIG_HARD_I2C /* I2c with hardware support */ -#define CONFIG_PPC4XX_I2C /* use PPC4xx driver */ -#define CONFIG_SYS_I2C_SPEED 400000/* I2C speed and slave address */ -#define CONFIG_SYS_I2C_SLAVE 0x7F +#define CONFIG_SYS_I2C +#define CONFIG_SYS_I2C_PPC4XX +#define CONFIG_SYS_I2C_PPC4XX_CH0 +#define CONFIG_SYS_I2C_PPC4XX_SPEED_0 400000 +#define CONFIG_SYS_I2C_PPC4XX_SLAVE_0 0x7F#define CONFIG_SYS_I2C_EEPROM_ADDR 0x50/* EEPROM CAT28WC08 */ #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1/* Bytes of address */
include/configs/W7OLMG.h +5 -4
@@ -285,10 +285,11 @@/*----------------------------------------------------------------------- * I2C EEPROM (ATMEL 24C04N) */ -#define CONFIG_HARD_I2C 1/* Hardware assisted I2C */ -#define CONFIG_PPC4XX_I2C /* use PPC4xx driver */ -#define CONFIG_SYS_I2C_SPEED 400000/* I2C speed and slave address */ -#define CONFIG_SYS_I2C_SLAVE 0x7F +#define CONFIG_SYS_I2C +#define CONFIG_SYS_I2C_PPC4XX +#define CONFIG_SYS_I2C_PPC4XX_CH0 +#define CONFIG_SYS_I2C_PPC4XX_SPEED_0 400000 +#define CONFIG_SYS_I2C_PPC4XX_SLAVE_0 0x7F#define CONFIG_SYS_I2C_EEPROM_ADDR 0x50/* EEPROM ATMEL 24C04N */ #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1/* Bytes of address */
include/configs/WUH405.h +5 -4
@@ -243,10 +243,11 @@/*----------------------------------------------------------------------- * I2C EEPROM (CAT24WC16) for environment */ -#define CONFIG_HARD_I2C /* I2c with hardware support */ -#define CONFIG_PPC4XX_I2C /* use PPC4xx driver */ -#define CONFIG_SYS_I2C_SPEED 400000/* I2C speed and slave address */ -#define CONFIG_SYS_I2C_SLAVE 0x7F +#define CONFIG_SYS_I2C +#define CONFIG_SYS_I2C_PPC4XX +#define CONFIG_SYS_I2C_PPC4XX_CH0 +#define CONFIG_SYS_I2C_PPC4XX_SPEED_0 400000 +#define CONFIG_SYS_I2C_PPC4XX_SLAVE_0 0x7F#define CONFIG_SYS_I2C_EEPROM_ADDR 0x50/* EEPROM CAT28WC08 */ #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1/* Bytes of address */
include/configs/acadia.h +1 -1
@@ -206,7 +206,7 @@/*----------------------------------------------------------------------- * I2C *----------------------------------------------------------------------*/ -#define CONFIG_SYS_I2C_SPEED 400000/* I2C speed and slave address */ +#define CONFIG_SYS_I2C_PPC4XX_SPEED_0 400000#define CONFIG_SYS_I2C_MULTI_EEPROMS #define CONFIG_SYS_I2C_EEPROM_ADDR (0xa8>>1)
include/configs/alpr.h +6 -5
@@ -121,11 +121,12 @@/*----------------------------------------------------------------------- * I2C *----------------------------------------------------------------------*/ -#define CONFIG_HARD_I2C 1/* I2C with hardware support */ -#define CONFIG_PPC4XX_I2C /* use PPC4xx driver */ -#define CONFIG_SYS_I2C_SPEED 100000/* I2C speed and slave address */ -#define CONFIG_SYS_I2C_SLAVE 0x7F -#define CONFIG_SYS_I2C_NOPROBES {0x69}/* Don't probe these addrs */ +#define CONFIG_SYS_I2C +#define CONFIG_SYS_I2C_PPC4XX +#define CONFIG_SYS_I2C_PPC4XX_CH0 +#define CONFIG_SYS_I2C_PPC4XX_SPEED_0 100000 +#define CONFIG_SYS_I2C_PPC4XX_SLAVE_0 0x7F +#define CONFIG_SYS_I2C_NOPROBES { {0, 0x69} }/* Don't probe these addrs */ /*----------------------------------------------------------------------- * I2C EEPROM (PCF8594C)
include/configs/amcc-common.h +4 -3
@@ -42,9 +42,10 @@/* * I2C */ -#define CONFIG_HARD_I2C /* I2C with hardware support */ -#define CONFIG_PPC4XX_I2C /* use PPC4xx driver */ -#define CONFIG_SYS_I2C_SLAVE 0x7F +#define CONFIG_SYS_I2C +#define CONFIG_SYS_I2C_PPC4XX +#define CONFIG_SYS_I2C_PPC4XX_CH0 +#define CONFIG_SYS_I2C_PPC4XX_SLAVE_0 0x7F/* * Ethernet/EMAC/PHY
include/configs/bamboo.h +1 -1
@@ -222,7 +222,7 @@/*----------------------------------------------------------------------- * I2C *----------------------------------------------------------------------*/ -#define CONFIG_SYS_I2C_SPEED 400000/* I2C speed and slave address */ +#define CONFIG_SYS_I2C_PPC4XX_SPEED_0 400000#define CONFIG_SYS_I2C_MULTI_EEPROMS #define CONFIG_SYS_I2C_EEPROM_ADDR (0xa8>>1)
include/configs/bluestone.h +1 -1
@@ -122,7 +122,7 @@/* * I2C */ -#define CONFIG_SYS_I2C_SPEED 400000/* I2C speed */ +#define CONFIG_SYS_I2C_PPC4XX_SPEED_0 400000#define CONFIG_SYS_I2C_MULTI_EEPROMS #define CONFIG_SYS_I2C_EEPROM_ADDR 0x54#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1
include/configs/bubinga.h +2 -2
@@ -134,9 +134,9 @@* I2C stuff *----------------------------------------------------------------------- */ -#define CONFIG_SYS_I2C_SPEED 400000/* I2C speed and slave address */ +#define CONFIG_SYS_I2C_PPC4XX_SPEED_0 400000 -#define CONFIG_SYS_I2C_NOPROBES { 0x69 }/* avoid i2c probe hangup (why?) */ +#define CONFIG_SYS_I2C_NOPROBES { {0, 0x69} }/* avoid i2c probe hangup (?) */ #define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 6/* 24C02 requires 5ms delay */ #if defined(CONFIG_CMD_EEPROM )
include/configs/canyonlands.h +1 -1
@@ -329,7 +329,7 @@/*----------------------------------------------------------------------- * I2C *----------------------------------------------------------------------*/ -#define CONFIG_SYS_I2C_SPEED 400000/* I2C speed */ +#define CONFIG_SYS_I2C_PPC4XX_SPEED_0 400000#define CONFIG_SYS_I2C_MULTI_EEPROMS #define CONFIG_SYS_I2C_EEPROM_ADDR (0xa8>>1)
include/configs/csb272.h +5 -4
@@ -175,10 +175,11 @@* I2C configuration * */ -#define CONFIG_HARD_I2C 1/* I2C with hardware support */ -#define CONFIG_PPC4XX_I2C /* use PPC4xx driver */ -#define CONFIG_SYS_I2C_SPEED 100000/* I2C speed */ -#define CONFIG_SYS_I2C_SLAVE 0x7F/* I2C slave address */ +#define CONFIG_SYS_I2C +#define CONFIG_SYS_I2C_PPC4XX +#define CONFIG_SYS_I2C_PPC4XX_CH0 +#define CONFIG_SYS_I2C_PPC4XX_SPEED_0 100000 +#define CONFIG_SYS_I2C_PPC4XX_SLAVE_0 0x7F/* I2C slave address */ /* * MII PHY configuration
include/configs/csb472.h +5 -4
@@ -174,10 +174,11 @@* I2C configuration * */ -#define CONFIG_HARD_I2C 1/* I2C with hardware support */ -#define CONFIG_PPC4XX_I2C /* use PPC4xx driver */ -#define CONFIG_SYS_I2C_SPEED 100000/* I2C speed */ -#define CONFIG_SYS_I2C_SLAVE 0x7F/* I2C slave address */ +#define CONFIG_SYS_I2C +#define CONFIG_SYS_I2C_PPC4XX +#define CONFIG_SYS_I2C_PPC4XX_CH0 +#define CONFIG_SYS_I2C_PPC4XX_SPEED_0 100000 +#define CONFIG_SYS_I2C_PPC4XX_SLAVE_0 0x7F/* I2C slave address */ /* * MII PHY configuration
include/configs/dlvision-10g.h +1 -1
@@ -114,7 +114,7 @@/* * I2C stuff */ -#define CONFIG_SYS_I2C_SPEED 100000 +#define CONFIG_SYS_I2C_PPC4XX_SPEED_0 100000/* Temp sensor/hwmon/dtt */ #define CONFIG_DTT_LM63 1/* National LM63 */
include/configs/dlvision.h +1 -1
@@ -107,7 +107,7 @@/* * I2C stuff */ -#define CONFIG_SYS_I2C_SPEED 100000/* I2C speed and slave address*/ +#define CONFIG_SYS_I2C_PPC4XX_SPEED_0 100000/* * FLASH organization
include/configs/ebony.h +1 -1
@@ -138,7 +138,7 @@/*----------------------------------------------------------------------- * I2C *----------------------------------------------------------------------*/ -#define CONFIG_SYS_I2C_SPEED 400000/* I2C speed and slave address */ +#define CONFIG_SYS_I2C_PPC4XX_SPEED_0 400000#define CONFIG_SYS_I2C_MULTI_EEPROMS #define CONFIG_SYS_I2C_EEPROM_ADDR (0xa8>>1)
include/configs/gdppc440etx.h +1 -1
@@ -145,7 +145,7 @@/* * I2C */ -#define CONFIG_SYS_I2C_SPEED 400000/* I2C speed+slave address*/ +#define CONFIG_SYS_I2C_PPC4XX_SPEED_0 400000/* * Default environment variables
include/configs/icon.h +1 -2
@@ -120,9 +120,8 @@/* * I2C */ -#define CONFIG_SYS_I2C_SPEED 100000/* I2C speed and slave address */ +#define CONFIG_SYS_I2C_PPC4XX_SPEED_0 100000 -#define CONFIG_I2C_MULTI_BUS #define CONFIG_SYS_SPD_BUS_NUM 0/* The I2C bus for SPD */ #define CONFIG_SYS_I2C_MULTI_EEPROMS
include/configs/intip.h +1 -1
@@ -228,7 +228,7 @@/* * I2C */ -#define CONFIG_SYS_I2C_SPEED 400000/* I2C speed */ +#define CONFIG_SYS_I2C_PPC4XX_SPEED_0 400000#define CONFIG_SYS_I2C_MULTI_EEPROMS #define CONFIG_SYS_I2C_EEPROM_ADDR (0xa8>>1)
include/configs/io.h +1 -1
@@ -114,7 +114,7 @@/* * I2C stuff */ -#define CONFIG_SYS_I2C_SPEED 100000 +#define CONFIG_SYS_I2C_PPC4XX_SPEED_0 100000/* Temp sensor/hwmon/dtt */ #define CONFIG_DTT_LM63 1/* National LM63 */
include/configs/io64.h +1 -1
@@ -340,7 +340,7 @@/*----------------------------------------------------------------------- * I2C *----------------------------------------------------------------------*/ -#define CONFIG_SYS_I2C_SPEED 400000/* I2C speed and slave address */ +#define CONFIG_SYS_I2C_PPC4XX_SPEED_0 400000#define CONFIG_PCA9698 1/* NXP PCA9698 */
include/configs/iocon.h +4 -4
@@ -110,11 +110,11 @@/* * I2C stuff */ -#undef CONFIG_HARD_I2C#define CONFIG_SYS_I2C -#define CONFIG_SYS_I2C_SOFT /* I2C bit-banged */ -#define CONFIG_SYS_I2C_SOFT_SPEED 400000 -#define CONFIG_SYS_I2C_SOFT_SLAVE 0xFE +#define CONFIG_SYS_I2C_PPC4XX +#define CONFIG_SYS_I2C_PPC4XX_CH0 +#define CONFIG_SYS_I2C_PPC4XX_SPEED_0 400000 +#define CONFIG_SYS_I2C_PPC4XX_SLAVE_0 0x7F/* * Software (bit-bang) I2C driver configuration
include/configs/katmai.h +1 -2
@@ -119,9 +119,8 @@/*----------------------------------------------------------------------- * I2C *----------------------------------------------------------------------*/ -#define CONFIG_SYS_I2C_SPEED 100000/* I2C speed and slave address */ +#define CONFIG_SYS_I2C_PPC4XX_SPEED_0 100000 -#define CONFIG_I2C_MULTI_BUS #define CONFIG_SYS_SPD_BUS_NUM 0/* The I2C bus for SPD */ #define IIC0_BOOTPROM_ADDR 0x50
include/configs/kilauea.h +1 -1
@@ -385,7 +385,7 @@/*----------------------------------------------------------------------- * I2C *----------------------------------------------------------------------*/ -#define CONFIG_SYS_I2C_SPEED 400000/* I2C speed and slave address */ +#define CONFIG_SYS_I2C_PPC4XX_SPEED_0 400000#define CONFIG_SYS_I2C_EEPROM_ADDR 0x52/* I2C boot EEPROM (24C02BN) */ #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1/* Bytes of address */
include/configs/korat.h +5 -4
@@ -155,10 +155,11 @@/* * I2C */ -#define CONFIG_HARD_I2C 1/* I2C with hardware support */ -#define CONFIG_PPC4XX_I2C /* use PPC4xx driver */ -#define CONFIG_SYS_I2C_SPEED 400000/* I2C speed and slave address */ -#define CONFIG_SYS_I2C_SLAVE 0x7F +#define CONFIG_SYS_I2C +#define CONFIG_SYS_I2C_PPC4XX +#define CONFIG_SYS_I2C_PPC4XX_CH0 +#define CONFIG_SYS_I2C_PPC4XX_SPEED_0 400000 +#define CONFIG_SYS_I2C_PPC4XX_SLAVE_0 0x7F#define CONFIG_SYS_I2C_MULTI_EEPROMS #define CONFIG_SYS_I2C_EEPROM_ADDR (0xa8>>1)
include/configs/luan.h +1 -1
@@ -134,7 +134,7 @@/*----------------------------------------------------------------------- * I2C *----------------------------------------------------------------------*/ -#define CONFIG_SYS_I2C_SPEED 400000/* I2C speed and slave address */ +#define CONFIG_SYS_I2C_PPC4XX_SPEED_0 400000#define CONFIG_SYS_I2C_MULTI_EEPROMS #define CONFIG_SYS_I2C_EEPROM_ADDR (0xa8>>1)
include/configs/lwmon5.h +5 -4
@@ -280,10 +280,11 @@/* * I2C */ -#define CONFIG_HARD_I2C /* I2C with hardware support */ -#define CONFIG_PPC4XX_I2C /* use PPC4xx driver */ -#define CONFIG_SYS_I2C_SPEED 100000/* I2C speed and slave address */ -#define CONFIG_SYS_I2C_SLAVE 0x7F +#define CONFIG_SYS_I2C +#define CONFIG_SYS_I2C_PPC4XX +#define CONFIG_SYS_I2C_PPC4XX_CH0 +#define CONFIG_SYS_I2C_PPC4XX_SPEED_0 100000 +#define CONFIG_SYS_I2C_PPC4XX_SLAVE_0 0x7F#define CONFIG_SYS_I2C_RTC_ADDR 0x51/* RTC */ #define CONFIG_SYS_I2C_EEPROM_CPU_ADDR 0x52/* EEPROM (CPU Modul) */
include/configs/makalu.h +1 -1
@@ -201,7 +201,7 @@/*----------------------------------------------------------------------- * I2C *----------------------------------------------------------------------*/ -#define CONFIG_SYS_I2C_SPEED 400000/* I2C speed and slave address */ +#define CONFIG_SYS_I2C_PPC4XX_SPEED_0 400000#define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 6/* 24C02 requires 5ms delay */ #define CONFIG_SYS_I2C_EEPROM_ADDR 0x52/* I2C boot EEPROM (24C02BN) */
include/configs/neo.h +1 -1
@@ -117,7 +117,7 @@/* * I2C stuff */ -#define CONFIG_SYS_I2C_SPEED 100000/* I2C speed and slave address */ +#define CONFIG_SYS_I2C_PPC4XX_SPEED_0 100000/* RTC */ #define CONFIG_RTC_DS1337
include/configs/ocotea.h +1 -1
@@ -151,7 +151,7 @@/*----------------------------------------------------------------------- * I2C *----------------------------------------------------------------------*/ -#define CONFIG_SYS_I2C_SPEED 400000/* I2C speed and slave address */ +#define CONFIG_SYS_I2C_PPC4XX_SPEED_0 400000#define CONFIG_SYS_I2C_MULTI_EEPROMS #define CONFIG_SYS_I2C_EEPROM_ADDR (0xa8>>1)
include/configs/p3p440.h +6 -5
@@ -97,11 +97,12 @@/*----------------------------------------------------------------------- * I2C *----------------------------------------------------------------------*/ -#define CONFIG_HARD_I2C 1/* I2C with hardware support */ -#define CONFIG_PPC4XX_I2C /* use PPC4xx driver */ -#define CONFIG_SYS_I2C_SPEED 100000/* I2C speed and slave address */ -#define CONFIG_SYS_I2C_SLAVE 0x7F -#define CONFIG_SYS_I2C_NOPROBES {0x69}/* Don't probe these addrs */ +#define CONFIG_SYS_I2C +#define CONFIG_SYS_I2C_PPC4XX +#define CONFIG_SYS_I2C_PPC4XX_CH0 +#define CONFIG_SYS_I2C_PPC4XX_SPEED_0 100000 +#define CONFIG_SYS_I2C_PPC4XX_SLAVE_0 0x7F +#define CONFIG_SYS_I2C_NOPROBES { {0, 0x69} }/* Don't probe these addrs */ /*----------------------------------------------------------------------- * I2C RTC
include/configs/pcs440ep.h +5 -4
@@ -139,10 +139,11 @@/*----------------------------------------------------------------------- * I2C *----------------------------------------------------------------------*/ -#define CONFIG_HARD_I2C 1/* I2C with hardware support */ -#define CONFIG_PPC4XX_I2C /* use PPC4xx driver */ -#define CONFIG_SYS_I2C_SPEED 100000/* I2C speed and slave address */ -#define CONFIG_SYS_I2C_SLAVE 0x7F +#define CONFIG_SYS_I2C +#define CONFIG_SYS_I2C_PPC4XX +#define CONFIG_SYS_I2C_PPC4XX_CH0 +#define CONFIG_SYS_I2C_PPC4XX_SPEED_0 100000 +#define CONFIG_SYS_I2C_PPC4XX_SLAVE_0 0x7F#define CONFIG_SYS_I2C_EEPROM_ADDR (0xa4>>1)#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1
include/configs/quad100hd.h +5 -4
@@ -152,10 +152,11 @@/*----------------------------------------------------------------------- * I2C *----------------------------------------------------------------------*/ -#define CONFIG_HARD_I2C 1/* I2C with hardware support */ -#define CONFIG_PPC4XX_I2C /* use PPC4xx driver */ -#define CONFIG_SYS_I2C_SPEED 400000/* I2C speed and slave address */ -#define CONFIG_SYS_I2C_SLAVE 0x7F +#define CONFIG_SYS_I2C +#define CONFIG_SYS_I2C_PPC4XX +#define CONFIG_SYS_I2C_PPC4XX_CH0 +#define CONFIG_SYS_I2C_PPC4XX_SPEED_0 400000 +#define CONFIG_SYS_I2C_PPC4XX_SLAVE_0 0x7F#define CONFIG_SYS_I2C_EEPROM_ADDR 0x50/* base address */ #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2/* bytes of address */
include/configs/redwood.h +2 -2
@@ -110,13 +110,13 @@/*----------------------------------------------------------------------- * I2C *----------------------------------------------------------------------*/ -#define CONFIG_SYS_I2C_SPEED 400000/* I2C speed */ +#define CONFIG_SYS_I2C_PPC4XX_SPEED_0 400000#define IIC0_BOOTPROM_ADDR 0x50#define IIC0_ALT_BOOTPROM_ADDR 0x54/* Don't probe these addrs */ -#define CONFIG_SYS_I2C_NOPROBES {0x50, 0x52, 0x53, 0x54} +#define CONFIG_SYS_I2C_NOPROBES { {0, 0x50}, {0, 0x52}, {0, 0x53}, {0, 0x54} }#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2/* Bytes of address */
include/configs/sbc405.h +5 -4
@@ -168,10 +168,11 @@#define CONFIG_SYS_RX_ETH_BUFFER 16/* use 16 rx buffer on 405 emac */ -#define CONFIG_HARD_I2C 1/* I2C with hardware support */ -#define CONFIG_PPC4XX_I2C /* use PPC4xx driver */ -#define CONFIG_SYS_I2C_SPEED 400000/* I2C speed and slave address */ -#define CONFIG_SYS_I2C_SLAVE 0x7F +#define CONFIG_SYS_I2C +#define CONFIG_SYS_I2C_PPC4XX +#define CONFIG_SYS_I2C_PPC4XX_CH0 +#define CONFIG_SYS_I2C_PPC4XX_SPEED_0 400000 +#define CONFIG_SYS_I2C_PPC4XX_SLAVE_0 0x7F/*----------------------------------------------------------------------- * PCI stuff
include/configs/sc3.h +5 -4
@@ -246,15 +246,16 @@* IIC stuff *----------------------------------------------------------------------- */ -#define CONFIG_HARD_I2C /* I2C with hardware support */ -#define CONFIG_PPC4XX_I2C /* use PPC4xx driver */ +#define CONFIG_SYS_I2C +#define CONFIG_SYS_I2C_PPC4XX +#define CONFIG_SYS_I2C_PPC4XX_CH0 #define I2C_INIT #define I2C_ACTIVE 0#define I2C_TRISTATE 0 -#define CONFIG_SYS_I2C_SPEED 100000/* use the standard 100kHz speed */ -#define CONFIG_SYS_I2C_SLAVE 0x7F/* mask valid bits */ +#define CONFIG_SYS_I2C_PPC4XX_SPEED_0 100000 +#define CONFIG_SYS_I2C_PPC4XX_SLAVE_0 0x7F/* mask valid bits */ #define CONFIG_RTC_DS1337 #define CONFIG_SYS_I2C_RTC_ADDR 0x68
include/configs/sequoia.h +1 -1
@@ -232,7 +232,7 @@/* * I2C */ -#define CONFIG_SYS_I2C_SPEED 400000/* I2C speed and slave address */ +#define CONFIG_SYS_I2C_PPC4XX_SPEED_0 400000#define CONFIG_SYS_I2C_MULTI_EEPROMS #define CONFIG_SYS_I2C_EEPROM_ADDR (0xa8>>1)
include/configs/t3corp.h +1 -1
@@ -319,7 +319,7 @@/* * I2C */ -#define CONFIG_SYS_I2C_SPEED 400000/* I2C speed */ +#define CONFIG_SYS_I2C_PPC4XX_SPEED_0 400000#define CONFIG_SYS_I2C_MULTI_EEPROMS #define CONFIG_SYS_I2C_EEPROM_ADDR (0xa8>>1)
include/configs/taihu.h +2 -2
@@ -138,9 +138,9 @@* I2C stuff *----------------------------------------------------------------------- */ -#define CONFIG_SYS_I2C_SPEED 400000/* I2C speed and slave address */ +#define CONFIG_SYS_I2C_PPC4XX_SPEED_0 400000 -#define CONFIG_SYS_I2C_NOPROBES { 0x69 }/* avoid i2c probe hangup (why?) */ +#define CONFIG_SYS_I2C_NOPROBES { {0, 0x69} }/* avoid i2c probe hangup (?) */ #define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 6/* 24C02 requires 5ms delay */ #define CONFIG_SYS_I2C_EEPROM_ADDR 0x50/* I2C boot EEPROM (24C02W) */
include/configs/taishan.h +1 -1
@@ -133,7 +133,7 @@/*----------------------------------------------------------------------- * I2C *----------------------------------------------------------------------*/ -#define CONFIG_SYS_I2C_SPEED 400000/* I2C speed and slave address */ +#define CONFIG_SYS_I2C_PPC4XX_SPEED_0 400000#undef CONFIG_SYS_I2C_MULTI_EEPROMS#define CONFIG_SYS_I2C_EEPROM_ADDR 0x50
include/configs/walnut.h +1 -1
@@ -95,7 +95,7 @@* I2C stuff *----------------------------------------------------------------------- */ -#define CONFIG_SYS_I2C_SPEED 400000/* I2C speed and slave address */ +#define CONFIG_SYS_I2C_PPC4XX_SPEED_0 400000#define CONFIG_SYS_I2C_MULTI_EEPROMS #define CONFIG_SYS_I2C_EEPROM_ADDR (0xa8>>1)
include/configs/xpedite1000.h +5 -5
@@ -145,11 +145,11 @@ extern void out32(unsigned int, unsigned long);/* * I2C */ -#define CONFIG_HARD_I2C 1/* I2C with hardware support */ -#define CONFIG_PPC4XX_I2C /* use PPC4xx driver */ -#define CONFIG_SYS_I2C_SPEED 400000/* I2C speed and slave address */ -#define CONFIG_SYS_I2C_SLAVE 0x7f -#define CONFIG_I2C_MULTI_BUS +#define CONFIG_SYS_I2C +#define CONFIG_SYS_I2C_PPC4XX +#define CONFIG_SYS_I2C_PPC4XX_CH0 +#define CONFIG_SYS_I2C_PPC4XX_SPEED_0 400000 +#define CONFIG_SYS_I2C_PPC4XX_SLAVE_0 0x7f/* I2C EEPROM */ #define CONFIG_SYS_I2C_EEPROM_ADDR 0x50
include/configs/yosemite.h +1 -1
@@ -137,7 +137,7 @@/*----------------------------------------------------------------------- * I2C *----------------------------------------------------------------------*/ -#define CONFIG_SYS_I2C_SPEED 400000/* I2C speed and slave address */ +#define CONFIG_SYS_I2C_PPC4XX_SPEED_0 400000#define CONFIG_SYS_I2C_MULTI_EEPROMS #define CONFIG_SYS_I2C_EEPROM_ADDR (0xa8>>1)
include/configs/yucca.h +2 -2
@@ -120,13 +120,13 @@/*----------------------------------------------------------------------- * I2C *----------------------------------------------------------------------*/ -#define CONFIG_SYS_I2C_SPEED 400000/* I2C speed and slave address */ +#define CONFIG_SYS_I2C_PPC4XX_SPEED_0 400000#define IIC0_BOOTPROM_ADDR 0x50#define IIC0_ALT_BOOTPROM_ADDR 0x54/* Don't probe these addrs */ -#define CONFIG_SYS_I2C_NOPROBES {0x50, 0x52, 0x53, 0x54} +#define CONFIG_SYS_I2C_NOPROBES { {0, 0x50}, {0, 0x52}, {0, 0x53}, {0, 0x54} }/* #if defined(CONFIG_CMD_EEPROM) */ /* #define CONFIG_SYS_I2C_EEPROM_ADDR 0x50 */ /* I2C boot EEPROM */
include/configs/zeus.h +5 -4
@@ -168,10 +168,11 @@/*----------------------------------------------------------------------- * I2C *----------------------------------------------------------------------*/ -#define CONFIG_HARD_I2C 1/* I2C with hardware support */ -#define CONFIG_PPC4XX_I2C /* use PPC4xx driver */ -#define CONFIG_SYS_I2C_SPEED 400000/* I2C speed and slave address */ -#define CONFIG_SYS_I2C_SLAVE 0x7F +#define CONFIG_SYS_I2C +#define CONFIG_SYS_I2C_PPC4XX +#define CONFIG_SYS_I2C_PPC4XX_CH0 +#define CONFIG_SYS_I2C_PPC4XX_SPEED_0 400000 +#define CONFIG_SYS_I2C_PPC4XX_SLAVE_0 0x7F/* these are for the ST M24C02 2kbit serial i2c eeprom */ #define CONFIG_SYS_I2C_EEPROM_ADDR 0x50/* base address */
Signature · 1 line
1.7.2.5
PATCH 1/16 i2c, ppc4xx_i2c: switch to new multibus/multiadapter support
Hello Dirk,
Quoted 10 lines · Dirk Eibach
Signed-off-by Dirk Eibach <[email protected]>Cc Heiko Schocher <[email protected]>Cc Stefan Roese <[email protected]>---
This patch is based on http://git.denx.de/?p=u-boot/u-boot-i2c.git;a=shortlog;h=refs/heads/20130416_multibus_v2.
Heiko said:
"... and if the merge window opens
I post this patch with the other patches for this new
i2c framework on the ML."
So, Heiko, the merge window is wide open, your turn now :)
;-) I try to do this this week ...
Thanks for your work, patch seems good to me, just one nitpicking:
[hs at pollux u-boot]$ ./tools/checkpatch.pl mbox
WARNING: Avoid CamelCase: <get_OPB_freq>
#1264: FILE: drivers/i2c/ppc4xx_i2c.c:128:
+ divisor = (get_OPB_freq() - 1) / 10000000;
total: 0 errors, 1 warnings, 0 checks, 1662 lines checked
NOTE: Ignored message types: COMPLEX_MACRO CONSIDER_KSTRTO MINMAX MULTISTATEMENT_MACRO_USE_DO_WHILE USLEEP_RANGE
mbox has style problems, please review.
If any of these errors are false positives, please report them to the maintainer, see CHECKPATCH in MAINTAINERS. [hs at pollux u-boot]$
This should be fixed too, but this is not only i2c specific ... so I accept your patch and add it to my multibus branch, make some further tests, and then post it again in the patchserie, ok?
bye,
Heiko
Signature · 2 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany