Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'

diff --cc drivers/spi/exynos_spi.c
Simple merge

diff --cc include/fdtdec.h
index e7e3ff9e0384f10157a671ff36ee153654ae34bf,a83b1608b6f2be99bda67aff0f318713e5397d0d..844991ec4e6a2d479eff40936495a97695511664
--- 1/include/fdtdec.h
--- 2/include/fdtdec.h
+++ b/include/fdtdec.h
@@@ -87,8 -85,9 +87,10 @@@ enum fdt_compat_id 
        COMPAT_SAMSUNG_EXYNOS_EHCI,     /* Exynos EHCI controller */
        COMPAT_SAMSUNG_EXYNOS_USB_PHY,  /* Exynos phy controller for usb2.0 */
        COMPAT_SAMSUNG_EXYNOS_TMU,      /* Exynos TMU */
+       COMPAT_SAMSUNG_EXYNOS_FIMD,     /* Exynos Display controller */
+       COMPAT_SAMSUNG_EXYNOS5_DP,      /* Exynos Display port controller */
        COMPAT_MAXIM_MAX77686_PMIC,     /* MAX77686 PMIC */
 +      COMPAT_GENERIC_SPI_FLASH,       /* Generic SPI Flash chip */
        COMPAT_MAXIM_98095_CODEC,       /* MAX98095 Codec */
  
        COMPAT_COUNT,

diff --cc lib/fdtdec.c
index e17dd001ca2a0c6b578c88ce76c90251e89ea0d3,0f34bdcf580a606f6ad2cf3ca9c176d21b3545ab..403babd3124cb8f8b8539a6254d9ff6dd0df1672
--- 1/lib/fdtdec.c
--- 2/lib/fdtdec.c
+++ b/lib/fdtdec.c
@@@ -60,8 -60,9 +60,10 @@@ static const char * const compat_names[
        COMPAT(SAMSUNG_EXYNOS_EHCI, "samsung,exynos-ehci"),
        COMPAT(SAMSUNG_EXYNOS_USB_PHY, "samsung,exynos-usb-phy"),
        COMPAT(SAMSUNG_EXYNOS_TMU, "samsung,exynos-tmu"),
+       COMPAT(SAMSUNG_EXYNOS_FIMD, "samsung,exynos-fimd"),
+       COMPAT(SAMSUNG_EXYNOS5_DP, "samsung,exynos5-dp"),
        COMPAT(MAXIM_MAX77686_PMIC, "maxim,max77686_pmic"),
 +      COMPAT(GENERIC_SPI_FLASH, "spi-flash"),
        COMPAT(MAXIM_98095_CODEC, "maxim,max98095-codec"),
  };