diff options
-rw-r--r-- | arch/arm64/boot/dts/freescale/imx8qxp-colibri-eval-v3.dtsi | 35 | ||||
-rw-r--r-- | arch/arm64/boot/dts/freescale/imx8qxp-colibri.dtsi | 33 |
2 files changed, 30 insertions, 38 deletions
diff --git a/arch/arm64/boot/dts/freescale/imx8qxp-colibri-eval-v3.dtsi b/arch/arm64/boot/dts/freescale/imx8qxp-colibri-eval-v3.dtsi index 481c915db2db..196e1d2fe357 100644 --- a/arch/arm64/boot/dts/freescale/imx8qxp-colibri-eval-v3.dtsi +++ b/arch/arm64/boot/dts/freescale/imx8qxp-colibri-eval-v3.dtsi @@ -24,41 +24,6 @@ pinctrl-0 = <&pinctrl_usbc_det>; }; - panel_dpi: panel-dpi { - /* - * edt,et057090dhu: EDT 5.7" LCD TFT - * edt,et070080dh6: EDT 7.0" LCD TFT - * logictechno,lt161010-2nhc: Cap. Touch Display 7" Parallel - * logictechno,lt161010-2nhr: Res. Touch Display 7" Paralle - * logictechno,lt170410-2whc: Cap. Touch Display 10.1" LVDS - * tpk,f07a-0102: Capacitive Multi-Touch Display Fusion 7" - * tpk,f10a-0102: Capacitive Multi-Touch Display Fusion 10" - */ - compatible = "panel-dpi"; - backlight = <&backlight>; - power-supply = <®_3v3>; - - width-mm = <217>; - height-mm = <136>; - - data-mapping = "bgr666"; - status = "disabled"; - - panel-timing { - /* Default VESA VGA display timings */ - clock-frequency = <25175000>; - hactive = <640>; - hback-porch = <48>; - hfront-porch = <16>; - hsync-len = <96>; - vactive = <480>; - vback-porch = <31>; - vfront-porch = <11>; - vsync-len = <2>; - pixelclk-active = <0>; - }; - }; - reg_3v3: regulator-3v3 { compatible = "regulator-fixed"; regulator-name = "3.3V"; diff --git a/arch/arm64/boot/dts/freescale/imx8qxp-colibri.dtsi b/arch/arm64/boot/dts/freescale/imx8qxp-colibri.dtsi index 464828618620..06acbe833c96 100644 --- a/arch/arm64/boot/dts/freescale/imx8qxp-colibri.dtsi +++ b/arch/arm64/boot/dts/freescale/imx8qxp-colibri.dtsi @@ -15,7 +15,11 @@ compatible = "pwm-backlight"; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_gpio_bl_on>; + brightness-levels = <0 45 63 88 119 158 203 255>; + default-brightness-level = <4>; enable-gpios = <&lsio_gpio3 12 GPIO_ACTIVE_HIGH>; /* Colibri BL_ON */ + power-supply = <®_module_3v3>; + pwms = <&adma_pwm 0 6666667 PWM_POLARITY_INVERTED>; status = "disabled"; }; @@ -27,8 +31,6 @@ /* Colibri Parallel RGB */ display_lcdif: display@disp1 { compatible = "fsl,imx-lcdif-mux-display"; - #address-cells = <1>; - #size-cells = <0>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_lcdif>; clocks = <&clk IMX_SC_R_LCD_0 IMX_SC_PM_CLK_BYPASS>, @@ -41,6 +43,9 @@ power-domains = <&pd IMX_SC_R_LCD_0>; status = "disabled"; + #address-cells = <1>; + #size-cells = <0>; + port@0 { reg = <0>; @@ -48,7 +53,29 @@ remote-endpoint = <&dpu_disp1_lcdif>; }; }; - }; + + port@1 { + reg = <1>; + + lcd_display_out: endpoint { + remote-endpoint = <&lcd_panel_in>; + }; + }; + }; + + panel_dpi: panel-dpi { + compatible = "panel-dpi"; + backlight = <&backlight>; + data-mapping = "bgr666"; + power-supply = <®_module_3v3>; + status = "disabled"; + + port { + lcd_panel_in: endpoint { + remote-endpoint = <&lcd_display_out>; + }; + }; + }; pcie_refclk: pcie-clock-generator { compatible = "fixed-clock"; |