Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7dd84f06 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'omap-for-v4.9/dt-pt3-signed' of... 

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
parents 2008ee09 ce385a5e

arch/arm/boot/dts/am335x-evm.dts

+2 −0
Original line number Diff line number Diff line
@@ -497,6 +497,8 @@ 


&lcdc {

	status = "okay";



	blue-and-red-wiring = "crossed";

};



&elm {

arch/arm/boot/dts/am335x-evmsk.dts

+22 −20
Original line number Diff line number Diff line
@@ -712,4 +712,6 @@ 


&lcdc {

	status = "okay";



	blue-and-red-wiring = "crossed";

};

arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -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>;

arch/arm/boot/dts/omap5-igep0050.dts

+2 −2
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
		power-button {

			label = "Power Button";

			linux,code = <KEY_POWER>;

			gpios = <&gpio4 22 GPIO_ACTIVE_HIGH>;

			gpios = <&gpio4 22 GPIO_ACTIVE_LOW>;

		};

	};