Merge commit '81fd23e2b3ccf71c807e671444e8accaba98ca53' of https://git.pengutronix...

[linux-2.6-microblaze.git] / arch / arm / boot / dts / omap5-board-common.dtsi

diff --git a/arch/arm/boot/dts/omap5-board-common.dtsi b/arch/arm/boot/dts/omap5-board-common.dtsi
index edf1906..45435bb 100644 (file)
--- a/arch/arm/boot/dts/omap5-board-common.dtsi
+++ b/arch/arm/boot/dts/omap5-board-common.dtsi
@@ -149,7 +149,7 @@
 
 &gpio8 {
        /* TI trees use GPIO instead of msecure, see also muxing */
-       p234 {
+       msecure-hog {
                gpio-hog;
                gpios = <10 GPIO_ACTIVE_HIGH>;
                output-high;
@@ -743,11 +743,11 @@
 };
 
 &dss {
-       status = "ok";
+       status = "okay";
 };
 
 &hdmi {
-       status = "ok";
+       status = "okay";
 
        /* vdda-supply populated in board specific dts file */