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

Commit 17afa716 authored by Linus Walleij's avatar Linus Walleij
Browse files

ARM: ux500: move final HREFv60 LCD pins to device tree 



Put two extra configs into the device tree to handle the default
configuration of the display reset signals on the HREFv60plus,
move this over from the board file to the device tree.

Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 1c850e4a

arch/arm/boot/dts/ste-hrefv60plus.dtsi

+17 −0
Original line number Diff line number Diff line
@@ -102,6 +102,23 @@ 
					};

				 };

			};

			mcde {

				lcd_hrefv60_mode: lcd_hrefv60 {

					/*

					 * Display Interface 1 uses GPIO 65 for RST (reset).

					 * Display Interface 2 uses GPIO 66 for RST (reset).

					 * Drive DISP1 reset high (not reset), driver DISP2 reset low (reset)

					 */

					hrefv60_cfg1 {

						ste,pins ="GPIO65_F1";

						ste,config = <&gpio_out_hi>;

					};

					hrefv60_cfg2 {

						ste,pins ="GPIO66_G3";

						ste,config = <&gpio_out_lo>;

					};

				};

			};

		};

	};

};

arch/arm/mach-ux500/board-mop500-pins.c

+0 −7
Original line number Diff line number Diff line
@@ -308,13 +308,6 @@ static struct pinctrl_map __initdata hrefv60_pinmap[] = { 
	/* Magnetometer uses GPIO 31 and 32, pull these up/down respectively */

	DB8500_PIN_HOG("GPIO31_V3", gpio_in_pu), /* EN1 */

	DB8500_PIN_HOG("GPIO32_V2", gpio_in_pd), /* DRDY */

	/*

	 * Display Interface 1 uses GPIO 65 for RST (reset).

	 * Display Interface 2 uses GPIO 66 for RST (reset).

	 * Drive DISP1 reset high (not reset), driver DISP2 reset low (reset)

	 */

	DB8500_PIN_HOG("GPIO65_F1", gpio_out_hi), /* DISP1 NO RST */

	DB8500_PIN_HOG("GPIO66_G3", gpio_out_lo), /* DISP2 RST */

	/*

	 * Touch screen uses GPIO 143 for RST1, GPIO 146 for RST2 and

	 * GPIO 67 for interrupts. Pull-up the IRQ line and drive both