Merge tag 'omap-for-v4.9/dt-pt3-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt

Pull "few minor fixes for omap dts files for v4.9 merge window"

Few fixes for omap dts files for v4.9 merge window. Let's also add
the tilcdc quirks:

- Fix typo with recent beagleboard-x15 changes for mmc2_pins_default

- Add am335x blue-and-red-wiring quirk as specified in the binding in
  Documentation/devicetree/bindings/display/tilcdc/tilcdc.txt. Also
  fix up the whitespace formatting for am335x-evmsk.

- Fix for recent igepv5 power button for GPIO_ACTIVE_LOW. Also fix
  up the whitespace formatting for the button

* tag 'omap-for-v4.9/dt-pt3-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: dts: omap5-igep0050.dts: Use tabs for indentation
  ARM: dts: Fix igepv5 power button GPIO direction
  ARM: dts: am335x-evmsk: Add blue-and-red-wiring -property to lcdc node
  ARM: dts: am335x-evmsk: Whitespace cleanup of lcdc related nodes
  ARM: dts: am335x-evm: Add blue-and-red-wiring -property to lcdc node
  ARM: dts: am57xx-beagle-x15-common: Fix wrong pinctrl selection for mmc2

4 files changed, 27 insertions, 23 deletions

diff --git a/arch/arm/boot/dts/am335x-evm.dts b/arch/arm/boot/dts/am335x-evm.dts
index 3cf896a2a204..e82432c79f85 100644
--- a/arch/arm/boot/dts/am335x-evm.dts
+++ b/arch/arm/boot/dts/am335x-evm.dts
@@ -497,6 +497,8 @@
 
 &lcdc {
         status = "okay";
+
+        blue-and-red-wiring = "crossed";
 };
 
 &elm {
diff --git a/arch/arm/boot/dts/am335x-evmsk.dts b/arch/arm/boot/dts/am335x-evmsk.dts
index 0e5e8dcdcc24..975c36e332a2 100644
--- a/arch/arm/boot/dts/am335x-evmsk.dts
+++ b/arch/arm/boot/dts/am335x-evmsk.dts
@@ -170,29 +170,29 @@
                 pinctrl-1 = <&lcd_pins_sleep>;
                 status = "okay";
                 panel-info {
-                        ac-bias           = <255>;
-                        ac-bias-intrpt    = <0>;
-                        dma-burst-sz      = <16>;
-                        bpp               = <32>;
-                        fdd               = <0x80>;
-                        sync-edge         = <0>;
-                        sync-ctrl         = <1>;
-                        raster-order      = <0>;
-                        fifo-th           = <0>;
+                        ac-bias         = <255>;
+                        ac-bias-intrpt  = <0>;
+                        dma-burst-sz    = <16>;
+                        bpp             = <32>;
+                        fdd             = <0x80>;
+                        sync-edge       = <0>;
+                        sync-ctrl       = <1>;
+                        raster-order    = <0>;
+                        fifo-th         = <0>;
                 };
                 display-timings {
                         480x272 {
-                                hactive         = <480>;
-                                vactive         = <272>;
-                                hback-porch     = <43>;
-                                hfront-porch    = <8>;
-                                hsync-len       = <4>;
-                                vback-porch     = <12>;
-                                vfront-porch    = <4>;
-                                vsync-len       = <10>;
+                                hactive         = <480>;
+                                vactive         = <272>;
+                                hback-porch     = <43>;
+                                hfront-porch    = <8>;
+                                hsync-len       = <4>;
+                                vback-porch     = <12>;
+                                vfront-porch    = <4>;
+                                vsync-len       = <10>;
                                 clock-frequency = <9000000>;
-                                hsync-active    = <0>;
-                                vsync-active    = <0>;
+                                hsync-active    = <0>;
+                                vsync-active    = <0>;
                         };
                 };
         };
@@ -711,5 +711,7 @@
 };
 
 &lcdc {
-      status = "okay";
+        status = "okay";
+
+        blue-and-red-wiring = "crossed";
 };
diff --git a/arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi b/arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi
index ec85ff9004e8..6df7829a2c15 100644
--- a/arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi
+++ b/arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi
@@ -451,7 +451,7 @@
         status = "okay";
 
         pinctrl-names = "default";
-        pinctrl-0 = <&mmc1_pins_default>;
+        pinctrl-0 = <&mmc2_pins_default>;
 
         vmmc-supply = <&vdd_3v3>;
         bus-width = <8>;
diff --git a/arch/arm/boot/dts/omap5-igep0050.dts b/arch/arm/boot/dts/omap5-igep0050.dts
index 44e03b9be1f1..8fc19218057e 100644
--- a/arch/arm/boot/dts/omap5-igep0050.dts
+++ b/arch/arm/boot/dts/omap5-igep0050.dts
@@ -20,14 +20,14 @@
         };
 
         gpio_keys {
-                compatible = "gpio-keys";
+                compatible = "gpio-keys";
                 pinctrl-0 = <&power_button_pin>;
                 pinctrl-names = "default";
 
                 power-button {
                         label = "Power Button";
                         linux,code = <KEY_POWER>;
-                        gpios = <&gpio4 22 GPIO_ACTIVE_HIGH>;
+                        gpios = <&gpio4 22 GPIO_ACTIVE_LOW>;
                 };
         };