From 9b6d6b4bc9dee389abb163f9403148fd063b5d7f Mon Sep 17 00:00:00 2001 From: Oleksandr Suvorov Date: Fri, 11 Sep 2020 17:59:01 +0300 Subject: overlays: colibri/apalis-imx8qm/qxp: make compatible with toradex_5.4-2.1.x-imx Some NXP SoC subsystems are renamed. Fix names in overlay files to make them compatible to kernel version toradex_5.4-2.1.x-imx. Related-to: ELB-2900 Signed-off-by: Oleksandr Suvorov --- overlays/apalis-imx8qm_atmel-mxt_overlay.dts | 4 +- overlays/apalis-imx8x_ad7879_overlay.dts | 2 +- overlays/apalis-imx8x_atmel-mxt_overlay.dts | 6 +- overlays/colibri-imx8x_ad7879_overlay.dts | 2 +- overlays/colibri-imx8x_atmel-mxt_overlay.dts | 6 +- overlays/colibri-imx8x_dsihdmi_overlay.dts | 84 ++-------------------------- 6 files changed, 16 insertions(+), 88 deletions(-) diff --git a/overlays/apalis-imx8qm_atmel-mxt_overlay.dts b/overlays/apalis-imx8qm_atmel-mxt_overlay.dts index 8320e70..5f665bf 100644 --- a/overlays/apalis-imx8qm_atmel-mxt_overlay.dts +++ b/overlays/apalis-imx8qm_atmel-mxt_overlay.dts @@ -21,9 +21,9 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_touch>; reg = <0x4a>; - interrupt-parent = <&gpio4>; + interrupt-parent = <&lsio_gpio4>; interrupts = <1 IRQ_TYPE_EDGE_FALLING>; /* Apalis GPIO5 */ - reset-gpios = <&gpio4 2 GPIO_ACTIVE_HIGH>; /* Apalis GPIO6 */ + reset-gpios = <&lsio_gpio4 2 GPIO_ACTIVE_HIGH>; /* Apalis GPIO6 */ status = "okay"; }; }; diff --git a/overlays/apalis-imx8x_ad7879_overlay.dts b/overlays/apalis-imx8x_ad7879_overlay.dts index 4d497cc..3d9034b 100644 --- a/overlays/apalis-imx8x_ad7879_overlay.dts +++ b/overlays/apalis-imx8x_ad7879_overlay.dts @@ -21,7 +21,7 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_ad7879_int>; reg = <0x2c>; - interrupt-parent = <&gpio3>; + interrupt-parent = <&lsio_gpio3>; interrupts = <5 IRQ_TYPE_EDGE_FALLING>; touchscreen-max-pressure = <4096>; adi,resistance-plate-x = <120>; diff --git a/overlays/apalis-imx8x_atmel-mxt_overlay.dts b/overlays/apalis-imx8x_atmel-mxt_overlay.dts index dcab09e..a94cef8 100644 --- a/overlays/apalis-imx8x_atmel-mxt_overlay.dts +++ b/overlays/apalis-imx8x_atmel-mxt_overlay.dts @@ -21,9 +21,9 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_touch>; reg = <0x4a>; - interrupt-parent = <&gpio3>; - interrupts = <17 IRQ_TYPE_EDGE_FALLING>; /* Apalis GPIO5 */ - reset-gpios = <&gpio3 18 GPIO_ACTIVE_HIGH>; /* Apalis GPIO6 */ + interrupt-parent = <&lsio_gpio3>; + interrupts = <17 IRQ_TYPE_EDGE_FALLING>; /* Apalis GPIO5 */ + reset-gpios = <&lsio_gpio3 18 GPIO_ACTIVE_HIGH>; /* Apalis GPIO6 */ status = "okay"; }; }; diff --git a/overlays/colibri-imx8x_ad7879_overlay.dts b/overlays/colibri-imx8x_ad7879_overlay.dts index ab4db27..8de45d0 100644 --- a/overlays/colibri-imx8x_ad7879_overlay.dts +++ b/overlays/colibri-imx8x_ad7879_overlay.dts @@ -21,7 +21,7 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_ad7879_int>; reg = <0x2c>; - interrupt-parent = <&gpio3>; + interrupt-parent = <&lsio_gpio3>; interrupts = <5 IRQ_TYPE_EDGE_FALLING>; touchscreen-max-pressure = <4096>; adi,resistance-plate-x = <120>; diff --git a/overlays/colibri-imx8x_atmel-mxt_overlay.dts b/overlays/colibri-imx8x_atmel-mxt_overlay.dts index 1b1fe57..bc77b0c 100644 --- a/overlays/colibri-imx8x_atmel-mxt_overlay.dts +++ b/overlays/colibri-imx8x_atmel-mxt_overlay.dts @@ -21,9 +21,9 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_mxt_ts>; reg = <0x4a>; - interrupt-parent = <&gpio3>; - interrupts = <20 IRQ_TYPE_EDGE_FALLING>; /* SODIMM 107 */ - reset-gpios = <&gpio3 24 GPIO_ACTIVE_HIGH>; /* SODIMM 106 */ + interrupt-parent = <&lsio_gpio3>; + interrupts = <20 IRQ_TYPE_EDGE_FALLING>; /* SODIMM 107 */ + reset-gpios = <&lsio_gpio3 24 GPIO_ACTIVE_HIGH>; /* SODIMM 106 */ status = "okay"; }; }; diff --git a/overlays/colibri-imx8x_dsihdmi_overlay.dts b/overlays/colibri-imx8x_dsihdmi_overlay.dts index b055b07..810777f 100644 --- a/overlays/colibri-imx8x_dsihdmi_overlay.dts +++ b/overlays/colibri-imx8x_dsihdmi_overlay.dts @@ -9,10 +9,6 @@ compatible = "toradex,colibri-imx8qxp"; }; -&gpu_3d0 { - status = "okay"; -}; - &i2c0_mipi_lvds0 { status = "okay"; @@ -43,14 +39,14 @@ lt8912@48 { compatible = "lontium,lt8912"; ddc-i2c-bus = <&i2c_sw0>; - hpd-gpios = <&gpio1 31 GPIO_ACTIVE_HIGH>; + hpd-gpios = <&lsio_gpio1 31 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_gpio_hpd>; reg = <0x48>; port { lt8912_1_in: endpoint { - remote-endpoint = <&mipi_dsi_bridge1_out>; + remote-endpoint = <&mipi0_dsi_host_out>; }; }; }; @@ -85,7 +81,7 @@ status = "okay"; }; -&mipi_dsi_bridge1 { +&mipi0_dsi_host { status = "okay"; #address-cells = <1>; @@ -93,85 +89,17 @@ port@1 { reg = <1>; - mipi_dsi_bridge1_out: endpoint { + mipi0_dsi_host_out: endpoint { remote-endpoint = <<8912_1_in>; }; }; }; -&mipi_dsi_phy1 { - status = "okay"; -}; - -&mipi_dsi1 { - status = "okay"; -}; - -&pixel_combiner { - status = "okay"; -}; - -&prg1 { - status = "okay"; -}; - -&prg2 { - status = "okay"; -}; - -&prg3 { - status = "okay"; -}; - -&prg4 { - status = "okay"; -}; - -&prg5 { - status = "okay"; -}; - -&prg6 { - status = "okay"; -}; - -&prg7 { - status = "okay"; -}; - -&prg8 { - status = "okay"; -}; - -&prg9 { - status = "okay"; -}; - -&dpr1_channel1 { - status = "okay"; -}; - -&dpr1_channel2 { - status = "okay"; -}; - -&dpr1_channel3 { - status = "okay"; -}; - -&dpr2_channel1 { - status = "okay"; -}; - -&dpr2_channel2 { - status = "okay"; -}; - -&dpr2_channel3 { +&mipi0_dphy { status = "okay"; }; -&dpu1 { +&mipi1_dsi_host { status = "okay"; }; -- cgit v1.2.3