From 67d25b21cf8b6b8a68320763dfc551b552899c12 Mon Sep 17 00:00:00 2001 From: Philippe Schenker Date: Mon, 24 Aug 2020 16:37:31 +0200 Subject: Revert "colibri-imx8x: convert MIPI-DSI-HDMI to syntactic sugar" This reverts commit f2fa129bbb3dda21454a501bf6efb1e830a10280. Syntactic sugar is not fully supported on 4.14 kernel revert all overlays for this branch Signed-off-by: Philippe Schenker --- overlays/colibri-imx8x_dsihdmi_overlay.dts | 335 ++++++++++++++++++----------- 1 file changed, 214 insertions(+), 121 deletions(-) diff --git a/overlays/colibri-imx8x_dsihdmi_overlay.dts b/overlays/colibri-imx8x_dsihdmi_overlay.dts index 5e80855..f1ccfb5 100644 --- a/overlays/colibri-imx8x_dsihdmi_overlay.dts +++ b/overlays/colibri-imx8x_dsihdmi_overlay.dts @@ -7,171 +7,264 @@ /plugin/; / { compatible = "toradex,colibri-imx8qxp"; -}; -&gpu_3d0 { - status = "okay"; -}; + fragment@0 { + target = <&ldb2>; + __overlay__ { + status = "okay"; + }; + }; -&i2c0_mipi_lvds0 { - status = "okay"; + fragment@1 { + target = <&ldb2_phy>; + __overlay__ { + status = "okay"; + }; + }; - #address-cells = <1>; - #size-cells = <0>; + fragment@2 { + target = <&mipi_dsi_phy1>; + __overlay__ { + status = "okay"; + }; + }; - /* DSI to HDMI Adapter V1.1A */ - i2c-switch@70 { - compatible = "nxp,pca9540"; - #address-cells = <1>; - #size-cells = <0>; - reg = <0x70>; - i2c-mux-idle-disconnect; + fragment@3 { + target = <&mipi_dsi1>; + __overlay__ { + status = "okay"; + }; + }; - i2c_sw0: i2c-sw@0 { - #address-cells = <1>; - #size-cells = <0>; - reg = <0>; + fragment@4 { + target = <&mipi_dsi_bridge1>; + __overlay__ { + status = "okay"; + port@1 { + mipi_dsi_bridge1_out: endpoint { + remote-endpoint = <<8912_1_in>; + }; + }; + }; + }; - /* DDC/EDID */ + fragment@5 { + target = <&iomuxc>; + __overlay__ { + colibri-imx8qxp { + /* DSI/LVDS Hot Plug Detect on FFC (X2) */ + pinctrl_gpio_hpd: gpio-hpd { + fsl,pins = < + SC_P_MIPI_DSI1_GPIO0_00_LSIO_GPIO1_IO31 0x20 /* SODIMM 138 */ + >; + }; + }; }; + }; + + fragment@6 { + target = <&i2c0_mipi_lvds0>; - i2c-sw@1 { - #address-cells = <1>; - #size-cells = <0>; - reg = <1>; + __overlay__ { + status = "okay"; - lt8912@48 { - compatible = "lontium,lt8912"; - ddc-i2c-bus = <&i2c_sw0>; - hpd-gpios = <&gpio1 31 GPIO_ACTIVE_HIGH>; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_gpio_hpd>; - reg = <0x48>; + /* DSI to HDMI Adapter V1.1A */ + i2c-switch@70 { + compatible = "nxp,pca9540"; + #address-cells = <1>; + #size-cells = <0>; + reg = <0x70>; + i2c-mux-idle-disconnect; - port { - lt8912_1_in: endpoint { - remote-endpoint = <&mipi_dsi_bridge1_out>; + i2c_sw0: i2c-sw@0 { + #address-cells = <1>; + #size-cells = <0>; + reg = <0>; + + /* DDC/EDID */ + }; + + i2c-sw@1 { + #address-cells = <1>; + #size-cells = <0>; + reg = <1>; + + lt8912@48 { + compatible = "lontium,lt8912"; + ddc-i2c-bus = <&i2c_sw0>; + hpd-gpios = <&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>; + }; + }; }; }; }; }; }; -}; -&iomuxc { - colibri-imx8qxp { - /* DSI/LVDS Hot Plug Detect on FFC (X2) */ - pinctrl_gpio_hpd: gpio-hpd { - fsl,pins = < - SC_P_MIPI_DSI1_GPIO0_00_LSIO_GPIO1_IO31 0x20 /* SODIMM 138 */ - >; + fragment@7 { + target = <&pixel_combiner>; + + __overlay__ { + status = "okay"; }; }; -}; -&ldb1 { - status = "disabled"; -}; + fragment@8 { + target = <&prg1>; -&ldb1_phy { - status = "disabled"; -}; + __overlay__ { + status = "okay"; + }; + }; -&ldb2 { - status = "okay"; -}; + fragment@9 { + target = <&prg2>; -&ldb2_phy { - status = "okay"; -}; + __overlay__ { + status = "okay"; + }; + }; + + fragment@10 { + target = <&prg3>; -&mipi_dsi_bridge1 { - status = "okay"; + __overlay__ { + status = "okay"; + }; + }; - #address-cells = <1>; - #size-cells = <0>; + fragment@11 { + target = <&prg4>; - port@1 { - reg = <1>; - mipi_dsi_bridge1_out: endpoint { - remote-endpoint = <<8912_1_in>; + __overlay__ { + status = "okay"; }; }; -}; -&mipi_dsi_phy1 { - status = "okay"; -}; + fragment@12 { + target = <&prg5>; -&mipi_dsi1 { - status = "okay"; -}; + __overlay__ { + status = "okay"; + }; + }; -&pixel_combiner { - status = "okay"; -}; + fragment@13 { + target = <&prg6>; -&prg1 { - status = "okay"; -}; + __overlay__ { + status = "okay"; + }; + }; -&prg2 { - status = "okay"; -}; + fragment@14 { + target = <&prg7>; -&prg3 { - status = "okay"; -}; + __overlay__ { + status = "okay"; + }; + }; -&prg4 { - status = "okay"; -}; + fragment@15 { + target = <&prg8>; -&prg5 { - status = "okay"; -}; + __overlay__ { + status = "okay"; + }; + }; -&prg6 { - status = "okay"; -}; + fragment@16 { + target = <&prg9>; -&prg7 { - status = "okay"; -}; + __overlay__ { + status = "okay"; + }; + }; -&prg8 { - status = "okay"; -}; + fragment@17 { + target = <&ldb1_phy>; -&prg9 { - status = "okay"; -}; + __overlay__ { + status = "disabled"; + }; + }; -&dpr1_channel1 { - status = "okay"; -}; + fragment@18 { + target = <&ldb1>; -&dpr1_channel2 { - status = "okay"; -}; + __overlay__ { + status = "disabled"; + }; + }; -&dpr1_channel3 { - status = "okay"; -}; + fragment@19 { + target = <&gpu_3d0>; -&dpr2_channel1 { - status = "okay"; -}; + __overlay__ { + status = "okay"; + }; + }; -&dpr2_channel2 { - status = "okay"; -}; + fragment@20 { + target = <&dpu1>; -&dpr2_channel3 { - status = "okay"; -}; + __overlay__ { + status = "okay"; + }; + }; -&dpu1 { - status = "okay"; -}; + fragment@21 { + target = <&dpr1_channel1>; + + __overlay__ { + status = "okay"; + }; + }; + + fragment@22 { + target = <&dpr1_channel2>; + + __overlay__ { + status = "okay"; + }; + }; + + fragment@23 { + target = <&dpr1_channel3>; + + __overlay__ { + status = "okay"; + }; + }; + fragment@24 { + target = <&dpr2_channel1>; + + __overlay__ { + status = "okay"; + }; + }; + + fragment@25 { + target = <&dpr2_channel2>; + + __overlay__ { + status = "okay"; + }; + }; + + fragment@26 { + target = <&dpr2_channel3>; + + __overlay__ { + status = "okay"; + }; + }; +}; -- cgit v1.2.3