From f26fb1c686f7899bd1471cc4c895cb069bc95215 Mon Sep 17 00:00:00 2001 From: Josep Orga Date: Wed, 22 Apr 2020 17:43:26 +0200 Subject: [PATCH] ARM: dts: Add imx6ull-somdevices.dts NO_LCD filter to disable LCD functionallity. Signed-off-by: Josep Orga --- arch/arm/boot/dts/imx6ull-somdevices-C8P1.dts | 13 +------------ arch/arm/boot/dts/imx6ull-somdevices.dtsi | 8 +++++++- 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/arch/arm/boot/dts/imx6ull-somdevices-C8P1.dts b/arch/arm/boot/dts/imx6ull-somdevices-C8P1.dts index 531b44d0bd04..0aa3f54b7f8c 100644 --- a/arch/arm/boot/dts/imx6ull-somdevices-C8P1.dts +++ b/arch/arm/boot/dts/imx6ull-somdevices-C8P1.dts @@ -1,4 +1,5 @@ #define MMC_SPI +#define NO_LCD #include "imx6ull-somdevices.dtsi" @@ -87,14 +88,6 @@ sound-dai = <&sgtl5000>; }; }; - - backlight { - status = "disabled"; - }; - - pxp_v4l2 { - status = "disabled"; - }; }; &flexcan1 { @@ -130,10 +123,6 @@ status = "okay"; }; -&lcdif { - status = "disabled"; -}; - &uart2 { status = "disabled"; }; diff --git a/arch/arm/boot/dts/imx6ull-somdevices.dtsi b/arch/arm/boot/dts/imx6ull-somdevices.dtsi index 23ee539fdce7..f2f355587cd2 100644 --- a/arch/arm/boot/dts/imx6ull-somdevices.dtsi +++ b/arch/arm/boot/dts/imx6ull-somdevices.dtsi @@ -7,6 +7,7 @@ */ /* #define DUAL_ETH */ /* #define BIG_LCD */ +/* #define NO_LCD */ /* #define MMC_SPI */ /dts-v1/; @@ -39,6 +40,7 @@ }; }; +#ifndef NO_LCD backlight { compatible = "pwm-backlight"; pwms = <&pwm1 0 2000000>; @@ -51,6 +53,7 @@ compatible = "fsl,imx6ul-pxp-v4l2", "fsl,imx6sx-pxp-v4l2", "fsl,imx6sl-pxp-v4l2"; status = "okay"; }; +#endif regulators { compatible = "simple-bus"; @@ -329,7 +332,9 @@ MX6UL_PAD_GPIO1_IO02__GPIO1_IO02 0x1b0b0 //GPIO02 MX6UL_PAD_UART3_RX_DATA__GPIO1_IO25 0x1b0b0 //GPIO03 MX6UL_PAD_NAND_CE1_B__GPIO4_IO14 0x1b0b0 //GPIO04 + #ifdef NO_LCD MX6UL_PAD_GPIO1_IO08__GPIO1_IO08 0x1b0b0 //GPIO05 + #endif MX6UL_PAD_JTAG_MOD__GPIO1_IO10 0x1b0b0 //GPIO06 MX6UL_PAD_UART1_CTS_B__GPIO1_IO18 0x1b0b0 //GPIO07 MX6UL_PAD_GPIO1_IO09__GPIO1_IO09 0x1b0b0 //GPIO08 @@ -640,7 +645,7 @@ }; }; - +#ifndef NO_LCD &lcdif { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_lcdif_dat @@ -697,6 +702,7 @@ &pxp { status = "okay"; }; +#endif &sai2 { pinctrl-names = "default"; -- 2.17.1