Merge branch 'spi' of git://git.denx.de/u-boot-x86

diff --combined include/configs/exynos5250-dt.h
index 0155322a3107e80829c759f6e55fb2f59d263c66,74ba2b64c4c99ee6d5f8e2fb63daf02a45090c92..1e9c1e3118533c8a76772ab911fd7245350173fd
--- 1/include/configs/exynos5250-dt.h
--- 2/include/configs/exynos5250-dt.h
+++ b/include/configs/exynos5250-dt.h
@@@ -249,13 -249,13 +249,13 @@@
  
  /* I2C */
  #define CONFIG_SYS_I2C_INIT_BOARD
 -#define CONFIG_HARD_I2C
 +#define CONFIG_SYS_I2C
  #define CONFIG_CMD_I2C
 -#define CONFIG_SYS_I2C_SPEED  100000          /* 100 Kbps */
 -#define CONFIG_DRIVER_S3C24X0_I2C
 +#define CONFIG_SYS_I2C_S3C24X0_SPEED  100000          /* 100 Kbps */
 +#define CONFIG_SYS_I2C_S3C24X0
  #define CONFIG_I2C_MULTI_BUS
  #define CONFIG_MAX_I2C_NUM    8
 -#define CONFIG_SYS_I2C_SLAVE    0x0
 +#define CONFIG_SYS_I2C_S3C24X0_SLAVE    0x0
  #define CONFIG_I2C_EDID
  
  /* PMIC */
@@@ -276,6 -276,7 +276,7 @@@
  #define CONFIG_SF_DEFAULT_MODE                SPI_MODE_0
  #define CONFIG_SF_DEFAULT_SPEED               50000000
  #define EXYNOS5_SPI_NUM_CONTROLLERS   5
+ #define CONFIG_OF_SPI
  #endif
  
  #ifdef CONFIG_ENV_IS_IN_SPI_FLASH