diff options
author | Stefan Roese <sr@denx.de> | 2007-12-11 11:34:54 +0100 |
---|---|---|
committer | Stefan Roese <sr@denx.de> | 2007-12-11 11:34:54 +0100 |
commit | 9caeaadf508cd0e11ac5dfc56ab0f72e3b89a105 (patch) | |
tree | 1afcc9c20c04e19870ab5e2996104877695c54a3 /include/configs/rsdproto.h | |
parent | 7cfc12a7dcfdb350e2ab76db4dafcc30f7e77c2b (diff) | |
parent | 41be969f4957115ed7b1fe8b890bfaee99d7a7a2 (diff) | |
download | u-boot-imx-9caeaadf508cd0e11ac5dfc56ab0f72e3b89a105.zip u-boot-imx-9caeaadf508cd0e11ac5dfc56ab0f72e3b89a105.tar.gz u-boot-imx-9caeaadf508cd0e11ac5dfc56ab0f72e3b89a105.tar.bz2 |
Merge commit 'u-boot/master' into for-1.3.1
Conflicts:
drivers/rtc/Makefile
Diffstat (limited to 'include/configs/rsdproto.h')
-rw-r--r-- | include/configs/rsdproto.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/configs/rsdproto.h b/include/configs/rsdproto.h index 814082c..40a05fa 100644 --- a/include/configs/rsdproto.h +++ b/include/configs/rsdproto.h @@ -92,8 +92,8 @@ /* enable I2C */ #define CONFIG_HARD_I2C 1 /* I2C with hardware support */ -#define CFG_I2C_SPEED 400000 /* I2C speed and slave address */ -#define CFG_I2C_SLAVE 0x7F +#define CFG_I2C_SPEED 50000 /* I2C speed and slave address */ +#define CFG_I2C_SLAVE 0x30 /* system clock rate (CLKIN) - equal to the 60x and local bus speed */ |