diff options
Diffstat (limited to 'arch/arm/boot')
| -rw-r--r-- | arch/arm/boot/dts/Makefile | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx7ulp-evk-mipi.dts (renamed from arch/arm/boot/dts/imx7ulp-evk-hdmi.dts) | 23 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx7ulp-evk.dts | 28 |
3 files changed, 33 insertions, 20 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 5fbae2e9ade8..b0d8d158f8bf 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -660,7 +660,7 @@ dtb-$(CONFIG_SOC_IMX7ULP) += \ imx7ulp-evk-lpuart.dtb \ imx7ulp-evk-qspi.dtb \ imx7ulp-evk-wm8960.dtb \ - imx7ulp-evk-hdmi.dtb \ + imx7ulp-evk-mipi.dtb \ imx7ulp-evk-sensors-to-i2c5.dtb dtb-$(CONFIG_SOC_LS1021A) += \ ls1021a-qds.dtb \ diff --git a/arch/arm/boot/dts/imx7ulp-evk-hdmi.dts b/arch/arm/boot/dts/imx7ulp-evk-mipi.dts index d56c8e147a2b..2c10cba9a85a 100644 --- a/arch/arm/boot/dts/imx7ulp-evk-hdmi.dts +++ b/arch/arm/boot/dts/imx7ulp-evk-mipi.dts @@ -9,18 +9,19 @@ #include "imx7ulp-evk.dts" &adv7535 { - status = "okay"; - port { - dsi_to_hdmi: endpoint { - remote-endpoint = <&mipi_dsi_ep>; - }; - }; + status = "disabled"; + + /delete-node/ port; }; &mipi_dsi { - port { - mipi_dsi_ep: endpoint { - remote-endpoint = <&dsi_to_hdmi>; - }; - }; + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&pinctrl_mipi_dsi_reset>; + pinctrl-1 = <&pinctrl_mipi_dsi_reset>; + lcd_panel = "TRULY-WVGA-TFT3P5581E"; + resets = <&mipi_dsi_reset>; + + /delete-node/ port; }; + + diff --git a/arch/arm/boot/dts/imx7ulp-evk.dts b/arch/arm/boot/dts/imx7ulp-evk.dts index c9f6cf9db7aa..90b0d767bfd7 100644 --- a/arch/arm/boot/dts/imx7ulp-evk.dts +++ b/arch/arm/boot/dts/imx7ulp-evk.dts @@ -439,9 +439,9 @@ interrupt-parent = <&gpio_ptc>; interrupts = <18 IRQ_TYPE_EDGE_FALLING>; video-mode = <1>; /* - * Only support CEA modes. - * Reference mxc_edid.c - */ + * Only support CEA modes. + * Reference mxc_edid.c + */ dsi-traffic-mode = <0>; bpp = <24>; status = "disabled"; @@ -463,13 +463,25 @@ }; }; + +&adv7535 { + status = "okay"; + + port { + dsi_to_hdmi: endpoint { + remote-endpoint = <&mipi_dsi_ep>; + }; + }; +}; + &mipi_dsi { - pinctrl-names = "default", "sleep"; - pinctrl-0 = <&pinctrl_mipi_dsi_reset>; - pinctrl-1 = <&pinctrl_mipi_dsi_reset>; - lcd_panel = "TRULY-WVGA-TFT3P5581E"; - resets = <&mipi_dsi_reset>; status = "okay"; + + port { + mipi_dsi_ep: endpoint { + remote-endpoint = <&dsi_to_hdmi>; + }; + }; }; &lpuart4 { /* console */ |