mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-17 10:18:38 +00:00
d3655bbb13
Synchronizing the device tree with linux introduced a regression.
The U-Boot specific dtsi mustn't override the alias settings for
the eMMC/SD interfaces.
Without this U-Boot cannot access the eMMC and boot the kernel.
Fixes: c21b61bff1 ("colibri-imx6ull/-emmc: synchronise device tree with linux")
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
56 lines
977 B
Text
56 lines
977 B
Text
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
|
|
/*
|
|
* Copyright 2019-2022 Toradex
|
|
*/
|
|
|
|
/ {
|
|
aliases {
|
|
u-boot,dm-pre-reloc;
|
|
usb0 = &usbotg1; /* required for ums */
|
|
display0 = &lcdif;
|
|
};
|
|
};
|
|
|
|
&pinctrl_uart1 {
|
|
u-boot,dm-pre-reloc;
|
|
};
|
|
|
|
&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>;
|
|
};
|
|
};
|
|
};
|
|
};
|