Merge tag 'v3.20-rockchip-dts2' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-drm-fsl-dcu.git] / arch / arm / boot / dts / r8a7791-henninger.dts

diff --git a/arch/arm/boot/dts/r8a7791-henninger.dts b/arch/arm/boot/dts/r8a7791-henninger.dts
index 740e38678032a7accf62dbaec94a4bd9a4c33dc7..d2ebf11f98814ab59c7d0a6d8987bd7c21e360a0 100644 (file)
--- a/arch/arm/boot/dts/r8a7791-henninger.dts
+++ b/arch/arm/boot/dts/r8a7791-henninger.dts
@@ -156,7 +156,7 @@
 
        phy-handle = <&phy1>;
        renesas,ether-link-active-low;
-       status = "ok";
+       status = "okay";
 
        phy1: ethernet-phy@1 {
                reg = <1>;
@@ -293,7 +293,7 @@
 
 /* composite video input */
 &vin0 {
-       status = "ok";
+       status = "okay";
        pinctrl-0 = <&vin0_pins>;
        pinctrl-names = "default";