diff options
13 files changed, 152 insertions, 85 deletions
diff --git a/overlays/Makefile b/overlays/Makefile index 878fbe2..d93ed09 100644 --- a/overlays/Makefile +++ b/overlays/Makefile @@ -37,12 +37,12 @@ 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_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 -dtb-y += colibri-imx6ull_parallel-rgb-lvds_overlay.dtbo -dtb-y += colibri-imx6ull_parallel-rgb_overlay.dtbo +dtb-y += colibri-imx6ull_panel-cap-touch-7inch_adapter_overlay.dtbo +dtb-y += colibri-imx6ull_panel-cap-touch-7inch_overlay.dtbo +dtb-y += colibri-imx6ull_panel-cap-touch-10inch-lvds_overlay.dtbo +dtb-y += colibri-imx6ull_panel-res-touch-7inch_overlay.dtbo dtb-y += colibri-imx6ull_spidev_overlay.dtbo +dtb-y += colibri-imx6ull_vga-640x480_overlay.dtbo dtb-y += colibri-imx7_ad7879_overlay.dtbo dtb-y += colibri-imx7_atmel-mxt-adapter_overlay.dtbo dtb-y += colibri-imx7_atmel-mxt-connector_overlay.dtbo diff --git a/overlays/colibri-imx6ull_ad7879_overlay.dts b/overlays/colibri-imx6ull_ad7879_overlay.dtsi index c109926..7079008 100644 --- a/overlays/colibri-imx6ull_ad7879_overlay.dts +++ b/overlays/colibri-imx6ull_ad7879_overlay.dtsi @@ -1,16 +1,10 @@ // SPDX-License-Identifier: GPL-2.0-or-later OR MIT /* - * Copyright 2021 Toradex + * Copyright 2021-2022 Toradex */ -// Enable the resistive touch controller (AD7879) on the Colibri iMX6ULL. - -/dts-v1/; -/plugin/; - -/ { - compatible = "toradex,colibri-imx6ull-emmc"; -}; +// Resistive AD7879 touch controller for the 7" display orderable +// at Toradex. &ad7879_ts { status = "okay"; diff --git a/overlays/colibri-imx6ull_atmel-mxt-adapter_overlay.dts b/overlays/colibri-imx6ull_atmel-mxt-adapter_overlay.dtsi index 446009a..ebe0ade 100644 --- a/overlays/colibri-imx6ull_atmel-mxt-adapter_overlay.dts +++ b/overlays/colibri-imx6ull_atmel-mxt-adapter_overlay.dtsi @@ -1,20 +1,10 @@ // SPDX-License-Identifier: GPL-2.0-or-later OR MIT /* - * Copyright 2021 Toradex + * Copyright 2021-2022 Toradex */ -// Atmel MXT touchscreen for the 7inch and 10inch display orderable at Toradex. -// Compatible with a Capacitive Touch Adapter. - -/dts-v1/; -/plugin/; - -#include <dt-bindings/gpio/gpio.h> -#include <dt-bindings/interrupt-controller/irq.h> - -/ { - compatible = "toradex,colibri-imx6ull-emmc"; -}; +// Atmel MXT capacitive touch controller for the 7" and 10.1" displays +// orderable at Toradex. Compatible with a Capacitive Touch Adapter. &atmel_mxt_ts { pinctrl-0 = <&pinctrl_atmel_adap>; diff --git a/overlays/colibri-imx6ull_atmel-mxt-connector_overlay.dts b/overlays/colibri-imx6ull_atmel-mxt-connector_overlay.dtsi index 5806170..62fe90b 100644 --- a/overlays/colibri-imx6ull_atmel-mxt-connector_overlay.dts +++ b/overlays/colibri-imx6ull_atmel-mxt-connector_overlay.dtsi @@ -1,17 +1,10 @@ // SPDX-License-Identifier: GPL-2.0-or-later OR MIT /* - * Copyright 2021 Toradex + * Copyright 2021-2022 Toradex */ -// Atmel touchscreen for the 7inch and 10inch capacitive display orderable at -// Toradex. Compatible with a Capacitive Touch Connector. - -/dts-v1/; -/plugin/; - -/ { - compatible = "toradex,colibri-imx6ull-emmc"; -}; +// 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"; diff --git a/overlays/colibri-imx6ull_panel-cap-touch-10inch-lvds_overlay.dts b/overlays/colibri-imx6ull_panel-cap-touch-10inch-lvds_overlay.dts new file mode 100644 index 0000000..a78d288 --- /dev/null +++ b/overlays/colibri-imx6ull_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 iMX6ULL and the +// LVDS transceiver on the Iris v2.0A with a connected capacitive +// touch 10.1" LVDS display. + +/dts-v1/; +/plugin/; + +#include <dt-bindings/gpio/gpio.h> +#include <dt-bindings/interrupt-controller/irq.h> + +/ { + compatible = "toradex,colibri-imx6ull-emmc"; +}; + +#include "colibri-imx6ull_atmel-mxt-connector_overlay.dtsi" +#include "colibri-imx6ull_parallel-rgb-lvds_overlay.dtsi" +#include "display-dpi-lt170410_overlay.dtsi" diff --git a/overlays/colibri-imx6ull_panel-cap-touch-7inch_adapter_overlay.dts b/overlays/colibri-imx6ull_panel-cap-touch-7inch_adapter_overlay.dts new file mode 100644 index 0000000..08c2b11 --- /dev/null +++ b/overlays/colibri-imx6ull_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 iMX6ULL with a +// connected capacitive touch 7" display, touch connected with +// a separate adapter pcb. + +/dts-v1/; +/plugin/; + +#include <dt-bindings/gpio/gpio.h> +#include <dt-bindings/interrupt-controller/irq.h> + +/ { + compatible = "toradex,colibri-imx6ull-emmc"; +}; + +#include "colibri-imx6ull_atmel-mxt-adapter_overlay.dtsi" +#include "colibri-imx6ull_parallel-rgb_overlay.dtsi" +#include "display-lt161010_overlay.dtsi" diff --git a/overlays/colibri-imx6ull_panel-cap-touch-7inch_overlay.dts b/overlays/colibri-imx6ull_panel-cap-touch-7inch_overlay.dts new file mode 100644 index 0000000..38aed7e --- /dev/null +++ b/overlays/colibri-imx6ull_panel-cap-touch-7inch_overlay.dts @@ -0,0 +1,19 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/* + * Copyright 2022 Toradex + */ + +// Enable the parallel RGB interface on the Colibri iMX6ULL with a +// connected capacitive touch 7" display, touch connected to a +// dedicated connector e.g. as present on Iris v2.0A. + +/dts-v1/; +/plugin/; + +/ { + compatible = "toradex,colibri-imx6ull-emmc"; +}; + +#include "colibri-imx6ull_atmel-mxt-connector_overlay.dtsi" +#include "colibri-imx6ull_parallel-rgb_overlay.dtsi" +#include "display-lt161010_overlay.dtsi" diff --git a/overlays/colibri-imx6ull_panel-res-touch-7inch_overlay.dts b/overlays/colibri-imx6ull_panel-res-touch-7inch_overlay.dts new file mode 100644 index 0000000..cd5e503 --- /dev/null +++ b/overlays/colibri-imx6ull_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 iMX6ULL with a +// connected resistive touch 7" display. + +/dts-v1/; +/plugin/; + +#include <dt-bindings/gpio/gpio.h> +#include <dt-bindings/interrupt-controller/irq.h> + +/ { + compatible = "toradex,colibri-imx6ull-emmc"; +}; + +#include "colibri-imx6ull_ad7879_overlay.dtsi" +#include "colibri-imx6ull_parallel-rgb_overlay.dtsi" +#include "display-lt161010_overlay.dtsi" diff --git a/overlays/colibri-imx6ull_parallel-rgb-lvds_overlay.dts b/overlays/colibri-imx6ull_parallel-rgb-lvds_overlay.dtsi index e4a740e..6e4c462 100644 --- a/overlays/colibri-imx6ull_parallel-rgb-lvds_overlay.dts +++ b/overlays/colibri-imx6ull_parallel-rgb-lvds_overlay.dtsi @@ -1,19 +1,10 @@ // SPDX-License-Identifier: GPL-2.0-or-later OR MIT /* - * Copyright 2020-2021 Toradex + * Copyright 2020-2022 Toradex */ -// Enable the parallel RGB interface on the Colibri iMX6ULL and the LVDS -// trasceiver on the Iris v2.0A. - -#include <dt-bindings/gpio/gpio.h> - -/dts-v1/; -/plugin/; - -/ { - compatible = "toradex,colibri-imx6ull-emmc"; -}; +// Enable the parallel RGB interface on the Colibri iMX6ULL and the +// LVDS transceiver on the Iris v2.0A. &backlight { status = "okay"; @@ -26,25 +17,25 @@ &gpio1 { // This turns the LVDS transceiver on - LVDS_PWRDWN { + lvds-pwron { gpio-hog; gpios = <14 GPIO_ACTIVE_HIGH>; /* SODIMM 99 */ - line-name = "LVDS_PWRDWN"; + line-name = "LVDS_PWRON"; output-high; }; }; &gpio2 { // This switches the LVDS transceiver to the single-channel output mode - LVDS_MODE { + lvds-ch-mode { gpio-hog; gpios = <0 GPIO_ACTIVE_HIGH>; /* SODIMM 55 */ - line-name = "LVDS_MODE"; + line-name = "LVDS_CH_MODE"; output-high; }; // This switches the LVDS transceiver to the 24-bit RGB mode - LVDS_RGB_MODE { + lvds-rgb-mode { gpio-hog; gpios = <1 GPIO_ACTIVE_HIGH>; /* SODIMM 63 */ line-name = "LVDS_RGB_MODE"; @@ -54,7 +45,7 @@ &gpio5 { // This switches the LVDS transceiver to VESA color mapping mode - LVDS_COLOR_MAP { + lvds-color-map { gpio-hog; gpios = <3 GPIO_ACTIVE_HIGH>; /* SODIMM 95 */ line-name = "LVDS_COLOR_MAP"; @@ -67,6 +58,7 @@ }; &panel_dpi { + data-mapping = "bgr666"; status = "okay"; }; diff --git a/overlays/colibri-imx6ull_parallel-rgb_overlay.dts b/overlays/colibri-imx6ull_parallel-rgb_overlay.dts deleted file mode 100644 index 225d77d..0000000 --- a/overlays/colibri-imx6ull_parallel-rgb_overlay.dts +++ /dev/null @@ -1,30 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-or-later OR MIT -/* - * Copyright 2021 Toradex - */ - -// Enable the parallel RGB interface on the Colibri iMX6ULL. Make sure to also -// select a valid display configuration. - -/dts-v1/; -/plugin/; - -/ { - compatible = "toradex,colibri-imx6ull-emmc"; -}; - -&backlight { - status = "okay"; -}; - -&lcdif { - status = "okay"; -}; - -&panel_dpi { - status = "okay"; -}; - -&pwm4 { - status = "okay"; -}; diff --git a/overlays/colibri-imx6ull_parallel-rgb_overlay.dtsi b/overlays/colibri-imx6ull_parallel-rgb_overlay.dtsi new file mode 100644 index 0000000..c91b9f3 --- /dev/null +++ b/overlays/colibri-imx6ull_parallel-rgb_overlay.dtsi @@ -0,0 +1,23 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/* + * Copyright 2021-2022 Toradex + */ + +// Enable the parallel RGB interface on the Colibri iMX6ULL. + +&backlight { + status = "okay"; +}; + +&lcdif { + status = "okay"; +}; + +&panel_dpi { + data-mapping = "bgr666"; + status = "okay"; +}; + +&pwm4 { + status = "okay"; +}; diff --git a/overlays/colibri-imx6ull_vga-640x480_overlay.dts b/overlays/colibri-imx6ull_vga-640x480_overlay.dts new file mode 100644 index 0000000..c1ce50a --- /dev/null +++ b/overlays/colibri-imx6ull_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 iMX6ULL and the +// video DAC providing analog RGB on the VGA connector. + +#include <dt-bindings/gpio/gpio.h> +#include <dt-bindings/interrupt-controller/irq.h> + +/dts-v1/; +/plugin/; + +/ { + compatible = "toradex,colibri-imx6ull-emmc"; +}; + +#include "colibri-imx6ull_parallel-rgb_overlay.dtsi" +#include "display-vga-640x480_overlay.dtsi" diff --git a/overlays/display-vga-640x480_overlay.dtsi b/overlays/display-vga-640x480_overlay.dtsi index 4f4556e..ab533cb 100644 --- a/overlays/display-vga-640x480_overlay.dtsi +++ b/overlays/display-vga-640x480_overlay.dtsi @@ -25,5 +25,6 @@ vback-porch = <33>; hsync-active = <0>; vsync-active = <0>; + pixelclk-active = <0>; }; }; |