ARM: dts: imx6ull-colibri: move u-boot specific node
PATCH 1/6 ARM: dts: imx6ull-colibri: move u-boot specific node
From: Igor Opaniuk <[email protected]>
Move aliases and legacy lcdif node to the u-boot specific dts include.
---
arch/arm/dts/imx6ull-colibri-u-boot.dtsi | 45 ++++++++++++++++++++++++++++++++ arch/arm/dts/imx6ull-colibri.dtsi | 43 ------------------------------ 2 files changed, 45 insertions(+), 43 deletions(-)
arch/arm/dts/imx6ull-colibri-u-boot.dtsi +45 -0
@@ -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 = <48>; + hfront-porch = <16>; + vback-porch = <33>; + vfront-porch = <10>; + hsync-len = <96>; + vsync-len = <2>; + + de-active = <1>; + hsync-active = <0>; + vsync-active = <0>; + pixelclk-active = <0>; + }; + }; + }; +};
arch/arm/dts/imx6ull-colibri.dtsi +0 -43
55 lines not on this page · raw message
Signature · 1 line
2.7.4
PATCH 2/6 toradex: common: show boot logo
From: Igor Opaniuk <[email protected]>
Add function for showing boot logo, embed into u-boot blob.
---
board/toradex/common/tdx-common.c | 26 ++++++++++++++++++++++++++ board/toradex/common/tdx-common.h | 4 ++++ 2 files changed, 30 insertions(+)
board/toradex/common/tdx-common.c +26 -0
@@ -9,6 +9,13 @@#include <init.h> #include <linux/libfdt.h> +#ifdef CONFIG_DM_VIDEO +#include <bmp_logo.h> +#include <dm.h> +#include <splash.h> +#include <video.h> +#endif +#include "tdx-cfg-block.h" #include <asm/setup.h> #include "tdx-common.h"
@@ -168,3 +175,22 @@ int ft_common_board_setup(void *blob, bd_t *bd) }#endif /* CONFIG_TDX_CFG_BLOCK */ + +#if defined(CONFIG_DM_VIDEO ) +int show_boot_logo (void ) +{ +struct udevice *dev; +int ret; +int xpos, ypos; + +splash_get_pos (&xpos, &ypos); + + ret =uclass_get_device (UCLASS_VIDEO ,0 , &dev); +if (ret) +return ret; + + ret =video_bmp_display (dev, (ulong )bmp_logo_bitmap, xpos, ypos, true); + +return ret; +} +#endif /* CONFIG_DM_VIDEO */
board/toradex/common/tdx-common.h +4 -0
@@ -11,4 +11,8 @@int ft_common_board_setup (void *blob,bd_t *bd); +#if defined(CONFIG_DM_VIDEO ) +int show_boot_logo (void ); +#endif +#endif /* _TDX_COMMON_H */
Signature · 1 line
2.7.4
PATCH 3/6 ARM: dts: imx7-colibri: multiple node updates
In reply to Igor OpaniukFrom: Igor Opaniuk <[email protected]>
1. Move u-boot specific nodes to u-boot dts include: legacy lcdif node and aliases.
2. Add iomux configuration for LCD.
---
arch/arm/dts/imx7-colibri-emmc.dts | 9 +---- arch/arm/dts/imx7-colibri-rawnand.dts | 5 +-- arch/arm/dts/imx7-colibri-u-boot.dtsi | 48 +++++++++++++++++++++++++ arch/arm/dts/imx7-colibri.dtsi | 65 +++++++++++++++++----------------- board/toradex/colibri_imx7/MAINTAINERS | 1 + 5 files changed, 83 insertions(+), 45 deletions(-) create mode 100644 arch/arm/dts/imx7-colibri-u-boot.dtsi
arch/arm/dts/imx7-colibri-emmc.dts +1 -8
@@ -5,19 +5,12 @@ /dts-v1/; #include "imx7-colibri.dtsi" +#include "imx7-colibri-u-boot.dtsi" / { model = "Toradex Colibri iMX7D 1GB (eMMC)"; compatible = "toradex,imx7d-colibri-emmc", "fsl,imx7d"; - aliases { - u-boot,dm-pre-reloc; - mmc0 = &usdhc3; - mmc1 = &usdhc1; - display1 = &lcdif; - usb0 = &usbotg1; /* required for ums */ - }; - chosen { stdout-path = &uart1; };
arch/arm/dts/imx7-colibri-rawnand.dts +1 -4
@@ -5,6 +5,7 @@ /dts-v1/; #include "imx7-colibri.dtsi" +#include "imx7-colibri-u-boot.dtsi" / { model = "Toradex Colibri iMX7S/D";
@@ -14,10 +15,6 @@ stdout-path = &uart1; }; - aliases { - usb0 = &usbotg1; /* required for ums */ - }; - reg_5v0: regulator-5v0 { compatible = "regulator-fixed"; regulator-name = "5V";
arch/arm/dts/imx7-colibri-u-boot.dtsi new file +48 -0
48 lines not on this page · raw message
arch/arm/dts/imx7-colibri.dtsi +32 -33
74 lines not on this page · raw message
board/toradex/colibri_imx7/MAINTAINERS +1 -0
@@ -9,5 +9,6 @@ F: include/configs/colibri_imx7.h F: configs/colibri_imx7_defconfig F: configs/colibri_imx7_emmc_defconfig F: arch/arm/dts/imx7-colibri.dtsi +F: arch/arm/dts/imx7-colibri-u-boot.dtsi F: arch/arm/dts/imx7-colibri-emmc.dts F: arch/arm/dts/imx7-colibri-rawnand.dts
Signature · 1 line
2.7.4
PATCH 4/6 colibri-imx6ull: show boot logo
In reply to Igor OpaniukFrom: Igor Opaniuk <[email protected]>
1. Show boot logo embed in U-Boot blob.
2. Drop iomux configration for LCD, and use the one provided in device tree.
---
board/toradex/colibri-imx6ull/colibri-imx6ull.c | 40 +++++-------------------- 1 file changed, 7 insertions(+), 33 deletions(-)
board/toradex/colibri-imx6ull/colibri-imx6ull.c +7 -33
@@ -57,32 +57,7 @@ static void setup_gpmi_nand(void) }#endif /* CONFIG_NAND_MXS */ -#ifdef CONFIG_VIDEO_MXS -static iomux_v3_cfg_t const lcd_pads[] = { -MX6_PAD_LCD_CLK__LCDIF_CLK |MUX_PAD_CTRL (LCD_PAD_CTRL ), -MX6_PAD_LCD_ENABLE__LCDIF_ENABLE |MUX_PAD_CTRL (LCD_PAD_CTRL ), -MX6_PAD_LCD_HSYNC__LCDIF_HSYNC |MUX_PAD_CTRL (LCD_PAD_CTRL ), -MX6_PAD_LCD_CLK__LCDIF_CLK |MUX_PAD_CTRL (LCD_PAD_CTRL ), -MX6_PAD_LCD_DATA00__LCDIF_DATA00 |MUX_PAD_CTRL (LCD_PAD_CTRL ), -MX6_PAD_LCD_DATA01__LCDIF_DATA01 |MUX_PAD_CTRL (LCD_PAD_CTRL ), -MX6_PAD_LCD_DATA02__LCDIF_DATA02 |MUX_PAD_CTRL (LCD_PAD_CTRL ), -MX6_PAD_LCD_DATA03__LCDIF_DATA03 |MUX_PAD_CTRL (LCD_PAD_CTRL ), -MX6_PAD_LCD_DATA04__LCDIF_DATA04 |MUX_PAD_CTRL (LCD_PAD_CTRL ), -MX6_PAD_LCD_DATA05__LCDIF_DATA05 |MUX_PAD_CTRL (LCD_PAD_CTRL ), -MX6_PAD_LCD_DATA06__LCDIF_DATA06 |MUX_PAD_CTRL (LCD_PAD_CTRL ), -MX6_PAD_LCD_DATA07__LCDIF_DATA07 |MUX_PAD_CTRL (LCD_PAD_CTRL ), -MX6_PAD_LCD_DATA08__LCDIF_DATA08 |MUX_PAD_CTRL (LCD_PAD_CTRL ), -MX6_PAD_LCD_DATA09__LCDIF_DATA09 |MUX_PAD_CTRL (LCD_PAD_CTRL ), -MX6_PAD_LCD_DATA10__LCDIF_DATA10 |MUX_PAD_CTRL (LCD_PAD_CTRL ), -MX6_PAD_LCD_DATA11__LCDIF_DATA11 |MUX_PAD_CTRL (LCD_PAD_CTRL ), -MX6_PAD_LCD_DATA12__LCDIF_DATA12 |MUX_PAD_CTRL (LCD_PAD_CTRL ), -MX6_PAD_LCD_DATA13__LCDIF_DATA13 |MUX_PAD_CTRL (LCD_PAD_CTRL ), -MX6_PAD_LCD_DATA14__LCDIF_DATA14 |MUX_PAD_CTRL (LCD_PAD_CTRL ), -MX6_PAD_LCD_DATA15__LCDIF_DATA15 |MUX_PAD_CTRL (LCD_PAD_CTRL ), -MX6_PAD_LCD_DATA16__LCDIF_DATA16 |MUX_PAD_CTRL (LCD_PAD_CTRL ), -MX6_PAD_LCD_DATA17__LCDIF_DATA17 |MUX_PAD_CTRL (LCD_PAD_CTRL ), -}; - +#ifdef CONFIG_DM_VIDEO static iomux_v3_cfg_t const backlight_pads[] = {/* Backlight On */ MX6_PAD_JTAG_TMS__GPIO1_IO11 | MUX_PAD_CTRL(NO_PAD_CTRL),
@@ -95,8 +70,6 @@ static iomux_v3_cfg_t const backlight_pads[] = {static int setup_lcd (void ) { -imx_iomux_v3_setup_multiple_pads (lcd_pads,ARRAY_SIZE (lcd_pads)); -imx_iomux_v3_setup_multiple_pads (backlight_pads,ARRAY_SIZE (backlight_pads));/* Set BL_ON */
@@ -153,11 +126,6 @@ int board_init(void)#ifdef CONFIG_NAND_MXS setup_gpmi_nand ();#endif - -#ifdef CONFIG_VIDEO_MXS -setup_lcd (); -#endif -return 0 ; }
@@ -203,6 +171,12 @@ int board_late_init(void) }#endif /* CONFIG_CMD_USB_SDP */ +#if defined(CONFIG_DM_VIDEO ) +setup_lcd (); + +show_boot_logo (); +#endif +return 0 ; }
Signature · 1 line
2.7.4
PATCH 5/6 colibri-imx6ull: fix splash screen logo drawing
In reply to Igor OpaniukFrom: Igor Opaniuk <[email protected]>
Configure white on black for video console.
---
configs/colibri-imx6ull_defconfig | 1 + 1 file changed, 1 insertion(+)
configs/colibri-imx6ull_defconfig +1 -0
@@ -88,3 +88,4 @@ CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_DM_VIDEO=y CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_FDT_FIXUP_PARTITIONS=y +CONFIG_SYS_WHITE_ON_BLACK=y
Signature · 1 line
2.7.4
PATCH 6/6 colibri-imx7: fix splash logo drawing
In reply to Igor OpaniukFrom: Igor Opaniuk <[email protected]>
1. Configure white on black for video console.
2. Enable printing bmp logo during late board init stage.
3. Use iomux configuration from device tree.
---
board/toradex/colibri_imx7/colibri_imx7.c | 44 +++++++++---------------------- configs/colibri_imx7_defconfig | 2 ++ configs/colibri_imx7_emmc_defconfig | 2 ++ 3 files changed, 16 insertions(+), 32 deletions(-)
board/toradex/colibri_imx7/colibri_imx7.c +12 -32
@@ -100,32 +100,7 @@ static void setup_gpmi_nand(void) }#endif -#ifdef CONFIG_VIDEO_MXS -static iomux_v3_cfg_t const lcd_pads[] = { -MX7D_PAD_LCD_CLK__LCD_CLK |MUX_PAD_CTRL (LCD_PAD_CTRL ), -MX7D_PAD_LCD_ENABLE__LCD_ENABLE |MUX_PAD_CTRL (LCD_PAD_CTRL ), -MX7D_PAD_LCD_HSYNC__LCD_HSYNC |MUX_PAD_CTRL (LCD_PAD_CTRL ), -MX7D_PAD_LCD_VSYNC__LCD_VSYNC |MUX_PAD_CTRL (LCD_PAD_CTRL ), -MX7D_PAD_LCD_DATA00__LCD_DATA0 |MUX_PAD_CTRL (LCD_PAD_CTRL ), -MX7D_PAD_LCD_DATA01__LCD_DATA1 |MUX_PAD_CTRL (LCD_PAD_CTRL ), -MX7D_PAD_LCD_DATA02__LCD_DATA2 |MUX_PAD_CTRL (LCD_PAD_CTRL ), -MX7D_PAD_LCD_DATA03__LCD_DATA3 |MUX_PAD_CTRL (LCD_PAD_CTRL ), -MX7D_PAD_LCD_DATA04__LCD_DATA4 |MUX_PAD_CTRL (LCD_PAD_CTRL ), -MX7D_PAD_LCD_DATA05__LCD_DATA5 |MUX_PAD_CTRL (LCD_PAD_CTRL ), -MX7D_PAD_LCD_DATA06__LCD_DATA6 |MUX_PAD_CTRL (LCD_PAD_CTRL ), -MX7D_PAD_LCD_DATA07__LCD_DATA7 |MUX_PAD_CTRL (LCD_PAD_CTRL ), -MX7D_PAD_LCD_DATA08__LCD_DATA8 |MUX_PAD_CTRL (LCD_PAD_CTRL ), -MX7D_PAD_LCD_DATA09__LCD_DATA9 |MUX_PAD_CTRL (LCD_PAD_CTRL ), -MX7D_PAD_LCD_DATA10__LCD_DATA10 |MUX_PAD_CTRL (LCD_PAD_CTRL ), -MX7D_PAD_LCD_DATA11__LCD_DATA11 |MUX_PAD_CTRL (LCD_PAD_CTRL ), -MX7D_PAD_LCD_DATA12__LCD_DATA12 |MUX_PAD_CTRL (LCD_PAD_CTRL ), -MX7D_PAD_LCD_DATA13__LCD_DATA13 |MUX_PAD_CTRL (LCD_PAD_CTRL ), -MX7D_PAD_LCD_DATA14__LCD_DATA14 |MUX_PAD_CTRL (LCD_PAD_CTRL ), -MX7D_PAD_LCD_DATA15__LCD_DATA15 |MUX_PAD_CTRL (LCD_PAD_CTRL ), -MX7D_PAD_LCD_DATA16__LCD_DATA16 |MUX_PAD_CTRL (LCD_PAD_CTRL ), -MX7D_PAD_LCD_DATA17__LCD_DATA17 |MUX_PAD_CTRL (LCD_PAD_CTRL ), -}; - +#ifdef CONFIG_DM_VIDEO static iomux_v3_cfg_t const backlight_pads[] = {/* Backlight On */ MX7D_PAD_SD1_WP__GPIO5_IO1 | MUX_PAD_CTRL(NO_PAD_CTRL),
@@ -139,8 +114,6 @@ static iomux_v3_cfg_t const backlight_pads[] = {static int setup_lcd (void ) { -imx_iomux_v3_setup_multiple_pads (lcd_pads,ARRAY_SIZE (lcd_pads)); -imx_iomux_v3_setup_multiple_pads (backlight_pads,ARRAY_SIZE (backlight_pads));/* Set BL_ON */
@@ -215,10 +188,6 @@ int board_init(void)setup_gpmi_nand ();#endif -#ifdef CONFIG_VIDEO_MXS -setup_lcd (); -#endif -#ifdef CONFIG_USB_EHCI_MX7 imx_iomux_v3_setup_multiple_pads (usb_cdet_pads,ARRAY_SIZE (usb_cdet_pads));gpio_request (USB_CDET_GPIO ,"usb-cdet-gpio" );
@@ -382,4 +351,15 @@ int board_usb_phy_mode(int port) return USB_INIT_HOST; } } + +int board_late_init (void ) +{ +#if defined(CONFIG_DM_VIDEO ) +setup_lcd (); + +show_boot_logo (); +#endif +return 0 ; +} +#endif
configs/colibri_imx7_defconfig +2 -0
@@ -87,3 +87,5 @@ CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_DM_VIDEO=y CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_FDT_FIXUP_PARTITIONS=y +CONFIG_BOARD_LATE_INIT=y +CONFIG_SYS_WHITE_ON_BLACK=y
configs/colibri_imx7_emmc_defconfig +2 -0
@@ -82,3 +82,5 @@ CONFIG_CI_UDC=y CONFIG_DM_VIDEO=y CONFIG_FAT_WRITE=y CONFIG_OF_LIBFDT_OVERLAY=y +CONFIG_BOARD_LATE_INIT=y +CONFIG_SYS_WHITE_ON_BLACK=y
Signature · 1 line
2.7.4