From: Albert ARIBAUD <albert.u.boot@aribaud.net>
Date: Thu, 4 Apr 2013 13:44:57 +0000 (+0200)
Subject: Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'
X-Git-Tag: v2013.04-rc3~1^2~76
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=fed029f3c31b7d5df674b5090a13356b631918c7;p=u-boot

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

fed029f3c31b7d5df674b5090a13356b631918c7
diff --cc include/fdtdec.h
index e7e3ff9e03,a83b1608b6..844991ec4e
--- a/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 e17dd001ca,0f34bdcf58..403babd312
--- a/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"),
  };