From bcb97544083ee6fe87ed4238bf1839842ffd9996 Mon Sep 17 00:00:00 2001 From: Aishwarya Kothari Date: Thu, 8 Sep 2022 16:09:27 +0200 Subject: colibri-imx6: move to one overlay per accessory Move the existing overlays to dtsi files and include them into one accessory dts. Provide data-mapping timings appropriately for each machine instead of the hardcoding and use a single overlay per SoC to avoid code duplication. Signed-off-by: Aishwarya Kothari --- overlays/Makefile | 17 ++--- .../colibri-imx6_atmel-mxt-adapter_overlay.dts | 36 ---------- .../colibri-imx6_atmel-mxt-adapter_overlay.dtsi | 27 ++++++++ .../colibri-imx6_atmel-mxt-connector_overlay.dts | 25 ------- .../colibri-imx6_atmel-mxt-connector_overlay.dtsi | 19 +++++ ...ri-imx6_panel-cap-touch-10inch-lvds_overlay.dts | 22 ++++++ ...-imx6_panel-cap-touch-7inch_adapter_overlay.dts | 22 ++++++ .../colibri-imx6_panel-cap-touch-7inch_overlay.dts | 22 ++++++ .../colibri-imx6_panel-res-touch-7inch_overlay.dts | 21 ++++++ .../colibri-imx6_parallel-rgb-lvds_overlay.dts | 65 ----------------- .../colibri-imx6_parallel-rgb-lvds_overlay.dtsi | 81 ++++++++++++++++++++++ overlays/colibri-imx6_parallel-rgb_overlay.dts | 29 -------- overlays/colibri-imx6_parallel-rgb_overlay.dtsi | 25 +++++++ overlays/colibri-imx6_stmpe-ts_overlay.dts | 17 ----- overlays/colibri-imx6_stmpe-ts_overlay.dtsi | 11 +++ overlays/colibri-imx6_vga-640x480_overlay.dts | 20 ++++++ overlays/display-dpi-lt170410_overlay.dts | 45 ------------ overlays/display-dpi-lt170410_overlay.dtsi | 32 +++++++++ overlays/display-lt161010_overlay.dts | 40 ----------- overlays/display-lt161010_overlay.dtsi | 27 ++++++++ overlays/display-lt170410_overlay.dts | 38 ---------- overlays/display-vga-640x480_overlay.dtsi | 29 ++++++++ 22 files changed, 363 insertions(+), 307 deletions(-) delete mode 100644 overlays/colibri-imx6_atmel-mxt-adapter_overlay.dts create mode 100644 overlays/colibri-imx6_atmel-mxt-adapter_overlay.dtsi delete mode 100644 overlays/colibri-imx6_atmel-mxt-connector_overlay.dts create mode 100644 overlays/colibri-imx6_atmel-mxt-connector_overlay.dtsi create mode 100644 overlays/colibri-imx6_panel-cap-touch-10inch-lvds_overlay.dts create mode 100644 overlays/colibri-imx6_panel-cap-touch-7inch_adapter_overlay.dts create mode 100644 overlays/colibri-imx6_panel-cap-touch-7inch_overlay.dts create mode 100644 overlays/colibri-imx6_panel-res-touch-7inch_overlay.dts delete mode 100644 overlays/colibri-imx6_parallel-rgb-lvds_overlay.dts create mode 100644 overlays/colibri-imx6_parallel-rgb-lvds_overlay.dtsi delete mode 100644 overlays/colibri-imx6_parallel-rgb_overlay.dts create mode 100644 overlays/colibri-imx6_parallel-rgb_overlay.dtsi delete mode 100644 overlays/colibri-imx6_stmpe-ts_overlay.dts create mode 100644 overlays/colibri-imx6_stmpe-ts_overlay.dtsi create mode 100644 overlays/colibri-imx6_vga-640x480_overlay.dts delete mode 100644 overlays/display-dpi-lt170410_overlay.dts create mode 100644 overlays/display-dpi-lt170410_overlay.dtsi delete mode 100644 overlays/display-lt161010_overlay.dts create mode 100644 overlays/display-lt161010_overlay.dtsi delete mode 100644 overlays/display-lt170410_overlay.dts create mode 100644 overlays/display-vga-640x480_overlay.dtsi diff --git a/overlays/Makefile b/overlays/Makefile index c4da0f9..878fbe2 100644 --- a/overlays/Makefile +++ b/overlays/Makefile @@ -30,13 +30,13 @@ dtb-y += apalis-imx6_spi1_spidev_overlay.dtbo dtb-y += apalis-imx6_spi2_spidev_overlay.dtbo dtb-y += apalis-imx6_stmpe-ts_overlay.dtbo dtb-y += apalis-imx6_vga_overlay.dtbo -dtb-y += colibri-imx6_atmel-mxt-adapter_overlay.dtbo -dtb-y += colibri-imx6_atmel-mxt-connector_overlay.dtbo dtb-y += colibri-imx6_hdmi_overlay.dtbo -dtb-y += colibri-imx6_parallel-rgb-lvds_overlay.dtbo -dtb-y += colibri-imx6_parallel-rgb_overlay.dtbo +dtb-y += colibri-imx6_panel-cap-touch-7inch_adapter_overlay.dtbo +dtb-y += colibri-imx6_panel-cap-touch-7inch_overlay.dtbo +dtb-y += colibri-imx6_panel-cap-touch-10inch-lvds_overlay.dtbo +dtb-y += colibri-imx6_panel-res-touch-7inch_overlay.dtbo dtb-y += colibri-imx6_spidev_overlay.dtbo -dtb-y += colibri-imx6_stmpe-ts_overlay.dtbo +dtb-y += colibri-imx6_vga-640x480_overlay.dtbo dtb-y += colibri-imx6ull_ad7879_overlay.dtbo dtb-y += colibri-imx6ull_atmel-mxt-adapter_overlay.dtbo dtb-y += colibri-imx6ull_atmel-mxt-connector_overlay.dtbo @@ -49,13 +49,6 @@ dtb-y += colibri-imx7_atmel-mxt-connector_overlay.dtbo dtb-y += colibri-imx7_parallel-rgb-lvds-rgb24-single_overlay.dtbo dtb-y += colibri-imx7_parallel-rgb_overlay.dtbo dtb-y += colibri-imx7_spidev_overlay.dtbo -dtb-y += display-dpi-lt170410_overlay.dtbo -dtb-y += display-edt5.7_overlay.dtbo -dtb-y += display-edt7_overlay.dtbo -dtb-y += display-fullhd_overlay.dtbo -dtb-y += display-lt161010_overlay.dtbo -dtb-y += display-lt170410_overlay.dtbo -dtb-y += display-vga_overlay.dtbo dtb-y += verdin-imx8mm_spidev_overlay.dtbo dtb-y += verdin-imx8mp_spidev_overlay.dtbo diff --git a/overlays/colibri-imx6_atmel-mxt-adapter_overlay.dts b/overlays/colibri-imx6_atmel-mxt-adapter_overlay.dts deleted file mode 100644 index 20a3fe9..0000000 --- a/overlays/colibri-imx6_atmel-mxt-adapter_overlay.dts +++ /dev/null @@ -1,36 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-or-later OR MIT -/* - * Copyright 2020-2021 Toradex - */ - -// Atmel MXT touchscreen for 7inch and 10inch displays orderable at Toradex. Compatible with a Capacitive Touch Adapter. - -/dts-v1/; -/plugin/; - -#include -#include - -/ { - compatible = "toradex,colibri_imx6dl"; -}; - -&atmel_mxt_ts { - pinctrl-0 = <&pinctrl_atmel_adap>; - interrupt-parent = <&gpio1>; - interrupts = <9 IRQ_TYPE_EDGE_FALLING>; - reset-gpios = <&gpio2 10 GPIO_ACTIVE_LOW>; - status = "okay"; -}; - -&i2c3 { - status = "okay"; -}; - -&pwm1 { - status = "disabled"; -}; - -&pwm4 { - status = "disabled"; -}; diff --git a/overlays/colibri-imx6_atmel-mxt-adapter_overlay.dtsi b/overlays/colibri-imx6_atmel-mxt-adapter_overlay.dtsi new file mode 100644 index 0000000..35b0bdc --- /dev/null +++ b/overlays/colibri-imx6_atmel-mxt-adapter_overlay.dtsi @@ -0,0 +1,27 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/* + * Copyright 2020-2022 Toradex + */ + +// Atmel MXT capacitive touch controller for 7" and 10.1" displays +// orderable at Toradex. Compatible with a Capacitive Touch Adapter. + +&atmel_mxt_ts { + pinctrl-0 = <&pinctrl_atmel_adap>; + interrupt-parent = <&gpio1>; + interrupts = <9 IRQ_TYPE_EDGE_FALLING>; + reset-gpios = <&gpio2 10 GPIO_ACTIVE_LOW>; + status = "okay"; +}; + +&i2c3 { + status = "okay"; +}; + +&pwm1 { + status = "disabled"; +}; + +&pwm4 { + status = "disabled"; +}; diff --git a/overlays/colibri-imx6_atmel-mxt-connector_overlay.dts b/overlays/colibri-imx6_atmel-mxt-connector_overlay.dts deleted file mode 100644 index 9d42289..0000000 --- a/overlays/colibri-imx6_atmel-mxt-connector_overlay.dts +++ /dev/null @@ -1,25 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-or-later OR MIT -/* - * Copyright 2020-2021 Toradex - */ - -// Atmel MXT touchscreen for the 7inch and 10inch capacitive displays orderable at Toradex. Compatible with a Capacitive Touch Connector. - -/dts-v1/; -/plugin/; - -/ { - compatible = "toradex,colibri_imx6dl"; -}; - -&atmel_mxt_ts { - status = "okay"; -}; - -&i2c3 { - status = "okay"; -}; - -&weim { - status = "disabled"; -}; diff --git a/overlays/colibri-imx6_atmel-mxt-connector_overlay.dtsi b/overlays/colibri-imx6_atmel-mxt-connector_overlay.dtsi new file mode 100644 index 0000000..1b72093 --- /dev/null +++ b/overlays/colibri-imx6_atmel-mxt-connector_overlay.dtsi @@ -0,0 +1,19 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/* + * Copyright 2020-2022 Toradex + */ + +// Atmel MXT capacitive touch controller for the 7" and 10.1" displays +// orderable at Toradex. Compatible with a Capacitive Touch Connector. + +&atmel_mxt_ts { + status = "okay"; +}; + +&i2c3 { + status = "okay"; +}; + +&weim { + status = "disabled"; +}; diff --git a/overlays/colibri-imx6_panel-cap-touch-10inch-lvds_overlay.dts b/overlays/colibri-imx6_panel-cap-touch-10inch-lvds_overlay.dts new file mode 100644 index 0000000..61f3ce2 --- /dev/null +++ b/overlays/colibri-imx6_panel-cap-touch-10inch-lvds_overlay.dts @@ -0,0 +1,22 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/* + * Copyright 2022 Toradex + */ + +// Enable the parallel RGB interface on the Colibri iMX6 and the +// LVDS transceiver on the Iris v2.0A with a connected capacitive +// touch 10.1" LVDS display. + +#include +#include + +/dts-v1/; +/plugin/; + +/ { + compatible = "toradex,colibri_imx6dl"; +}; + +#include "colibri-imx6_atmel-mxt-adapter_overlay.dtsi" +#include "colibri-imx6_parallel-rgb-lvds_overlay.dtsi" +#include "display-dpi-lt170410_overlay.dtsi" diff --git a/overlays/colibri-imx6_panel-cap-touch-7inch_adapter_overlay.dts b/overlays/colibri-imx6_panel-cap-touch-7inch_adapter_overlay.dts new file mode 100644 index 0000000..530cac3 --- /dev/null +++ b/overlays/colibri-imx6_panel-cap-touch-7inch_adapter_overlay.dts @@ -0,0 +1,22 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/* + * Copyright 2022 Toradex + */ + +// Enable the parallel RGB interface on the Colibri iMX6 with a +// connected capacitive touch 7" display, touch connected with +// a separate adapter pcb. + +#include +#include + +/dts-v1/; +/plugin/; + +/ { + compatible = "toradex,colibri_imx6dl"; +}; + +#include "colibri-imx6_atmel-mxt-adapter_overlay.dtsi" +#include "colibri-imx6_parallel-rgb_overlay.dtsi" +#include "display-lt161010_overlay.dtsi" diff --git a/overlays/colibri-imx6_panel-cap-touch-7inch_overlay.dts b/overlays/colibri-imx6_panel-cap-touch-7inch_overlay.dts new file mode 100644 index 0000000..175c64b --- /dev/null +++ b/overlays/colibri-imx6_panel-cap-touch-7inch_overlay.dts @@ -0,0 +1,22 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/* + * Copyright 2022 Toradex + */ + +// Enable the parallel RGB interface on the Colibri iMX6 with a +// connected capacitive touch 7" display, touch connected to a +// dedicated connector e.g. as present on Iris v2.0A. + +#include +#include + +/dts-v1/; +/plugin/; + +/ { + compatible = "toradex,colibri_imx6dl"; +}; + +#include "colibri-imx6_atmel-mxt-connector_overlay.dtsi" +#include "colibri-imx6_parallel-rgb_overlay.dtsi" +#include "display-lt161010_overlay.dtsi" diff --git a/overlays/colibri-imx6_panel-res-touch-7inch_overlay.dts b/overlays/colibri-imx6_panel-res-touch-7inch_overlay.dts new file mode 100644 index 0000000..3ef2652 --- /dev/null +++ b/overlays/colibri-imx6_panel-res-touch-7inch_overlay.dts @@ -0,0 +1,21 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/* + * Copyright 2022 Toradex + */ + +// Enable the parallel RGB interface on the Colibri iMX6 with a +// connected resistive touch 7" display. + +#include +#include + +/dts-v1/; +/plugin/; + +/ { + compatible = "toradex,colibri_imx6dl"; +}; + +#include "colibri-imx6_parallel-rgb_overlay.dtsi" +#include "colibri-imx6_stmpe-ts_overlay.dtsi" +#include "display-lt161010_overlay.dtsi" diff --git a/overlays/colibri-imx6_parallel-rgb-lvds_overlay.dts b/overlays/colibri-imx6_parallel-rgb-lvds_overlay.dts deleted file mode 100644 index 84e2e3d..0000000 --- a/overlays/colibri-imx6_parallel-rgb-lvds_overlay.dts +++ /dev/null @@ -1,65 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-or-later OR MIT -/* - * Copyright 2020-2021 Toradex - */ - -// Enable the parallel RGB interface on the Colibri iMX6DL and the -// LVDS trasceiver on the Iris v2.0A. -// Make sure to also select a valid display configuration. - -#include - -/dts-v1/; -/plugin/; - -/ { - compatible = "toradex,colibri_imx6dl"; -}; - -&backlight { - status = "okay"; -}; - -/* Need to be disabled due to overlapped pins SODIMM_55, SODIMM_63 */ -&can1 { - status = "disabled"; -}; - -&gpio1 { - /* This switches the LVDS transceiver to the single-channel - * output mode. - */ - LVDS_MODE { - gpio-hog; - gpios = <7 GPIO_ACTIVE_HIGH>; - line-name = "LVDS_MODE"; - output-high; - }; - - /* This turns the LVDS transceiver on */ - LVDS_PWRDWN { - gpio-hog; - gpios = <12 GPIO_ACTIVE_HIGH>; - line-name = "LVDS_PWRDWN"; - output-high; - }; -}; - -&lcd_display { - status = "okay"; -}; - -&panel_dpi { - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_lvds_transceiver>; - status = "okay"; -}; - -&pwm3 { - status = "okay"; -}; - -/* Need to be disabled due to the overlapped pin SODIMM_99 */ -&weim { - status = "disabled"; -}; diff --git a/overlays/colibri-imx6_parallel-rgb-lvds_overlay.dtsi b/overlays/colibri-imx6_parallel-rgb-lvds_overlay.dtsi new file mode 100644 index 0000000..0c7c26c --- /dev/null +++ b/overlays/colibri-imx6_parallel-rgb-lvds_overlay.dtsi @@ -0,0 +1,81 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/* + * Copyright 2020-2022 Toradex + */ + +// Enable the parallel RGB interface on the Colibri iMX6 and the +// LVDS trasceiver on the Iris v2.0A. + +&backlight { + status = "okay"; +}; + +/* Need to be disabled due to overlapped pins SODIMM_55, SODIMM_63 */ +&can1 { + status = "disabled"; +}; + +&gpio1 { + /* This switches the LVDS transceiver to the single-channel + * output mode. + */ + lvds-ch-mode { + gpio-hog; + gpios = <7 GPIO_ACTIVE_HIGH>; /* SODIMM 55 */ + line-name = "LVDS_CH_MODE"; + output-high; + }; + + /* This turns the LVDS transceiver on */ + lvds-pwron { + gpio-hog; + gpios = <12 GPIO_ACTIVE_HIGH>; /* SODIMM 99 */ + line-name = "LVDS_PWRON"; + output-high; + }; + + /* This switches the LVDS transceiver to the 24-bit RGB mode */ + lvds-rgb-mode { + gpio-hog; + gpios = <8 GPIO_ACTIVE_HIGH>; /* SODIMM 63 */ + line-name = "LVDS_RGB_MODE"; + output-low; + }; +}; + +&gpio5 { + /* This switches the LVDS transceiver to VESA color mapping mode */ + lvds-color-map { + gpio-hog; + gpios = <0 GPIO_ACTIVE_HIGH>; /* SODIMM 95 */ + line-name = "LVDS_COLOR_MAP"; + output-low; + }; +}; + +&pinctrl_weim_gpio_5 { + /* PAD_EIM_WAIT pin used for LVDS */ + fsl,pins = <>; +}; + +&lcd_display { + /* use the bus-format as specified from the panel */ + interface-pix-fmt = ""; + status = "okay"; +}; + +&panel_dpi { + data-mapping = "bgr666"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_lvds_transceiver>; + status = "okay"; +}; + +&pwm3 { + status = "okay"; +}; + +/* Need to be disabled due to the overlapped pin SODIMM_99 */ +&weim { + status = "disabled"; +}; diff --git a/overlays/colibri-imx6_parallel-rgb_overlay.dts b/overlays/colibri-imx6_parallel-rgb_overlay.dts deleted file mode 100644 index e09140f..0000000 --- a/overlays/colibri-imx6_parallel-rgb_overlay.dts +++ /dev/null @@ -1,29 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-or-later OR MIT -/* - * Copyright 2020-2021 Toradex - */ - -// Enable the parallel RGB interface on the Colibri iMX6DL. Make sure to also select a valid display configuration. - -/dts-v1/; -/plugin/; - -/ { - compatible = "toradex,colibri_imx6dl"; -}; - -&backlight { - status = "okay"; -}; - -&lcd_display { - status = "okay"; -}; - -&panel_dpi { - status = "okay"; -}; - -&pwm3 { - status = "okay"; -}; diff --git a/overlays/colibri-imx6_parallel-rgb_overlay.dtsi b/overlays/colibri-imx6_parallel-rgb_overlay.dtsi new file mode 100644 index 0000000..d760797 --- /dev/null +++ b/overlays/colibri-imx6_parallel-rgb_overlay.dtsi @@ -0,0 +1,25 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/* + * Copyright 2020-2022 Toradex + */ + +// Enable the parallel RGB interface on the Colibri iMX6. + +&backlight { + status = "okay"; +}; + +&lcd_display { + /* use the bus-format as specified from the panel */ + interface-pix-fmt = ""; + status = "okay"; +}; + +&panel_dpi { + data-mapping = "bgr666"; + status = "okay"; +}; + +&pwm3 { + status = "okay"; +}; diff --git a/overlays/colibri-imx6_stmpe-ts_overlay.dts b/overlays/colibri-imx6_stmpe-ts_overlay.dts deleted file mode 100644 index 23ad524..0000000 --- a/overlays/colibri-imx6_stmpe-ts_overlay.dts +++ /dev/null @@ -1,17 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-or-later OR MIT -/* - * Copyright 2020-2021 Toradex - */ - -// Resitive STMPE touchscreen touchscreen for the 7inch display orderable at Toradex. - -/dts-v1/; -/plugin/; - -/ { - compatible = "toradex,colibri_imx6dl"; -}; - -&stmpe_ts { - status = "okay"; -}; diff --git a/overlays/colibri-imx6_stmpe-ts_overlay.dtsi b/overlays/colibri-imx6_stmpe-ts_overlay.dtsi new file mode 100644 index 0000000..f75fd83 --- /dev/null +++ b/overlays/colibri-imx6_stmpe-ts_overlay.dtsi @@ -0,0 +1,11 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/* + * Copyright 2020-2022 Toradex + */ + +// Resistive STMPE touch controller for the 7" display orderable +// at Toradex. + +&stmpe_ts { + status = "okay"; +}; diff --git a/overlays/colibri-imx6_vga-640x480_overlay.dts b/overlays/colibri-imx6_vga-640x480_overlay.dts new file mode 100644 index 0000000..ec3ae96 --- /dev/null +++ b/overlays/colibri-imx6_vga-640x480_overlay.dts @@ -0,0 +1,20 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/* + * Copyright 2022 Toradex + */ + +// Enable the parallel RGB interface on the Colibri iMX6 and the +// video DAC providing analog RGB on the VGA connector. + +#include +#include + +/dts-v1/; +/plugin/; + +/ { + compatible = "toradex,colibri_imx6dl"; +}; + +#include "colibri-imx6_parallel-rgb_overlay.dtsi" +#include "display-vga-640x480_overlay.dtsi" diff --git a/overlays/display-dpi-lt170410_overlay.dts b/overlays/display-dpi-lt170410_overlay.dts deleted file mode 100644 index ee89c70..0000000 --- a/overlays/display-dpi-lt170410_overlay.dts +++ /dev/null @@ -1,45 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-or-later OR MIT -/* - * Copyright 2020-2021 Toradex - */ - -// LT170410 display (10inch) connected to DPI-LVDS converter with a resolution of 1280x800 pixel. -// This display can be ordered at Toradex. - -/dts-v1/; -/plugin/; - -/ { - compatible = "toradex,colibri_imx6dl", - "toradex,colibri-imx7s", - "toradex,colibri-imx7d", - "toradex,colibri-imx6ull-emmc", - "toradex,colibri-imx8x"; -}; - -&{/panel-dpi} { - status = "okay"; - - data-mapping = "bgr666"; - - width-mm = <217>; - height-mm = <136>; - - panel-timing { - clock-frequency = <68930000>; - - hactive = <1280>; - hback-porch = <64>; - hfront-porch = <64>; - hsync-len = <40>; - vactive = <800>; - vback-porch = <5>; - vfront-porch = <5>; - vsync-len = <6>; - - de-active = <1>; - hsync-active = <0>; - vsync-active = <0>; - pixelclk-active = <1>; - }; -}; diff --git a/overlays/display-dpi-lt170410_overlay.dtsi b/overlays/display-dpi-lt170410_overlay.dtsi new file mode 100644 index 0000000..62680bf --- /dev/null +++ b/overlays/display-dpi-lt170410_overlay.dtsi @@ -0,0 +1,32 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/* + * Copyright 2020-2022 Toradex + */ + +// LT170410 panel with a resolution of 1280x800 pixel. + +&panel_dpi { + compatible = "panel-dpi"; + status = "okay"; + + width-mm = <217>; + height-mm = <136>; + + panel-timing { + clock-frequency = <68930000>; + + hactive = <1280>; + hback-porch = <64>; + hfront-porch = <64>; + hsync-len = <40>; + vactive = <800>; + vback-porch = <5>; + vfront-porch = <5>; + vsync-len = <6>; + + de-active = <1>; + hsync-active = <0>; + vsync-active = <0>; + pixelclk-active = <0>; + }; +}; diff --git a/overlays/display-lt161010_overlay.dts b/overlays/display-lt161010_overlay.dts deleted file mode 100644 index 21c9068..0000000 --- a/overlays/display-lt161010_overlay.dts +++ /dev/null @@ -1,40 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-or-later OR MIT -/* - * Copyright 2020-2021 Toradex - */ - -// LT161010 display (7inch) with a resolution of 800x480 pixel. This display can be ordered at Toradex. - -/dts-v1/; -/plugin/; - -/ { - compatible = "toradex,apalis_imx6q", - "toradex,apalis-imx8x", - "toradex,colibri_imx6dl", - "toradex,colibri-imx6ull-emmc", - "toradex,colibri-imx7d", - "toradex,colibri-imx7s", - "toradex,colibri-imx7d-emmc", - "toradex,colibri-imx8x"; -}; - -&{/panel-dpi} { - status = "okay"; - - width-mm = <154>; - height-mm = <86>; - - panel-timing { - clock-frequency = <33230769>; - hactive = <800>; - vactive = <480>; - hsync-len = <128>; - hfront-porch = <40>; - hback-porch = <88>; - vsync-len = <1>; - vfront-porch = <10>; - vback-porch = <33>; - pixelclk-active = <1>; - }; -}; diff --git a/overlays/display-lt161010_overlay.dtsi b/overlays/display-lt161010_overlay.dtsi new file mode 100644 index 0000000..63fb1b2 --- /dev/null +++ b/overlays/display-lt161010_overlay.dtsi @@ -0,0 +1,27 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/* + * Copyright 2020-2022 Toradex + */ + +// LT161010 panel with a resolution of 800x480 pixel. + +&panel_dpi { + compatible = "panel-dpi"; + status = "okay"; + + width-mm = <154>; + height-mm = <86>; + + panel-timing { + clock-frequency = <33230769>; + hactive = <800>; + vactive = <480>; + hsync-len = <128>; + hfront-porch = <40>; + hback-porch = <88>; + vsync-len = <1>; + vfront-porch = <10>; + vback-porch = <33>; + pixelclk-active = <1>; + }; +}; diff --git a/overlays/display-lt170410_overlay.dts b/overlays/display-lt170410_overlay.dts deleted file mode 100644 index d3bcb3f..0000000 --- a/overlays/display-lt170410_overlay.dts +++ /dev/null @@ -1,38 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-or-later OR MIT -/* - * Copyright 2020-2021 Toradex - */ - -// LT170410 display (10inch) with a resolution of 1280x800 pixel. This display can be ordered at Toradex. - -/dts-v1/; -/plugin/; - -/ { - compatible = "toradex,apalis_imx6q", - "toradex,apalis-imx8", - "toradex,apalis-imx8x"; -}; - -&{/panel-lvds} { - status = "okay"; - - data-mapping = "vesa-24"; - width-mm = <217>; - height-mm = <136>; - - panel-timing { - clock-frequency = <68930000>; - hactive = <1280>; - vactive = <800>; - hback-porch = <64>; - hfront-porch = <64>; - vback-porch = <5>; - vfront-porch = <5>; - hsync-len = <40>; - vsync-len = <6>; - hsync-active = <0>; - vsync-active = <0>; - pixelclk-active = <0>; - }; -}; diff --git a/overlays/display-vga-640x480_overlay.dtsi b/overlays/display-vga-640x480_overlay.dtsi new file mode 100644 index 0000000..4f4556e --- /dev/null +++ b/overlays/display-vga-640x480_overlay.dtsi @@ -0,0 +1,29 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/* + * Copyright 2022 Toradex + */ + +// VGA Signal 640x480@60Hz Industry standard timing + +&panel_dpi { + compatible = "panel-dpi"; + status = "okay"; + + /* for 0.3mm pixels */ + width-mm = <192>; + height-mm = <144>; + + panel-timing { + clock-frequency = <25175000>; + hactive = <640>; + vactive = <480>; + hsync-len = <96>; + hfront-porch = <16>; + hback-porch = <48>; + vsync-len = <2>; + vfront-porch = <10>; + vback-porch = <33>; + hsync-active = <0>; + vsync-active = <0>; + }; +}; -- cgit v1.2.3