Merge git://git.denx.de/u-boot-samsung

diff --combined configs/arndale_defconfig
index 2298def,821e1c7..a2cde44
--- 1/configs/arndale_defconfig
--- 2/configs/arndale_defconfig
+++ b/configs/arndale_defconfig
@@@ -22,7 -22,6 +22,7 @@@ CONFIG_CMD_TIME=
  CONFIG_CMD_SOUND=y
  CONFIG_CMD_EXT4_WRITE=y
  CONFIG_DM_I2C_COMPAT=y
 +CONFIG_MMC_DW=y
  CONFIG_MMC_SDHCI=y
  CONFIG_MMC_SDHCI_S5P=y
  CONFIG_SOUND=y
@@@ -32,4 -31,6 +32,6 @@@ CONFIG_SOUND_MAX98095=
  CONFIG_SOUND_WM8994=y
  CONFIG_USB=y
  CONFIG_DM_USB=y
+ CONFIG_USB_XHCI_HCD=y
+ CONFIG_USB_XHCI_DWC3=y
  CONFIG_USB_STORAGE=y

diff --combined configs/peach-pi_defconfig
index 42b9f25,fb933ef..440cbcc
--- 1/configs/peach-pi_defconfig
--- 2/configs/peach-pi_defconfig
+++ b/configs/peach-pi_defconfig
@@@ -32,7 -32,6 +32,7 @@@ CONFIG_I2C_ARB_GPIO_CHALLENGE=
  CONFIG_CROS_EC_KEYB=y
  CONFIG_CROS_EC=y
  CONFIG_CROS_EC_SPI=y
 +CONFIG_MMC_DW=y
  CONFIG_MMC_SDHCI=y
  CONFIG_MMC_SDHCI_S5P=y
  CONFIG_SPI_FLASH=y
@@@ -61,5 -60,6 +61,6 @@@ CONFIG_DISPLAY=
  CONFIG_VIDEO_BRIDGE=y
  CONFIG_VIDEO_BRIDGE_PARADE_PS862X=y
  CONFIG_LCD=y
+ CONFIG_VIDCONSOLE_AS_LCD=y
  CONFIG_TPM=y
  CONFIG_ERRNO_STR=y

diff --combined configs/peach-pit_defconfig
index 7b4ebfe,cbac99d..d12e1a9
--- 1/configs/peach-pit_defconfig
--- 2/configs/peach-pit_defconfig
+++ b/configs/peach-pit_defconfig
@@@ -32,7 -32,6 +32,7 @@@ CONFIG_I2C_ARB_GPIO_CHALLENGE=
  CONFIG_CROS_EC_KEYB=y
  CONFIG_CROS_EC=y
  CONFIG_CROS_EC_SPI=y
 +CONFIG_MMC_DW=y
  CONFIG_MMC_SDHCI=y
  CONFIG_MMC_SDHCI_S5P=y
  CONFIG_SPI_FLASH=y
@@@ -61,5 -60,6 +61,6 @@@ CONFIG_DISPLAY=
  CONFIG_VIDEO_BRIDGE=y
  CONFIG_VIDEO_BRIDGE_PARADE_PS862X=y
  CONFIG_LCD=y
+ CONFIG_VIDCONSOLE_AS_LCD=y
  CONFIG_TPM=y
  CONFIG_ERRNO_STR=y

diff --combined configs/s5pc210_universal_defconfig
index fad2b43,538e0ce..d9dfcba
--- 1/configs/s5pc210_universal_defconfig
--- 2/configs/s5pc210_universal_defconfig
+++ b/configs/s5pc210_universal_defconfig
@@@ -29,10 -29,12 +29,13 @@@ CONFIG_CMD_FAT=
  CONFIG_CMD_FS_GENERIC=y
  CONFIG_OF_CONTROL=y
  CONFIG_DFU_MMC=y
 +CONFIG_MMC_DW=y
  CONFIG_MMC_SDHCI=y
  CONFIG_MMC_SDHCI_SDMA=y
  CONFIG_MMC_SDHCI_S5P=y
+ CONFIG_DM_PMIC=y
+ CONFIG_DM_PMIC_MAX8998=y
+ CONFIG_SYS_I2C_S3C24X0=y
  CONFIG_USB=y
  CONFIG_DM_USB=y
  CONFIG_USB_GADGET=y

