Message ID | 20190930152658.18236-2-sebastien.szymanski@armadeus.com |
---|---|
State | Superseded |
Delegated to: | Stefano Babic |
Headers | show |
Series | [U-Boot,1/3] imx6ul: opos6ul: migrate to DM_ETH | expand |
> Subject: [PATCH 2/3] opos6uldev: migrate to DM_VIDEO > > Migrate to DM_VIDEO, update the device tree and remove code that is no > longer necessary. > > Signed-off-by: Sébastien Szymanski <sebastien.szymanski@armadeus.com> > --- > arch/arm/dts/imx6ul-opos6uldev-u-boot.dtsi | 10 ++++++ > arch/arm/dts/imx6ul-opos6uldev.dts | 4 +-- > board/armadeus/opos6uldev/board.c | 36 ---------------------- > configs/opos6uldev_defconfig | 3 +- > include/configs/opos6uldev.h | 6 +++- > 5 files changed, 19 insertions(+), 40 deletions(-) > > diff --git a/arch/arm/dts/imx6ul-opos6uldev-u-boot.dtsi > b/arch/arm/dts/imx6ul-opos6uldev-u-boot.dtsi > index da8b0392ef..3f351ef0c4 100644 > --- a/arch/arm/dts/imx6ul-opos6uldev-u-boot.dtsi > +++ b/arch/arm/dts/imx6ul-opos6uldev-u-boot.dtsi > @@ -7,6 +7,12 @@ > > #include "imx6ul-opos6ul-u-boot.dtsi" > > +/ { > + aliases { > + display0 = &lcdif; > + }; > +}; > + > &aips1 { > u-boot,dm-spl; > > @@ -15,6 +21,10 @@ > }; > }; > > +&lcdif { > + u-boot,dm-pre-proper; > +}; > + > &pinctrl_uart1 { > u-boot,dm-spl; > }; > diff --git a/arch/arm/dts/imx6ul-opos6uldev.dts > b/arch/arm/dts/imx6ul-opos6uldev.dts > index 0e59ee57fd..4a541be6b0 100644 > --- a/arch/arm/dts/imx6ul-opos6uldev.dts > +++ b/arch/arm/dts/imx6ul-opos6uldev.dts > @@ -187,7 +187,7 @@ > status = "okay"; > > display0: display0 { > - bits-per-pixel = <32>; > + bits-per-pixel = <18>; > bus-width = <18>; > > display-timings { > @@ -202,7 +202,7 @@ > hsync-len = <64>; > vsync-len = <4>; > de-active = <1>; > - pixelclk-active = <0>; > + pixelclk-active = <1>; > }; > }; > }; > diff --git a/board/armadeus/opos6uldev/board.c > b/board/armadeus/opos6uldev/board.c > index cbf40d5c4a..ade155c5ad 100644 > --- a/board/armadeus/opos6uldev/board.c > +++ b/board/armadeus/opos6uldev/board.c > @@ -3,53 +3,17 @@ > * Copyright (C) 2018 Armadeus Systems > */ > > -#include <asm/arch/mx6-pins.h> > #include <asm/arch/sys_proto.h> > #include <asm/gpio.h> > -#include <asm/mach-imx/iomux-v3.h> > #include <asm/io.h> > #include <common.h> > > #ifdef CONFIG_VIDEO_MXS > -#define LCD_PAD_CTRL ( \ > - PAD_CTL_HYS | PAD_CTL_PUS_100K_UP | PAD_CTL_PUE | \ > - PAD_CTL_PKE | PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm \ > -) > - > -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_VSYNC__LCDIF_VSYNC | > 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), > - > - MX6_PAD_NAND_ALE__GPIO4_IO10 | MUX_PAD_CTRL(NO_PAD_CTRL) > -}; > - > int setup_lcd(void) > { > struct gpio_desc backlight; > int ret; > > - imx_iomux_v3_setup_multiple_pads(lcd_pads, ARRAY_SIZE(lcd_pads)); > - > /* Set Brightness to high */ > ret = dm_gpio_lookup_name("GPIO4_10", &backlight); > if (ret) { > diff --git a/configs/opos6uldev_defconfig b/configs/opos6uldev_defconfig > index 44236e99bc..352d10a0d8 100644 > --- a/configs/opos6uldev_defconfig > +++ b/configs/opos6uldev_defconfig > @@ -95,6 +95,7 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525 > CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 > CONFIG_CI_UDC=y > CONFIG_USB_GADGET_DOWNLOAD=y > -CONFIG_VIDEO=y > +CONFIG_DM_VIDEO=y > +CONFIG_SYS_WHITE_ON_BLACK=y > CONFIG_OF_LIBFDT_OVERLAY=y > # CONFIG_EFI_LOADER is not set > diff --git a/include/configs/opos6uldev.h b/include/configs/opos6uldev.h index > b10071eaaf..11face21a1 100644 > --- a/include/configs/opos6uldev.h > +++ b/include/configs/opos6uldev.h > @@ -43,7 +43,7 @@ > > /* LCD */ > #ifndef CONFIG_SPL_BUILD > -#ifdef CONFIG_VIDEO > +#ifdef CONFIG_DM_VIDEO > #define CONFIG_VIDEO_LOGO > #define CONFIG_SPLASH_SCREEN > #define CONFIG_SPLASH_SCREEN_ALIGN > @@ -51,6 +51,8 @@ > #define CONFIG_VIDEO_BMP_RLE8 > #define CONFIG_VIDEO_BMP_LOGO > #define CONFIG_BMP_16BPP > +#define CONFIG_BMP_24BPP > +#define CONFIG_BMP_32BPP > #define CONFIG_VIDEO_MXS > #define MXS_LCDIF_BASE MX6UL_LCDIF1_BASE_ADDR #endif @@ -87,6 > +89,8 @@ > "mmcroot=/dev/mmcblk0p2 ro\0" > \ > "mmcrootfstype=ext4 rootwait\0" > \ > "kernelimg=" __stringify(CONFIG_BOARD_NAME) > "-linux.bin\0" \ > + "splashpos=0,0\0" \ > + "splashimage=" __stringify(CONFIG_LOADADDR) "\0" > \ > > "videomode=video=ctfb:x:800,y:480,depth:18,pclk:33033,le:96,ri:96,up:2 > 0,lo:21,hs:64,vs:4,sync:0,vmode:0\0" \ > "check_env=if test -n ${flash_env_version}; " > \ > "then env default env_version; " > \ > -- Reviewed-by: Peng Fan <peng.fan@nxp.com> > 2.21.0
diff --git a/arch/arm/dts/imx6ul-opos6uldev-u-boot.dtsi b/arch/arm/dts/imx6ul-opos6uldev-u-boot.dtsi index da8b0392ef..3f351ef0c4 100644 --- a/arch/arm/dts/imx6ul-opos6uldev-u-boot.dtsi +++ b/arch/arm/dts/imx6ul-opos6uldev-u-boot.dtsi @@ -7,6 +7,12 @@ #include "imx6ul-opos6ul-u-boot.dtsi" +/ { + aliases { + display0 = &lcdif; + }; +}; + &aips1 { u-boot,dm-spl; @@ -15,6 +21,10 @@ }; }; +&lcdif { + u-boot,dm-pre-proper; +}; + &pinctrl_uart1 { u-boot,dm-spl; }; diff --git a/arch/arm/dts/imx6ul-opos6uldev.dts b/arch/arm/dts/imx6ul-opos6uldev.dts index 0e59ee57fd..4a541be6b0 100644 --- a/arch/arm/dts/imx6ul-opos6uldev.dts +++ b/arch/arm/dts/imx6ul-opos6uldev.dts @@ -187,7 +187,7 @@ status = "okay"; display0: display0 { - bits-per-pixel = <32>; + bits-per-pixel = <18>; bus-width = <18>; display-timings { @@ -202,7 +202,7 @@ hsync-len = <64>; vsync-len = <4>; de-active = <1>; - pixelclk-active = <0>; + pixelclk-active = <1>; }; }; }; diff --git a/board/armadeus/opos6uldev/board.c b/board/armadeus/opos6uldev/board.c index cbf40d5c4a..ade155c5ad 100644 --- a/board/armadeus/opos6uldev/board.c +++ b/board/armadeus/opos6uldev/board.c @@ -3,53 +3,17 @@ * Copyright (C) 2018 Armadeus Systems */ -#include <asm/arch/mx6-pins.h> #include <asm/arch/sys_proto.h> #include <asm/gpio.h> -#include <asm/mach-imx/iomux-v3.h> #include <asm/io.h> #include <common.h> #ifdef CONFIG_VIDEO_MXS -#define LCD_PAD_CTRL ( \ - PAD_CTL_HYS | PAD_CTL_PUS_100K_UP | PAD_CTL_PUE | \ - PAD_CTL_PKE | PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm \ -) - -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_VSYNC__LCDIF_VSYNC | 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), - - MX6_PAD_NAND_ALE__GPIO4_IO10 | MUX_PAD_CTRL(NO_PAD_CTRL) -}; - int setup_lcd(void) { struct gpio_desc backlight; int ret; - imx_iomux_v3_setup_multiple_pads(lcd_pads, ARRAY_SIZE(lcd_pads)); - /* Set Brightness to high */ ret = dm_gpio_lookup_name("GPIO4_10", &backlight); if (ret) { diff --git a/configs/opos6uldev_defconfig b/configs/opos6uldev_defconfig index 44236e99bc..352d10a0d8 100644 --- a/configs/opos6uldev_defconfig +++ b/configs/opos6uldev_defconfig @@ -95,6 +95,7 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_CI_UDC=y CONFIG_USB_GADGET_DOWNLOAD=y -CONFIG_VIDEO=y +CONFIG_DM_VIDEO=y +CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_OF_LIBFDT_OVERLAY=y # CONFIG_EFI_LOADER is not set diff --git a/include/configs/opos6uldev.h b/include/configs/opos6uldev.h index b10071eaaf..11face21a1 100644 --- a/include/configs/opos6uldev.h +++ b/include/configs/opos6uldev.h @@ -43,7 +43,7 @@ /* LCD */ #ifndef CONFIG_SPL_BUILD -#ifdef CONFIG_VIDEO +#ifdef CONFIG_DM_VIDEO #define CONFIG_VIDEO_LOGO #define CONFIG_SPLASH_SCREEN #define CONFIG_SPLASH_SCREEN_ALIGN @@ -51,6 +51,8 @@ #define CONFIG_VIDEO_BMP_RLE8 #define CONFIG_VIDEO_BMP_LOGO #define CONFIG_BMP_16BPP +#define CONFIG_BMP_24BPP +#define CONFIG_BMP_32BPP #define CONFIG_VIDEO_MXS #define MXS_LCDIF_BASE MX6UL_LCDIF1_BASE_ADDR #endif @@ -87,6 +89,8 @@ "mmcroot=/dev/mmcblk0p2 ro\0" \ "mmcrootfstype=ext4 rootwait\0" \ "kernelimg=" __stringify(CONFIG_BOARD_NAME) "-linux.bin\0" \ + "splashpos=0,0\0" \ + "splashimage=" __stringify(CONFIG_LOADADDR) "\0" \ "videomode=video=ctfb:x:800,y:480,depth:18,pclk:33033,le:96,ri:96,up:20,lo:21,hs:64,vs:4,sync:0,vmode:0\0" \ "check_env=if test -n ${flash_env_version}; " \ "then env default env_version; " \
Migrate to DM_VIDEO, update the device tree and remove code that is no longer necessary. Signed-off-by: Sébastien Szymanski <sebastien.szymanski@armadeus.com> --- arch/arm/dts/imx6ul-opos6uldev-u-boot.dtsi | 10 ++++++ arch/arm/dts/imx6ul-opos6uldev.dts | 4 +-- board/armadeus/opos6uldev/board.c | 36 ---------------------- configs/opos6uldev_defconfig | 3 +- include/configs/opos6uldev.h | 6 +++- 5 files changed, 19 insertions(+), 40 deletions(-)