From eeeb8c1a601d74363f83fa8ac978683b2dae1bc6 Mon Sep 17 00:00:00 2001 From: Philippe Schenker Date: Tue, 11 Oct 2022 14:51:20 +0200 Subject: verdins: convert dsi-to-lvds overlays to new naming Related-to: ELB-4838 Signed-off-by: Philippe Schenker --- overlays/Makefile | 8 +- overlays/display-lp156wf1_sn65dsi84_overlay.dtsi | 71 ++++++++++++++++++ overlays/display-lt170410_sn65dsi84_overlay.dtsi | 53 ++++++++++++++ overlays/touch-atmel-mxt_overlay.dts | 18 ----- overlays/verdin-imx8_mipi-dsi-to-sn65dsi84.dtsi | 37 ++++++++++ ...to-lvds_panel-cap-touch-10inch-lvds_overlay.dts | 48 ++++++++++++ .../verdin-imx8mm_sn65dsi84-lt170410_overlay.dts | 61 ---------------- overlays/verdin-imx8mm_sn65dsi84_overlay.dts | 61 ---------------- ...to-lvds_panel-cap-touch-10inch-lvds_overlay.dts | 61 ++++++++++++++++ ...-lvds_panel-lvds-dual-channel-1080p_overlay.dts | 59 +++++++++++++++ .../verdin-imx8mp_sn65dsi84-lt170410_overlay.dts | 58 --------------- overlays/verdin-imx8mp_sn65dsi84_overlay.dts | 85 ---------------------- 12 files changed, 332 insertions(+), 288 deletions(-) create mode 100644 overlays/display-lp156wf1_sn65dsi84_overlay.dtsi create mode 100644 overlays/display-lt170410_sn65dsi84_overlay.dtsi delete mode 100644 overlays/touch-atmel-mxt_overlay.dts create mode 100644 overlays/verdin-imx8_mipi-dsi-to-sn65dsi84.dtsi create mode 100644 overlays/verdin-imx8mm_dsi-to-lvds_panel-cap-touch-10inch-lvds_overlay.dts delete mode 100644 overlays/verdin-imx8mm_sn65dsi84-lt170410_overlay.dts delete mode 100644 overlays/verdin-imx8mm_sn65dsi84_overlay.dts create mode 100644 overlays/verdin-imx8mp_dsi-to-lvds_panel-cap-touch-10inch-lvds_overlay.dts create mode 100644 overlays/verdin-imx8mp_dsi-to-lvds_panel-lvds-dual-channel-1080p_overlay.dts delete mode 100644 overlays/verdin-imx8mp_sn65dsi84-lt170410_overlay.dts delete mode 100644 overlays/verdin-imx8mp_sn65dsi84_overlay.dts diff --git a/overlays/Makefile b/overlays/Makefile index 83926f6..3888551 100644 --- a/overlays/Makefile +++ b/overlays/Makefile @@ -46,15 +46,15 @@ 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 += touch-atmel-mxt_overlay.dtbo dtb-y += verdin-imx8mm_20mhz_can1.dtbo dtb-y += verdin-imx8mm_disable_can1.dtbo +dtb-y += verdin-imx8mm_dsi-to-lvds_panel-cap-touch-10inch-lvds_overlay.dtbo dtb-y += verdin-imx8mm_hmp.dtbo dtb-y += verdin-imx8mm_lt8912_overlay.dtbo dtb-y += verdin-imx8mm_ov5640_overlay.dtbo -dtb-y += verdin-imx8mm_sn65dsi84_overlay.dtbo -dtb-y += verdin-imx8mm_sn65dsi84-lt170410_overlay.dtbo dtb-y += verdin-imx8mm_spidev_overlay.dtbo +dtb-y += verdin-imx8mp_dsi-to-lvds_panel-cap-touch-10inch-lvds_overlay.dtbo +dtb-y += verdin-imx8mp_dsi-to-lvds_panel-lvds-dual-channel-1080p_overlay.dtbo dtb-y += verdin-imx8mp_lt8912_overlay.dtbo dtb-y += verdin-imx8mp_mezzanine-lvds-dual-channel_overlay.dtbo dtb-y += verdin-imx8mp_mezzanine-lvds-single-channel_overlay.dtbo @@ -63,8 +63,6 @@ dtb-y += verdin-imx8mp_mezzanine-ov5640-2_overlay.dtbo dtb-y += verdin-imx8mp_mezzanine-touch-atmel-mxt_overlay.dtbo dtb-y += verdin-imx8mp_native-hdmi_overlay.dtbo dtb-y += verdin-imx8mp_ov5640_overlay.dtbo -dtb-y += verdin-imx8mp_sn65dsi84_overlay.dtbo -dtb-y += verdin-imx8mp_sn65dsi84-lt170410_overlay.dtbo dtb-y += verdin-imx8mp_spidev_overlay.dtbo targets += $(dtb-y) diff --git a/overlays/display-lp156wf1_sn65dsi84_overlay.dtsi b/overlays/display-lp156wf1_sn65dsi84_overlay.dtsi new file mode 100644 index 0000000..093f725 --- /dev/null +++ b/overlays/display-lp156wf1_sn65dsi84_overlay.dtsi @@ -0,0 +1,71 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/* + * Copyright 2020-2022 Toradex + */ + +// Display timing for LP156WF1 panel 1920x1080p60. Standard: SMPTE 274M + +&lvds_ti_sn65dsi84 { + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@2 { + reg = <2>; + + lvds_out_panel_odd: endpoint { + remote-endpoint = <&panel_in_odd>; + }; + }; + + port@3 { + reg = <3>; + + lvds_out_panel_even: endpoint { + remote-endpoint = <&panel_in_even>; + }; + }; + }; +}; + +&panel_lvds { + compatible = "panel-lvds"; + backlight = <&backlight>; + data-mapping = "jeida-18"; + height-mm = <198>; + width-mm = <348>; + status = "okay"; + + panel-timing { + clock-frequency = <138500000>; + hactive = <1920>; + vactive = <1080>; + hsync-len = <32>; + hfront-porch = <48>; + hback-porch = <80>; + vfront-porch = <9>; + vback-porch = <23>; + vsync-len = <5>; + }; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + dual-lvds-odd-pixels; + panel_in_odd: endpoint { + remote-endpoint = <&lvds_out_panel_odd>; + }; + }; + + port@1 { + reg = <1>; + dual-lvds-even-pixels; + panel_in_even: endpoint { + remote-endpoint = <&lvds_out_panel_even>; + }; + }; + }; +}; diff --git a/overlays/display-lt170410_sn65dsi84_overlay.dtsi b/overlays/display-lt170410_sn65dsi84_overlay.dtsi new file mode 100644 index 0000000..de868a8 --- /dev/null +++ b/overlays/display-lt170410_sn65dsi84_overlay.dtsi @@ -0,0 +1,53 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/* + * Copyright 2020-2022 Toradex + */ + +// Verdin DSI to LVDS Adapter with connected LT170410 display (10 inch) with a +// resolution of 1280x800 pixel. Adapter and display can be ordered at Toradex. + +&lvds_ti_sn65dsi84 { + status = "okay"; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@2 { + reg = <2>; + + lvds_out_panel: endpoint { + remote-endpoint = <&panel_in_lvds>; + }; + }; + }; +}; + +&panel_lvds { + compatible = "panel-lvds"; + backlight = <&backlight>; + data-mapping = "vesa-24"; + height-mm = <136>; + width-mm = <217>; + status = "okay"; + + panel-timing { + clock-frequency = <68900000 71100000 73400000>; + de-active = <1>; + hactive = <1280 1280 1280>; + hback-porch = <23 60 71>; + hfront-porch = <23 60 71>; + hsync-len = <15 40 47>; + pixelclk-active = <1>; /* positive edge */ + vactive = <800 800 800>; + vback-porch = <5 7 10>; + vfront-porch = <5 7 10>; + vsync-len = <6 9 12>; + }; + + port { + panel_in_lvds: endpoint { + remote-endpoint = <&lvds_out_panel>; + }; + }; +}; diff --git a/overlays/touch-atmel-mxt_overlay.dts b/overlays/touch-atmel-mxt_overlay.dts deleted file mode 100644 index 849ca8f..0000000 --- a/overlays/touch-atmel-mxt_overlay.dts +++ /dev/null @@ -1,18 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-or-later OR MIT -/* - * Copyright 2020-2021 Toradex - */ - -// Atmel MXT touchscreen for the 7 inch and 10 inch display orderable at Toradex. - -/dts-v1/; -/plugin/; - -/ { - compatible = "toradex,verdin-imx8mm", - "toradex,verdin-imx8mp"; -}; - -&atmel_mxt_ts { - status = "okay"; -}; diff --git a/overlays/verdin-imx8_mipi-dsi-to-sn65dsi84.dtsi b/overlays/verdin-imx8_mipi-dsi-to-sn65dsi84.dtsi new file mode 100644 index 0000000..b5d7c6d --- /dev/null +++ b/overlays/verdin-imx8_mipi-dsi-to-sn65dsi84.dtsi @@ -0,0 +1,37 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/* + * Copyright 2022 Toradex + */ + +// Common Code to setup MIPI DSI to SN65DSI84 + +&lvds_ti_sn65dsi84 { + status = "okay"; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + + dsi84_in: endpoint { + remote-endpoint = <&mipi_dsi_bridge1_out>; + data-lanes = <1 2 3 4>; + }; + }; + }; +}; + +&mipi_dsi { + #address-cells = <1>; + #size-cells = <0>; + status = "okay"; + + port@1 { + mipi_dsi_bridge1_out: endpoint { + attach-bridge; + remote-endpoint = <&dsi84_in>; + }; + }; +}; diff --git a/overlays/verdin-imx8mm_dsi-to-lvds_panel-cap-touch-10inch-lvds_overlay.dts b/overlays/verdin-imx8mm_dsi-to-lvds_panel-cap-touch-10inch-lvds_overlay.dts new file mode 100644 index 0000000..c81a28e --- /dev/null +++ b/overlays/verdin-imx8mm_dsi-to-lvds_panel-cap-touch-10inch-lvds_overlay.dts @@ -0,0 +1,48 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/* + * Copyright 2020-2022 Toradex + */ + +// Verdin DSI to LVDS Adapter with plugged in +// Capacitive Touch Display 10.1" LVDS orderable at Toradex. + +/dts-v1/; +/plugin/; + +/ { + compatible = "toradex,verdin-imx8mm"; +}; + +#include "verdin-imx8_mipi-dsi-to-sn65dsi84.dtsi" +#include "display-lt170410_sn65dsi84_overlay.dtsi" + +&atmel_mxt_ts { + status = "okay"; +}; + +&backlight { + status = "okay"; +}; + +&gpu { + status = "okay"; +}; + +/* Verdin I2C_1 */ +&i2c4 { + status = "okay"; +}; + +&lcdif { + status = "okay"; +}; + +&panel_lvds { + panel-timing { + /* + * Take the minimum pixelclock as 71.1 MHz is + * not working on NXP i.MX 8M Mini + */ + clock-frequency = <68900000>; + }; +}; diff --git a/overlays/verdin-imx8mm_sn65dsi84-lt170410_overlay.dts b/overlays/verdin-imx8mm_sn65dsi84-lt170410_overlay.dts deleted file mode 100644 index 3a5bbf6..0000000 --- a/overlays/verdin-imx8mm_sn65dsi84-lt170410_overlay.dts +++ /dev/null @@ -1,61 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-or-later OR MIT -/* - * Copyright 2020-2022 Toradex - */ - -// Verdin DSI to LVDS Adapter with connected LT170410 display (10 inch) with a -// resolution of 1280x800 pixel. Adapter and display can be ordered at Toradex. - -/dts-v1/; -/plugin/; - -/ { - compatible = "toradex,verdin-imx8mm"; -}; - -&lvds_ti_sn65dsi84 { - ports { - #address-cells = <1>; - #size-cells = <0>; - - port@2 { - reg = <2>; - - lvds_out_panel: endpoint { - remote-endpoint = <&panel_in_lvds>; - }; - }; - }; -}; - -&panel_lvds { - backlight = <&backlight>; - data-mapping = "vesa-24"; - height-mm = <136>; - width-mm = <217>; - status = "okay"; - - panel-timing { - /* - * Take the minimum pixelclock as 71.1 MHz is - * not working on NXP i.MX 8M Mini - */ - clock-frequency = <68900000>; - de-active = <1>; - hactive = <1280 1280 1280>; - hback-porch = <23 60 71>; - hfront-porch = <23 60 71>; - hsync-len = <15 40 47>; - pixelclk-active = <1>; /* positive edge */ - vactive = <800 800 800>; - vback-porch = <5 7 10>; - vfront-porch = <5 7 10>; - vsync-len = <6 9 12>; - }; - - port { - panel_in_lvds: endpoint { - remote-endpoint = <&lvds_out_panel>; - }; - }; -}; diff --git a/overlays/verdin-imx8mm_sn65dsi84_overlay.dts b/overlays/verdin-imx8mm_sn65dsi84_overlay.dts deleted file mode 100644 index 6108483..0000000 --- a/overlays/verdin-imx8mm_sn65dsi84_overlay.dts +++ /dev/null @@ -1,61 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-or-later OR MIT -/* - * Copyright 2020-2022 Toradex - */ - -// Verdin DSI to LVDS Adapter orderable at Toradex. - -/dts-v1/; -/plugin/; - -/ { - compatible = "toradex,verdin-imx8mm"; -}; - -&backlight { - status = "okay"; -}; - -&gpu { - status = "okay"; -}; - -/* Verdin I2C_1 */ -&i2c4 { - status = "okay"; -}; - -&lcdif { - status = "okay"; -}; - -&lvds_ti_sn65dsi84 { - status = "okay"; - - ports { - #address-cells = <1>; - #size-cells = <0>; - - port@0 { - reg = <0>; - - dsi84_in: endpoint { - remote-endpoint = <&mipi_dsi_bridge1_out>; - data-lanes = <1 2 3 4>; - }; - }; - }; -}; - -&mipi_dsi { - #address-cells = <1>; - #size-cells = <0>; - status = "okay"; - - port@1 { - mipi_dsi_bridge1_out: endpoint { - attach-bridge; - remote-endpoint = <&dsi84_in>; - }; - }; -}; diff --git a/overlays/verdin-imx8mp_dsi-to-lvds_panel-cap-touch-10inch-lvds_overlay.dts b/overlays/verdin-imx8mp_dsi-to-lvds_panel-cap-touch-10inch-lvds_overlay.dts new file mode 100644 index 0000000..85cefa5 --- /dev/null +++ b/overlays/verdin-imx8mp_dsi-to-lvds_panel-cap-touch-10inch-lvds_overlay.dts @@ -0,0 +1,61 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/* + * Copyright 2020-2022 Toradex + */ + +// Verdin DSI to LVDS Adapter orderable at Toradex. + +/dts-v1/; +/plugin/; + +/ { + compatible = "toradex,verdin-imx8mp"; +}; + +#include "verdin-imx8_mipi-dsi-to-sn65dsi84.dtsi" +#include "display-lt170410_sn65dsi84_overlay.dtsi" + +&atmel_mxt_ts { + status = "okay"; +}; + +&backlight { + status = "okay"; +}; + +&gpu_2d { + status = "okay"; +}; + +&gpu_3d { + status = "okay"; +}; + +/* LCDIF to MIPI-DSI */ +&lcdif1 { + status = "okay"; +}; + +&mix_gpu_ml { + status = "okay"; +}; + +&ml_vipsi { + status = "okay"; +}; + +&vpu_g1 { + status = "okay"; +}; + +&vpu_g2 { + status = "okay"; +}; + +&vpu_vc8000e { + status = "okay"; +}; + +&vpu_v4l2 { + status = "okay"; +}; diff --git a/overlays/verdin-imx8mp_dsi-to-lvds_panel-lvds-dual-channel-1080p_overlay.dts b/overlays/verdin-imx8mp_dsi-to-lvds_panel-lvds-dual-channel-1080p_overlay.dts new file mode 100644 index 0000000..87d8ea5 --- /dev/null +++ b/overlays/verdin-imx8mp_dsi-to-lvds_panel-lvds-dual-channel-1080p_overlay.dts @@ -0,0 +1,59 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/* + * Copyright 2020-2022 Toradex + */ + +// Verdin DSI to LVDS Adapter connected to a LP156WF1 display (15 inch) with a +// resolution of 1920x1080 pixel. +// This serves as an example how to specify a dual link LVDS display + +/dts-v1/; +/plugin/; + +/ { + compatible = "toradex,verdin-imx8mp"; +}; + +#include "verdin-imx8_mipi-dsi-to-sn65dsi84.dtsi" +#include "display-lp156wf1_sn65dsi84_overlay.dtsi" + +&backlight { + status = "okay"; +}; + +&gpu_2d { + status = "okay"; +}; + +&gpu_3d { + status = "okay"; +}; + +/* LCDIF to MIPI-DSI */ +&lcdif1 { + status = "okay"; +}; + +&mix_gpu_ml { + status = "okay"; +}; + +&ml_vipsi { + status = "okay"; +}; + +&vpu_g1 { + status = "okay"; +}; + +&vpu_g2 { + status = "okay"; +}; + +&vpu_vc8000e { + status = "okay"; +}; + +&vpu_v4l2 { + status = "okay"; +}; diff --git a/overlays/verdin-imx8mp_sn65dsi84-lt170410_overlay.dts b/overlays/verdin-imx8mp_sn65dsi84-lt170410_overlay.dts deleted file mode 100644 index 01ee40e..0000000 --- a/overlays/verdin-imx8mp_sn65dsi84-lt170410_overlay.dts +++ /dev/null @@ -1,58 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-or-later OR MIT -/* - * Copyright 2020-2022 Toradex - */ - -// Verdin DSI to LVDS Adapter with connected LT170410 display (10 inch) with a -// resolution of 1280x800 pixel. Adapter and display can be ordered at Toradex. - -/dts-v1/; -/plugin/; - -/ { - compatible = "toradex,verdin-imx8mp"; -}; - -&lvds_ti_sn65dsi84 { - ports { - #address-cells = <1>; - #size-cells = <0>; - - port@2 { - reg = <2>; - - lvds_out_panel: endpoint { - remote-endpoint = <&panel_in_lvds>; - }; - }; - }; -}; - -&panel_lvds { - compatible = "panel-lvds"; - backlight = <&backlight>; - data-mapping = "vesa-24"; - height-mm = <136>; - width-mm = <217>; - status = "okay"; - - panel-timing { - clock-frequency = <68900000 71100000 73400000>; - de-active = <1>; - hactive = <1280 1280 1280>; - hback-porch = <23 60 71>; - hfront-porch = <23 60 71>; - hsync-len = <15 40 47>; - pixelclk-active = <1>; /* positive edge */ - vactive = <800 800 800>; - vback-porch = <5 7 10>; - vfront-porch = <5 7 10>; - vsync-len = <6 9 12>; - }; - - port { - panel_in_lvds: endpoint { - remote-endpoint = <&lvds_out_panel>; - }; - }; -}; diff --git a/overlays/verdin-imx8mp_sn65dsi84_overlay.dts b/overlays/verdin-imx8mp_sn65dsi84_overlay.dts deleted file mode 100644 index 72f67e0..0000000 --- a/overlays/verdin-imx8mp_sn65dsi84_overlay.dts +++ /dev/null @@ -1,85 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-or-later OR MIT -/* - * Copyright 2020-2022 Toradex - */ - -// Verdin DSI to LVDS Adapter orderable at Toradex. - -/dts-v1/; -/plugin/; - -/ { - compatible = "toradex,verdin-imx8mp"; -}; - -&backlight { - status = "okay"; -}; - -&gpu_2d { - status = "okay"; -}; - -&gpu_3d { - status = "okay"; -}; - -/* LCDIF to MIPI-DSI */ -&lcdif1 { - status = "okay"; -}; - -&lvds_ti_sn65dsi84 { - status = "okay"; - - ports { - #address-cells = <1>; - #size-cells = <0>; - - port@0 { - reg = <0>; - - dsi84_in: endpoint { - data-lanes = <1 2 3 4>; - remote-endpoint = <&mipi_dsi_bridge1_out>; - }; - }; - }; -}; - -&mipi_dsi { - #address-cells = <1>; - #size-cells = <0>; - status = "okay"; - - port@1 { - mipi_dsi_bridge1_out: endpoint { - attach-bridge; - remote-endpoint = <&dsi84_in>; - }; - }; -}; - -&mix_gpu_ml { - status = "okay"; -}; - -&ml_vipsi { - status = "okay"; -}; - -&vpu_g1 { - status = "okay"; -}; - -&vpu_g2 { - status = "okay"; -}; - -&vpu_vc8000e { - status = "okay"; -}; - -&vpu_v4l2 { - status = "okay"; -}; -- cgit v1.2.3