Merge tag 'mvebu-dt-4.9-1' of git://git.infradead.org/linux-mvebu into next/dt

[cascardo/linux.git] / arch / arm / boot / dts / exynos5422-odroidxu3-common.dtsi

diff --git a/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi b/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi
index d562530..7bb8a37 100644 (file)
--- a/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi
+++ b/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi
@@ -26,7 +26,7 @@
        };
 
        chosen {
-               linux,stdout-path = &serial_2;
+               stdout-path = "serial2:115200n8";
        };
 
        firmware@02073000 {
@@ -250,7 +250,7 @@
 
 &hdmi {
        status = "okay";
-       hpd-gpio = <&gpx3 7 GPIO_ACTIVE_HIGH>;
+       hpd-gpios = <&gpx3 7 GPIO_ACTIVE_HIGH>;
        pinctrl-names = "default";
        pinctrl-0 = <&hdmi_hpd_irq>;