diff --combined configs/smdk5250_defconfig
index 4ef4143,95c379b..a34f915
--- 1/configs/smdk5250_defconfig
--- 2/configs/smdk5250_defconfig
+++ b/configs/smdk5250_defconfig
@@@ -26,7 -26,6 +26,7 @@@ CONFIG_CMD_PMIC=
  CONFIG_CMD_REGULATOR=y
  CONFIG_CMD_EXT4_WRITE=y
  CONFIG_DM_I2C_COMPAT=y
 +CONFIG_MMC_DW=y
  CONFIG_MMC_SDHCI=y
  CONFIG_MMC_SDHCI_S5P=y
  CONFIG_SPI_FLASH=y
@@@ -44,6 -43,8 +44,8 @@@ CONFIG_SOUND_WM8994=
  CONFIG_EXYNOS_SPI=y
  CONFIG_USB=y
  CONFIG_DM_USB=y
+ CONFIG_USB_XHCI_HCD=y
+ CONFIG_USB_XHCI_DWC3=y
  CONFIG_USB_STORAGE=y
  CONFIG_VIDEO_BRIDGE=y
  CONFIG_ERRNO_STR=y

diff --combined configs/snow_defconfig
index ef3cfa1,ebd1a52..2ef3774
--- 1/configs/snow_defconfig
--- 2/configs/snow_defconfig
+++ b/configs/snow_defconfig
@@@ -33,7 -33,6 +33,7 @@@ CONFIG_I2C_ARB_GPIO_CHALLENGE=
  CONFIG_CROS_EC_KEYB=y
  CONFIG_CROS_EC=y
  CONFIG_CROS_EC_I2C=y
 +CONFIG_MMC_DW=y
  CONFIG_MMC_SDHCI=y
  CONFIG_MMC_SDHCI_S5P=y
  CONFIG_SPI_FLASH=y
@@@ -62,6 -61,8 +62,8 @@@ CONFIG_EXYNOS_SPI=
  CONFIG_TPM_TIS_INFINEON=y
  CONFIG_USB=y
  CONFIG_DM_USB=y
+ CONFIG_USB_XHCI_HCD=y
+ CONFIG_USB_XHCI_DWC3=y
  CONFIG_USB_STORAGE=y
  CONFIG_DM_VIDEO=y
  CONFIG_DISPLAY=y
@@@ -69,5 -70,6 +71,6 @@@ CONFIG_VIDEO_BRIDGE=
  CONFIG_VIDEO_BRIDGE_PARADE_PS862X=y
  CONFIG_VIDEO_BRIDGE_NXP_PTN3460=y
  CONFIG_LCD=y
+ CONFIG_VIDCONSOLE_AS_LCD=y
  CONFIG_TPM=y
  CONFIG_ERRNO_STR=y

diff --combined configs/spring_defconfig
index 3bd8644,3d6c2e9..243a9ec
--- 1/configs/spring_defconfig
--- 2/configs/spring_defconfig
+++ b/configs/spring_defconfig
@@@ -33,7 -33,6 +33,7 @@@ CONFIG_I2C_ARB_GPIO_CHALLENGE=
  CONFIG_CROS_EC_KEYB=y
  CONFIG_CROS_EC=y
  CONFIG_CROS_EC_I2C=y
 +CONFIG_MMC_DW=y
  CONFIG_MMC_SDHCI=y
  CONFIG_MMC_SDHCI_S5P=y
  CONFIG_SPI_FLASH=y
@@@ -62,11 -61,14 +62,14 @@@ CONFIG_EXYNOS_SPI=
  CONFIG_TPM_TIS_INFINEON=y
  CONFIG_USB=y
  CONFIG_DM_USB=y
+ CONFIG_USB_XHCI_HCD=y
+ CONFIG_USB_XHCI_DWC3=y
  CONFIG_USB_STORAGE=y
  CONFIG_DM_VIDEO=y
  CONFIG_DISPLAY=y
  CONFIG_VIDEO_BRIDGE=y
  CONFIG_VIDEO_BRIDGE_PARADE_PS862X=y
  CONFIG_LCD=y
+ CONFIG_VIDCONSOLE_AS_LCD=y
  CONFIG_TPM=y
  CONFIG_ERRNO_STR=y