Skip to content
Snippets Groups Projects
Commit d05bfd05 authored by Tom Rini's avatar Tom Rini
Browse files

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

parents f53932ad 90f002a9
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
drivers/i2c/soft_i2c.c
+ 4
− 4
View file @ d05bfd05
...@@ -105,11 +105,11 @@ DECLARE_GLOBAL_DATA_PTR; ...@@ -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
/*----------------------------------------------------------------------- /*-----------------------------------------------------------------------
......
include/configs/blackstamp.h
+ 2
− 2
View file @ d05bfd05
...@@ -206,8 +206,8 @@ ...@@ -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
/* /*
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment