diff options
author | Wolfgang Denk <wd@pollux.denx.de> | 2006-10-24 17:08:31 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@pollux.denx.de> | 2006-10-24 17:08:31 +0200 |
commit | d97370feca2a589dad42154577bb4615a0347852 (patch) | |
tree | 5a3f85d24e07425977b7019017ae1615c0f12ce7 /include/configs/stxgp3.h | |
parent | 9fa48022e5883a0826a98979c0156f6ac5a0ef79 (diff) | |
parent | 47a6989c10685d2ab3efcf95228ce50d2a496d3e (diff) | |
download | u-boot-imx-d97370feca2a589dad42154577bb4615a0347852.zip u-boot-imx-d97370feca2a589dad42154577bb4615a0347852.tar.gz u-boot-imx-d97370feca2a589dad42154577bb4615a0347852.tar.bz2 |
Merge with /home/wd/git/u-boot/master
(Conflicts between Jon Loeliger's and Matthew McClintock's tree
were resolved by in favour of Jon's version.)
Diffstat (limited to 'include/configs/stxgp3.h')
-rw-r--r-- | include/configs/stxgp3.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/include/configs/stxgp3.h b/include/configs/stxgp3.h index e218597..625cf20 100644 --- a/include/configs/stxgp3.h +++ b/include/configs/stxgp3.h @@ -172,8 +172,11 @@ #define CFG_PROMPT_HUSH_PS2 "> " #endif -/* I2C */ -#define CONFIG_HARD_I2C /* I2C with hardware support*/ +/* + * I2C + */ +#define CONFIG_FSL_I2C /* Use FSL common I2C driver */ +#define CONFIG_HARD_I2C /* I2C with hardware support*/ #undef CONFIG_SOFT_I2C /* I2C bit-banged */ #define CFG_I2C_SPEED 400000 /* I2C speed and slave address */ #define CFG_I2C_SLAVE 0x7F @@ -183,6 +186,7 @@ /* I did the 'if 0' so we could keep the syntax above if ever needed. */ #undef CFG_I2C_NOPROBES #endif +#define CFG_I2C_OFFSET 0x3000 /* RapdIO Map configuration, mapped 1:1. */ |