diff options
| author | Tom Rini <trini@konsulko.com> | 2020-08-04 18:11:02 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-08-04 18:11:02 +0300 |
| commit | f1c0b7cd4be2081ae3711cec2c4cc2910a5817e1 (patch) | |
| tree | 694f503767f8511bffc8c5e6360f542e50428a0d /arch/arm/dts/imx6ull-colibri-u-boot.dtsi | |
| parent | 993b59f0451cb102f23714478a64361b44694fc6 (diff) | |
| parent | 3e980a2d8bd13d0d1c2d5cec9e57a47b6cff8b92 (diff) | |
| download | u-boot-f1c0b7cd4be2081ae3711cec2c4cc2910a5817e1.tar.xz | |
Merge tag 'u-boot-imx-20200804' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx
For 2020.10
-----------
- fixes for Toradex board
- fix warnings from previous PR
- HAB: reset instead of panic after failure
- new board: MYiR Tech MYS-6ULX
- mx6cuboxi: use OF_PLATDATA
- further changes for DM
Travis: https://travis-ci.org/github/sbabic/u-boot-imx/builds/714513163
Diffstat (limited to 'arch/arm/dts/imx6ull-colibri-u-boot.dtsi')
| -rw-r--r-- | arch/arm/dts/imx6ull-colibri-u-boot.dtsi | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/arch/arm/dts/imx6ull-colibri-u-boot.dtsi b/arch/arm/dts/imx6ull-colibri-u-boot.dtsi index 531cdcc4da..afdb0f43cf 100644 --- a/arch/arm/dts/imx6ull-colibri-u-boot.dtsi +++ b/arch/arm/dts/imx6ull-colibri-u-boot.dtsi @@ -3,6 +3,15 @@ * Copyright 2019 Toradex AG */ +/ { + aliases { + u-boot,dm-pre-reloc; + mmc0 = &usdhc1; + usb0 = &usbotg1; /* required for ums */ + display0 = &lcdif; + }; +}; + &pinctrl_uart1 { u-boot,dm-pre-reloc; }; @@ -10,3 +19,39 @@ &pinctrl_uart1_ctrl1 { u-boot,dm-pre-reloc; }; + +&lcdif { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_lcdif_dat + &pinctrl_lcdif_ctrl>; + status = "okay"; + display = <&display0>; + u-boot,dm-pre-reloc; + + display0: display0 { + bits-per-pixel = <18>; + bus-width = <24>; + status = "okay"; + + display-timings { + native-mode = <&timing_vga>; + timing_vga: 640x480 { + u-boot,dm-pre-reloc; + clock-frequency = <25175000>; + hactive = <640>; + vactive = <480>; + hback-porch = <40>; + hfront-porch = <24>; + vback-porch = <32>; + vfront-porch = <11>; + hsync-len = <96>; + vsync-len = <2>; + + de-active = <1>; + hsync-active = <0>; + vsync-active = <0>; + pixelclk-active = <0>; + }; + }; + }; +}; |