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

Merge branch 'master' of git://git.denx.de/u-boot-i2c

Browse Source
This commit is contained in:
Tom Rini
2013-08-06 09:49:06 -04:00
parent f53932addd 90f002a90f
commit d05bfd0586
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/i2c/soft_i2c.c
View File

@@ -105,11 +105,11 @@ DECLARE_GLOBAL_DATA_PTR;
# endif # endif
#endif #endif
#if !defined(CONFIG_SYS_SOFT_I2C_SPEED) #if !defined(CONFIG_SYS_I2C_SOFT_SPEED)
#define CONFIG_SYS_SOFT_I2C_SPEED CONFIG_SYS_I2C_SPEED #define CONFIG_SYS_I2C_SOFT_SPEED CONFIG_SYS_I2C_SPEED
#endif #endif
#if !defined(CONFIG_SYS_SOFT_I2C_SLAVE) #if !defined(CONFIG_SYS_I2C_SOFT_SLAVE)
#define CONFIG_SYS_SOFT_I2C_SLAVE CONFIG_SYS_I2C_SLAVE #define CONFIG_SYS_I2C_SOFT_SLAVE CONFIG_SYS_I2C_SLAVE
#endif #endif
/*----------------------------------------------------------------------- /*-----------------------------------------------------------------------

4
include/configs/blackstamp.h
View File

@@ -206,8 +206,8 @@
#ifdef CONFIG_SYS_I2C_SOFT #ifdef CONFIG_SYS_I2C_SOFT
#define CONFIG_SOFT_I2C_GPIO_SCL GPIO_PF9 #define CONFIG_SOFT_I2C_GPIO_SCL GPIO_PF9
#define CONFIG_SOFT_I2C_GPIO_SDA GPIO_PF8 #define CONFIG_SOFT_I2C_GPIO_SDA GPIO_PF8
#define CONFIG_SYS_SOFT_I2C_SPEED 50000 #define CONFIG_SYS_I2C_SOFT_SPEED 50000
#define CONFIG_SYS_SOFT_I2C_SLAVE 0xFE #define CONFIG_SYS_I2C_SOFT_SLAVE 0xFE
#endif #endif
/* /*