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

2015-08-06 19:56:03 -04:00
parent f05fa6781a fac971b2b5
commit ae27120c31
124 changed files with 5743 additions and 2291 deletions
--- a/arch/arm/include/asm/arch-exynos/dp_info.h
+++ b/arch/arm/include/asm/arch-exynos/dp_info.h
@@ -197,6 +197,4 @@ unsigned int exynos_init_dp(void)
 }
 #endif

-void exynos_set_dp_platform_data(struct exynos_dp_platform_data *pd);
-
 #endif /* _DP_INFO_H */
--- a/arch/arm/include/asm/arch-exynos/periph.h
+++ b/arch/arm/include/asm/arch-exynos/periph.h
@@ -53,6 +53,7 @@ enum periph_id {
 	PERIPH_ID_PWM2,
 	PERIPH_ID_PWM3,
 	PERIPH_ID_PWM4,
+	PERIPH_ID_DPHPD,
 	PERIPH_ID_I2C10 = 203,

 	PERIPH_ID_NONE = -1,