Merge branch 'x86/urgent' into x86/cpu, to pick up dependency

[karo-tx-linux.git] / arch / arm / boot / dts / exynos5800-peach-pi.dts

diff --git a/arch/arm/boot/dts/exynos5800-peach-pi.dts b/arch/arm/boot/dts/exynos5800-peach-pi.dts
index 6e9edc1610c4990777a516fbde1d8ef9a0a4cdab..62ceb89e073f291ff93a133209066b7accb417b9 100644 (file)
--- a/arch/arm/boot/dts/exynos5800-peach-pi.dts
+++ b/arch/arm/boot/dts/exynos5800-peach-pi.dts
@@ -157,8 +157,6 @@
        pinctrl-names = "default";
        pinctrl-0 = <&dp_hpd_gpio>;
        samsung,color-space = <0>;
-       samsung,dynamic-range = <0>;
-       samsung,ycbcr-coeff = <0>;
        samsung,color-depth = <1>;
        samsung,link-rate = <0x0a>;
        samsung,lane-count = <2>;
@@ -671,6 +669,11 @@
        status = "okay";
 };
 
+&mfc {
+       samsung,mfc-r = <0x43000000 0x800000>;
+       samsung,mfc-l = <0x51000000 0x800000>;
+};
+
 &mmc_0 {
        status = "okay";
        num-slots = <1>;