Convert some imx6 boards to DM_VIDEO
Subsystems (5)
cover Convert some imx6 boards to DM_VIDEO
This series starts conversion of ipuv3 driver to DM_VIDEO. It has been tested on apalis_imx6 module with LVDS display attached and on wandboard with HDMI display.
With applied "[PATCH 17/17] imx6: wandboard: convert to DM_MMC" building wandboard target doesn't work. To fix this please apply patches [1], [2] and enable CONFIG_AHCI and CONFIG_DM_SCSI in wandboard_defconfig.
[1] http://patchwork.ozlabs.org/patch/1050141
[2] http://patchwork.ozlabs.org/patch/1050143
Anatolij Gustschin (17):
video: ipuv3: add DM_VIDEO support
video: move ipuv3 files to subdirectory
imx: move CONFIG_VIDEO_IPUV3 to defconfigs
imx6: dts: add 'u-boot,dm-pre-reloc' to soc and ipu nodes
apalis_imx6: convert to DM_VIDEO
imx6: icore: convert to DM_VIDEO
imx6: ge_bx50v3: convert to DM_VIDEO
colibri_imx6: convert to DM_VIDEO
mx6sabresd: convert to DM_VIDEO
mx6sabreauto: convert to DM_VIDEO
imx6: wandboard: add device tree
imx6: wandboard: convert to DM_GPIO and enable pinctrl driver
imx6: wandboard: convert to DM_USB
imx6: wandboard: convert to DM_VIDEO
imx6: wandboard: convert to DM_PMIC
imx6: wandboard: convert to DM_I2C
imx6: wandboard: convert to DM_MMC
arch/arm/dts/imx6dl-wandboard-revb1.dts | 18 +
arch/arm/dts/imx6qdl-wandboard-revb1.dtsi | 41 +++
arch/arm/dts/imx6qdl-wandboard.dtsi | 380 ++++++++++++++++++++++
arch/arm/dts/imx6qdl.dtsi | 2 +
arch/arm/include/asm/mach-imx/video.h | 1 +
arch/arm/mach-imx/video.c | 25 +-
board/wandboard/MAINTAINERS | 3 +
board/wandboard/spl.c | 92 ++++++
board/wandboard/wandboard.c | 160 +++------
configs/apalis_imx6_defconfig | 4 +-
configs/aristainetos2_defconfig | 1 +
configs/aristainetos2b_defconfig | 1 +
configs/aristainetos_defconfig | 1 +
configs/cgtqmx6eval_defconfig | 1 +
configs/cm_fx6_defconfig | 1 +
configs/colibri_imx6_defconfig | 3 +-
configs/dms-ba16-1g_defconfig | 1 +
configs/dms-ba16_defconfig | 1 +
configs/ge_bx50v3_defconfig | 2 +
configs/gwventana_emmc_defconfig | 1 +
configs/gwventana_gw5904_defconfig | 1 +
configs/gwventana_nand_defconfig | 1 +
configs/imx6dl_icore_nand_defconfig | 2 +-
configs/imx6q_icore_nand_defconfig | 2 +-
configs/imx6qdl_icore_mmc_defconfig | 2 +-
configs/imx6qdl_icore_nand_defconfig | 2 +-
configs/m53menlo_defconfig | 1 +
configs/marsboard_defconfig | 1 +
configs/mx51evk_defconfig | 1 +
configs/mx53cx9020_defconfig | 1 +
configs/mx53loco_defconfig | 1 +
configs/mx53ppd_defconfig | 1 +
configs/mx6cuboxi_defconfig | 1 +
configs/mx6qsabrelite_defconfig | 1 +
configs/mx6sabreauto_defconfig | 3 +-
configs/mx6sabresd_defconfig | 3 +-
configs/nitrogen6dl2g_defconfig | 1 +
configs/nitrogen6dl_defconfig | 1 +
configs/nitrogen6q2g_defconfig | 1 +
configs/nitrogen6q_defconfig | 1 +
configs/nitrogen6s1g_defconfig | 1 +
configs/nitrogen6s_defconfig | 1 +
configs/novena_defconfig | 1 +
configs/riotboard_defconfig | 1 +
configs/riotboard_spl_defconfig | 1 +
configs/tbs2910_defconfig | 1 +
configs/wandboard_defconfig | 18 +-
drivers/video/Kconfig | 9 +-
drivers/video/Makefile | 2 +-
drivers/video/imx/Kconfig | 8 +
drivers/video/imx/Makefile | 6 +
drivers/video/{ => imx}/ipu.h | 0
drivers/video/{ => imx}/ipu_common.c | 0
drivers/video/{ => imx}/ipu_disp.c | 0
drivers/video/{ => imx}/ipu_regs.h | 0
drivers/video/{ => imx}/mxc_ipuv3_fb.c | 89 ++++-
drivers/video/{ => imx}/mxcfb.h | 0
include/configs/advantech_dms-ba16.h | 1 -
include/configs/apalis_imx6.h | 1 -
include/configs/aristainetos-common.h | 1 -
include/configs/cgtqmx6eval.h | 1 -
include/configs/cm_fx6.h | 1 -
include/configs/colibri_imx6.h | 1 -
include/configs/embestmx6boards.h | 1 -
include/configs/ge_bx50v3.h | 8 -
include/configs/gw_ventana.h | 1 -
include/configs/m53menlo.h | 1 -
include/configs/mx51evk.h | 1 -
include/configs/mx53cx9020.h | 1 -
include/configs/mx53loco.h | 1 -
include/configs/mx53ppd.h | 5 -
include/configs/mx6cuboxi.h | 1 -
include/configs/mx6sabre_common.h | 1 -
include/configs/nitrogen6x.h | 1 -
include/configs/novena.h | 1 -
include/configs/tbs2910.h | 1 -
include/configs/wandboard.h | 18 -
77 files changed, 766 insertions(+), 187 deletions(-)
create mode 100644 arch/arm/dts/imx6dl-wandboard-revb1.dts
create mode 100644 arch/arm/dts/imx6qdl-wandboard-revb1.dtsi
create mode 100644 arch/arm/dts/imx6qdl-wandboard.dtsi
create mode 100644 drivers/video/imx/Kconfig
create mode 100644 drivers/video/imx/Makefile
rename drivers/video/{ => imx}/ipu.h (100%)
rename drivers/video/{ => imx}/ipu_common.c (100%)
rename drivers/video/{ => imx}/ipu_disp.c (100%)
rename drivers/video/{ => imx}/ipu_regs.h (100%)
rename drivers/video/{ => imx}/mxc_ipuv3_fb.c (88%)
rename drivers/video/{ => imx}/mxcfb.h (100%)Signature · 1 line
2.17.1
PATCH 1/17 video: ipuv3: add DM_VIDEO support
Extend the driver to build with DM_VIDEO enabled. DTS files must additionally include 'u-boot,dm-pre-reloc' property in soc and ipu nodes to enable driver binding to ipu device.
--- arch/arm/include/asm/mach-imx/video.h | 1 + arch/arm/mach-imx/video.c | 25 +++++--- drivers/video/Kconfig | 14 ++--- drivers/video/mxc_ipuv3_fb.c | 87 +++++++++++++++++++++++++++ 4 files changed, 113 insertions(+), 14 deletions(-)
arch/arm/include/asm/mach-imx/video.h +1 -0
@@ -26,4 +26,5 @@ extern size_t display_count;#endif int ipu_set_ldb_clock (int rate); +int ipu_displays_init (void );#endif
arch/arm/mach-imx/video.c +18 -7
@@ -4,6 +4,17 @@#include <linux/errno.h> #include <asm/mach-imx/video.h> +#ifdef CONFIG_IMX_HDMI +#include <asm/arch/mxc_hdmi.h> +#include <asm/io.h> + +int detect_hdmi (struct display_info_t const *dev) +{ +struct hdmi_regs *hdmi = (struct hdmi_regs *)HDMI_ARB_BASE_ADDR ; +return readb (&hdmi->phy_stat0) &HDMI_DVI_STAT ; +} +#endif +int board_video_skip (void ) {int i;
@@ -42,6 +53,11 @@ int board_video_skip(void) displays[i].mode.name, displays[i].mode.xres, displays[i].mode.yres); + +#ifdef CONFIG_IMX_HDMI +if (!strcmp (displays[i].mode.name,"HDMI" )) +imx_enable_hdmi_phy (); +#endif }else printf ("LCD %s cannot be configured: %d\n" , displays[i].mode.name, ret);
@@ -53,12 +69,7 @@ int board_video_skip(void)return ret; } -#ifdef CONFIG_IMX_HDMI -#include <asm/arch/mxc_hdmi.h> -#include <asm/io.h> -int detect_hdmi (struct display_info_t const *dev) +int ipu_displays_init (void ) { -struct hdmi_regs *hdmi = (struct hdmi_regs *)HDMI_ARB_BASE_ADDR ; -return readb (&hdmi->phy_stat0) &HDMI_DVI_STAT ; +return board_video_skip (); } -#endif
drivers/video/Kconfig +7 -7
@@ -538,6 +538,13 @@ config VIDEO_TEGRA124 source "drivers/video/bridge/Kconfig" +config VIDEO_IPUV3 + bool "i.MX IPUv3 Core video support" + depends on (VIDEO || DM_VIDEO) && (MX5 || MX6) + help + This enables framebuffer driver for i.MX processors working + on the IPUv3(Image Processing Unit) internal graphic processor. + config VIDEO bool "Enable legacy video support" depends on !DM_VIDEO
@@ -547,13 +554,6 @@ config VIDEO model. Video drivers typically provide a colour text console and cursor. -config VIDEO_IPUV3 - bool "i.MX IPUv3 Core video support" - depends on VIDEO && MX6 - help - This enables framebuffer driver for i.MX processors working - on the IPUv3(Image Processing Unit) internal graphic processor. - config CFB_CONSOLE bool "Enable colour frame buffer console" depends on VIDEO
drivers/video/mxc_ipuv3_fb.c +87 -0
117 lines not on this page · raw message
Signature · 1 line
2.17.1
PATCH 1/17 video: ipuv3: add DM_VIDEO support
Quoted 4 lines
Extend the driver to build with
DM_VIDEOenabled. DTS files must additionally include 'u-boot,dm-pre-reloc' property in soc and ipu nodes to enable driver binding to ipu device.Signed-off-by Anatolij Gustschin <[email protected]>
Applied to u-boot-imx, -next, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
PATCH 2/17 video: move ipuv3 files to subdirectory
In reply to Anatolij GustschinPlace ipuv3 files and headers in custom driver subdirectory.
---
drivers/video/Kconfig | 7 +------
drivers/video/Makefile | 2 +-
drivers/video/imx/Kconfig | 8 ++++++++
drivers/video/imx/Makefile | 6 ++++++
drivers/video/{ => imx}/ipu.h | 0
drivers/video/{ => imx}/ipu_common.c | 0
drivers/video/{ => imx}/ipu_disp.c | 0
drivers/video/{ => imx}/ipu_regs.h | 0
drivers/video/{ => imx}/mxc_ipuv3_fb.c | 2 +-
drivers/video/{ => imx}/mxcfb.h | 0
10 files changed, 17 insertions(+), 8 deletions(-)
create mode 100644 drivers/video/imx/Kconfig
create mode 100644 drivers/video/imx/Makefile
rename drivers/video/{ => imx}/ipu.h (100%)
rename drivers/video/{ => imx}/ipu_common.c (100%)
rename drivers/video/{ => imx}/ipu_disp.c (100%)
rename drivers/video/{ => imx}/ipu_regs.h (100%)
rename drivers/video/{ => imx}/mxc_ipuv3_fb.c (99%)
rename drivers/video/{ => imx}/mxcfb.h (100%)drivers/video/Kconfig +1 -6
@@ -538,12 +538,7 @@ config VIDEO_TEGRA124 source "drivers/video/bridge/Kconfig" -config VIDEO_IPUV3 - bool "i.MX IPUv3 Core video support" - depends on (VIDEO || DM_VIDEO) && (MX5 || MX6) - help - This enables framebuffer driver for i.MX processors working - on the IPUv3(Image Processing Unit) internal graphic processor. +source "drivers/video/imx/Kconfig" config VIDEO bool "Enable legacy video support"
drivers/video/Makefile +1 -1
@@ -46,7 +46,7 @@ obj-$(CONFIG_VIDEO_DA8XX) += da8xx-fb.o videomodes.o obj-$(CONFIG_VIDEO_DW_HDMI) += dw_hdmi.o obj-$(CONFIG_VIDEO_EFI) += efi.o obj-$(CONFIG_VIDEO_FSL_DCU_FB) += fsl_dcu_fb.o videomodes.o -obj-$(CONFIG_VIDEO_IPUV3) += mxc_ipuv3_fb.o ipu_common.o ipu_disp.o +obj-$(CONFIG_VIDEO_IPUV3) += imx/ obj-$(CONFIG_VIDEO_IVYBRIDGE_IGD) += ivybridge_igd.o obj-$(CONFIG_VIDEO_LCD_ANX9804) += anx9804.o obj-$(CONFIG_VIDEO_LCD_HITACHI_TX18D42VM) += hitachi_tx18d42vm_lcd.o
drivers/video/imx/Kconfig new file +8 -0
@@ -0,0 +1,8 @@ + +config VIDEO_IPUV3 + bool "i.MX IPUv3 Core video support" + depends on (VIDEO || DM_VIDEO) && (MX5 || MX6) + help + This enables framebuffer driver for i.MX processors working + on the IPUv3(Image Processing Unit) internal graphic processor. +
drivers/video/imx/Makefile new file +6 -0
@@ -0,0 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0+ +# +# (C) Copyright 2000-2007 +# Wolfgang Denk, DENX Software Engineering, wd at denx.de. + +obj-y += mxc_ipuv3_fb.o ipu_common.o ipu_disp.o
drivers/video/imx/ipu.h renamed from drivers/video/ipu.h +0 -0
drivers/video/imx/ipu_common.c renamed from drivers/video/ipu_common.c +0 -0
drivers/video/imx/ipu_disp.c renamed from drivers/video/ipu_disp.c +0 -0
drivers/video/imx/ipu_regs.h renamed from drivers/video/ipu_regs.h +0 -0
drivers/video/imx/mxc_ipuv3_fb.c renamed from drivers/video/mxc_ipuv3_fb.c +1 -1
@@ -20,7 +20,7 @@#include <asm/mach-imx/video.h> #include <malloc.h> #include <video_fb.h> -#include "videomodes.h" +#include "../videomodes.h" #include "ipu.h" #include "mxcfb.h" #include "ipu_regs.h"
drivers/video/imx/mxcfb.h renamed from drivers/video/mxcfb.h +0 -0
Signature · 1 line
2.17.1
PATCH 2/17 video: move ipuv3 files to subdirectory
Quoted 2 lines
Place ipuv3 files and headers in custom driver subdirectory.
Signed-off-by Anatolij Gustschin <[email protected]>
Applied to u-boot-imx, -next, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
PATCH 3/17 imx: move CONFIG_VIDEO_IPUV3 to defconfigs
In reply to Anatolij Gustschin--- configs/apalis_imx6_defconfig | 1 + configs/aristainetos2_defconfig | 1 + configs/aristainetos2b_defconfig | 1 + configs/aristainetos_defconfig | 1 + configs/cgtqmx6eval_defconfig | 1 + configs/cm_fx6_defconfig | 1 + configs/colibri_imx6_defconfig | 1 + configs/dms-ba16-1g_defconfig | 1 + configs/dms-ba16_defconfig | 1 + configs/ge_bx50v3_defconfig | 2 ++ configs/gwventana_emmc_defconfig | 1 + configs/gwventana_gw5904_defconfig | 1 + configs/gwventana_nand_defconfig | 1 + configs/m53menlo_defconfig | 1 + configs/marsboard_defconfig | 1 + configs/mx51evk_defconfig | 1 + configs/mx53cx9020_defconfig | 1 + configs/mx53loco_defconfig | 1 + configs/mx53ppd_defconfig | 1 + configs/mx6cuboxi_defconfig | 1 + configs/mx6qsabrelite_defconfig | 1 + configs/mx6sabreauto_defconfig | 1 + configs/mx6sabresd_defconfig | 1 + configs/nitrogen6dl2g_defconfig | 1 + configs/nitrogen6dl_defconfig | 1 + configs/nitrogen6q2g_defconfig | 1 + configs/nitrogen6q_defconfig | 1 + configs/nitrogen6s1g_defconfig | 1 + configs/nitrogen6s_defconfig | 1 + configs/novena_defconfig | 1 + configs/riotboard_defconfig | 1 + configs/riotboard_spl_defconfig | 1 + configs/tbs2910_defconfig | 1 + configs/wandboard_defconfig | 1 + include/configs/advantech_dms-ba16.h | 1 - include/configs/apalis_imx6.h | 1 - include/configs/aristainetos-common.h | 1 - include/configs/cgtqmx6eval.h | 1 - include/configs/cm_fx6.h | 1 - include/configs/colibri_imx6.h | 1 - include/configs/embestmx6boards.h | 1 - include/configs/ge_bx50v3.h | 6 ------ include/configs/gw_ventana.h | 1 - include/configs/m53menlo.h | 1 - include/configs/mx51evk.h | 1 - include/configs/mx53cx9020.h | 1 - include/configs/mx53loco.h | 1 - include/configs/mx53ppd.h | 5 ----- include/configs/mx6cuboxi.h | 1 - include/configs/mx6sabre_common.h | 1 - include/configs/nitrogen6x.h | 1 - include/configs/novena.h | 1 - include/configs/tbs2910.h | 1 - include/configs/wandboard.h | 1 - 54 files changed, 35 insertions(+), 29 deletions(-)
configs/apalis_imx6_defconfig +1 -0
@@ -82,5 +82,6 @@ CONFIG_CI_UDC=y CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_USB_HOST_ETHER=y CONFIG_VIDEO=y +CONFIG_VIDEO_IPUV3=y CONFIG_FAT_WRITE=y CONFIG_OF_LIBFDT_OVERLAY=y
configs/aristainetos2_defconfig +1 -0
@@ -51,6 +51,7 @@ CONFIG_MXC_SPI=y CONFIG_USB=y CONFIG_USB_STORAGE=y CONFIG_VIDEO=y +CONFIG_VIDEO_IPUV3=y # CONFIG_VIDEO_SW_CURSOR is not set CONFIG_IMX_WATCHDOG=y CONFIG_OF_LIBFDT=y
configs/aristainetos2b_defconfig +1 -0
@@ -51,6 +51,7 @@ CONFIG_MXC_SPI=y CONFIG_USB=y CONFIG_USB_STORAGE=y CONFIG_VIDEO=y +CONFIG_VIDEO_IPUV3=y # CONFIG_VIDEO_SW_CURSOR is not set CONFIG_IMX_WATCHDOG=y CONFIG_OF_LIBFDT=y
configs/aristainetos_defconfig +1 -0
@@ -50,6 +50,7 @@ CONFIG_MXC_SPI=y CONFIG_USB=y CONFIG_USB_STORAGE=y CONFIG_VIDEO=y +CONFIG_VIDEO_IPUV3=y # CONFIG_VIDEO_SW_CURSOR is not set CONFIG_IMX_WATCHDOG=y CONFIG_OF_LIBFDT=y
configs/cgtqmx6eval_defconfig +1 -0
@@ -72,5 +72,6 @@ CONFIG_CI_UDC=y CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y CONFIG_VIDEO=y +CONFIG_VIDEO_IPUV3=y # CONFIG_VIDEO_SW_CURSOR is not set CONFIG_OF_LIBFDT=y
configs/cm_fx6_defconfig +1 -0
@@ -76,4 +76,5 @@ CONFIG_DM_USB=y CONFIG_USB_KEYBOARD=y CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y CONFIG_VIDEO=y +CONFIG_VIDEO_IPUV3=y CONFIG_FDT_FIXUP_PARTITIONS=y
configs/colibri_imx6_defconfig +1 -0
@@ -78,5 +78,6 @@ CONFIG_CI_UDC=y CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_USB_HOST_ETHER=y CONFIG_VIDEO=y +CONFIG_VIDEO_IPUV3=y CONFIG_FAT_WRITE=y CONFIG_OF_LIBFDT_OVERLAY=y
configs/dms-ba16-1g_defconfig +1 -0
@@ -51,5 +51,6 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_CI_UDC=y CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_VIDEO=y +CONFIG_VIDEO_IPUV3=y # CONFIG_VIDEO_SW_CURSOR is not set CONFIG_OF_LIBFDT=y
configs/dms-ba16_defconfig +1 -0
@@ -50,5 +50,6 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_CI_UDC=y CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_VIDEO=y +CONFIG_VIDEO_IPUV3=y # CONFIG_VIDEO_SW_CURSOR is not set CONFIG_OF_LIBFDT=y
configs/ge_bx50v3_defconfig +2 -0
@@ -60,3 +60,5 @@ CONFIG_DM_GPIO=y CONFIG_DM_SPI=y CONFIG_DM_SPI_FLASH=y CONFIG_OF_BOARD_SETUP=y +CONFIG_VIDEO=y +CONFIG_VIDEO_IPUV3=y
configs/gwventana_emmc_defconfig +1 -0
@@ -84,6 +84,7 @@ CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y CONFIG_USB_ETHER_SMSC95XX=y CONFIG_VIDEO=y +CONFIG_VIDEO_IPUV3=y # CONFIG_VIDEO_SW_CURSOR is not set CONFIG_HEXDUMP=y CONFIG_OF_LIBFDT=y
configs/gwventana_gw5904_defconfig +1 -0
@@ -88,6 +88,7 @@ CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y CONFIG_USB_ETHER_SMSC95XX=y CONFIG_VIDEO=y +CONFIG_VIDEO_IPUV3=y # CONFIG_VIDEO_SW_CURSOR is not set CONFIG_HEXDUMP=y CONFIG_OF_LIBFDT=y
configs/gwventana_nand_defconfig +1 -0
@@ -87,6 +87,7 @@ CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y CONFIG_USB_ETHER_SMSC95XX=y CONFIG_VIDEO=y +CONFIG_VIDEO_IPUV3=y # CONFIG_VIDEO_SW_CURSOR is not set CONFIG_HEXDUMP=y CONFIG_OF_LIBFDT=y
configs/m53menlo_defconfig +1 -0
@@ -64,6 +64,7 @@ CONFIG_USB_ETHER_ASIX=y CONFIG_USB_ETHER_MCS7830=y CONFIG_USB_ETHER_SMSC95XX=y CONFIG_VIDEO=y +CONFIG_VIDEO_IPUV3=y # CONFIG_VIDEO_SW_CURSOR is not set CONFIG_IMX_WATCHDOG=y CONFIG_FAT_WRITE=y
configs/marsboard_defconfig +1 -0
@@ -33,5 +33,6 @@ CONFIG_USB=y CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y CONFIG_VIDEO=y +CONFIG_VIDEO_IPUV3=y # CONFIG_VIDEO_SW_CURSOR is not set CONFIG_OF_LIBFDT=y
configs/mx51evk_defconfig +1 -0
@@ -31,5 +31,6 @@ CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y CONFIG_USB_ETHER_SMSC95XX=y CONFIG_VIDEO=y +CONFIG_VIDEO_IPUV3=y # CONFIG_VIDEO_SW_CURSOR is not set CONFIG_OF_LIBFDT=y
configs/mx53cx9020_defconfig +1 -0
@@ -32,4 +32,5 @@ CONFIG_PINCTRL=y CONFIG_PINCTRL_IMX5=y CONFIG_MXC_UART=y CONFIG_VIDEO=y +CONFIG_VIDEO_IPUV3=y # CONFIG_VIDEO_SW_CURSOR is not set
configs/mx53loco_defconfig +1 -0
@@ -32,5 +32,6 @@ CONFIG_USB_ETHER_ASIX=y CONFIG_USB_ETHER_MCS7830=y CONFIG_USB_ETHER_SMSC95XX=y CONFIG_VIDEO=y +CONFIG_VIDEO_IPUV3=y # CONFIG_VIDEO_SW_CURSOR is not set CONFIG_OF_LIBFDT=y
configs/mx53ppd_defconfig +1 -0
@@ -39,6 +39,7 @@ CONFIG_RTC_S35392A=y CONFIG_USB=y CONFIG_USB_STORAGE=y CONFIG_VIDEO=y +CONFIG_VIDEO_IPUV3=y # CONFIG_VIDEO_SW_CURSOR is not set CONFIG_IMX_WATCHDOG=y CONFIG_OF_LIBFDT=y
configs/mx6cuboxi_defconfig +1 -0
@@ -39,5 +39,6 @@ CONFIG_DM_THERMAL=y CONFIG_USB=y CONFIG_USB_KEYBOARD=y CONFIG_VIDEO=y +CONFIG_VIDEO_IPUV3=y # CONFIG_VIDEO_SW_CURSOR is not set CONFIG_OF_LIBFDT=y
configs/mx6qsabrelite_defconfig +1 -0
@@ -55,5 +55,6 @@ CONFIG_CI_UDC=y CONFIG_USB_ETHER=y CONFIG_USB_ETH_CDC=y CONFIG_VIDEO=y +CONFIG_VIDEO_IPUV3=y # CONFIG_VIDEO_SW_CURSOR is not set CONFIG_OF_LIBFDT=y
configs/mx6sabreauto_defconfig +1 -0
@@ -83,4 +83,5 @@ CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y CONFIG_VIDEO=y +CONFIG_VIDEO_IPUV3=y # CONFIG_VIDEO_SW_CURSOR is not set
configs/mx6sabresd_defconfig +1 -0
@@ -94,4 +94,5 @@ CONFIG_CI_UDC=y CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y CONFIG_VIDEO=y +CONFIG_VIDEO_IPUV3=y # CONFIG_VIDEO_SW_CURSOR is not set
configs/nitrogen6dl2g_defconfig +1 -0
@@ -57,5 +57,6 @@ CONFIG_CI_UDC=y CONFIG_USB_ETHER=y CONFIG_USB_ETH_CDC=y CONFIG_VIDEO=y +CONFIG_VIDEO_IPUV3=y # CONFIG_VIDEO_SW_CURSOR is not set CONFIG_OF_LIBFDT=y
configs/nitrogen6dl_defconfig +1 -0
@@ -57,5 +57,6 @@ CONFIG_CI_UDC=y CONFIG_USB_ETHER=y CONFIG_USB_ETH_CDC=y CONFIG_VIDEO=y +CONFIG_VIDEO_IPUV3=y # CONFIG_VIDEO_SW_CURSOR is not set CONFIG_OF_LIBFDT=y
configs/nitrogen6q2g_defconfig +1 -0
@@ -59,5 +59,6 @@ CONFIG_CI_UDC=y CONFIG_USB_ETHER=y CONFIG_USB_ETH_CDC=y CONFIG_VIDEO=y +CONFIG_VIDEO_IPUV3=y # CONFIG_VIDEO_SW_CURSOR is not set CONFIG_OF_LIBFDT=y
configs/nitrogen6q_defconfig +1 -0
@@ -59,5 +59,6 @@ CONFIG_CI_UDC=y CONFIG_USB_ETHER=y CONFIG_USB_ETH_CDC=y CONFIG_VIDEO=y +CONFIG_VIDEO_IPUV3=y # CONFIG_VIDEO_SW_CURSOR is not set CONFIG_OF_LIBFDT=y
configs/nitrogen6s1g_defconfig +1 -0
@@ -57,5 +57,6 @@ CONFIG_CI_UDC=y CONFIG_USB_ETHER=y CONFIG_USB_ETH_CDC=y CONFIG_VIDEO=y +CONFIG_VIDEO_IPUV3=y # CONFIG_VIDEO_SW_CURSOR is not set CONFIG_OF_LIBFDT=y
configs/nitrogen6s_defconfig +1 -0
@@ -57,5 +57,6 @@ CONFIG_CI_UDC=y CONFIG_USB_ETHER=y CONFIG_USB_ETH_CDC=y CONFIG_VIDEO=y +CONFIG_VIDEO_IPUV3=y # CONFIG_VIDEO_SW_CURSOR is not set CONFIG_OF_LIBFDT=y
configs/novena_defconfig +1 -0
@@ -58,6 +58,7 @@ CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y CONFIG_USB_ETHER_SMSC95XX=y CONFIG_VIDEO=y +CONFIG_VIDEO_IPUV3=y # CONFIG_VIDEO_SW_CURSOR is not set CONFIG_FAT_WRITE=y CONFIG_OF_LIBFDT=y
configs/riotboard_defconfig +1 -0
@@ -33,5 +33,6 @@ CONFIG_USB=y CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y CONFIG_VIDEO=y +CONFIG_VIDEO_IPUV3=y # CONFIG_VIDEO_SW_CURSOR is not set CONFIG_OF_LIBFDT=y
configs/riotboard_spl_defconfig +1 -0
@@ -42,6 +42,7 @@ CONFIG_USB=y CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y CONFIG_VIDEO=y +CONFIG_VIDEO_IPUV3=y # CONFIG_VIDEO_SW_CURSOR is not set CONFIG_OF_LIBFDT=y CONFIG_SPL_OF_LIBFDT=y
configs/tbs2910_defconfig +1 -0
@@ -55,4 +55,5 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_CI_UDC=y CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_VIDEO=y +CONFIG_VIDEO_IPUV3=y CONFIG_OF_LIBFDT=y
configs/wandboard_defconfig +1 -0
@@ -42,5 +42,6 @@ CONFIG_MII=y CONFIG_DM_THERMAL=y CONFIG_USB=y CONFIG_VIDEO=y +CONFIG_VIDEO_IPUV3=y # CONFIG_VIDEO_SW_CURSOR is not set CONFIG_OF_LIBFDT=y
include/configs/advantech_dms-ba16.h +0 -1
@@ -227,7 +227,6 @@/* Framebuffer */ #ifdef CONFIG_VIDEO -#define CONFIG_VIDEO_IPUV3 #define CONFIG_VIDEO_BMP_RLE8 #define CONFIG_SPLASH_SCREEN #define CONFIG_SPLASH_SCREEN_ALIGN
include/configs/apalis_imx6.h +0 -1
@@ -80,7 +80,6 @@#define CONFIG_USBD_HS /* Framebuffer and LCD */ -#define CONFIG_VIDEO_IPUV3 #define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE #define CONFIG_VIDEO_BMP_RLE8 #define CONFIG_SPLASH_SCREEN
include/configs/aristainetos-common.h +0 -1
@@ -193,7 +193,6 @@/* UBI support */ /* Framebuffer */ -#define CONFIG_VIDEO_IPUV3 /* check this console not needed, after test remove it */ #define CONFIG_VIDEO_BMP_RLE8 #define CONFIG_SPLASH_SCREEN
include/configs/cgtqmx6eval.h +0 -1
@@ -63,7 +63,6 @@#define CONFIG_USBD_HS /* Framebuffer */ -#define CONFIG_VIDEO_IPUV3 #define CONFIG_VIDEO_BMP_RLE8 #define CONFIG_SPLASH_SCREEN #define CONFIG_SPLASH_SCREEN_ALIGN
include/configs/cm_fx6.h +0 -1
@@ -220,7 +220,6 @@#define CONFIG_SYS_SPI_U_BOOT_OFFS (64 * 1024)/* Display */ -#define CONFIG_VIDEO_IPUV3 #define CONFIG_IMX_HDMI #define CONFIG_SPLASH_SCREEN
include/configs/colibri_imx6.h +0 -1
@@ -71,7 +71,6 @@#define CONFIG_USBD_HS /* Framebuffer and LCD */ -#define CONFIG_VIDEO_IPUV3 #define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE #define CONFIG_VIDEO_BMP_RLE8 #define CONFIG_SPLASH_SCREEN
include/configs/embestmx6boards.h +0 -1
@@ -97,7 +97,6 @@#endif /* Framebuffer */ -#define CONFIG_VIDEO_IPUV3 #define CONFIG_VIDEO_BMP_RLE8 #define CONFIG_SPLASH_SCREEN #define CONFIG_SPLASH_SCREEN_ALIGN
include/configs/ge_bx50v3.h +0 -6
@@ -208,13 +208,7 @@#define CONFIG_SYS_FSL_USDHC_NUM 3/* Framebuffer */ -#define CONFIG_VIDEO #ifdef CONFIG_VIDEO -#define CONFIG_VIDEO_IPUV3 -#define CONFIG_CFB_CONSOLE -#define CONFIG_VGA_AS_SINGLE_DEVICE -#define CONFIG_SYS_CONSOLE_FG_COL 0xFF -#define CONFIG_SYS_CONSOLE_BG_COL 0x00#define CONFIG_HIDE_LOGO_VERSION #define CONFIG_IMX_HDMI #define CONFIG_IMX_VIDEO_SKIP
include/configs/gw_ventana.h +0 -1
@@ -136,7 +136,6 @@#define CONFIG_NETCONSOLE /* Framebuffer and LCD */ -#define CONFIG_VIDEO_IPUV3 #define CONFIG_VIDEO_LOGO #define CONFIG_IMX_HDMI #define CONFIG_IMX_VIDEO_SKIP
include/configs/m53menlo.h +0 -1
@@ -138,7 +138,6 @@* LCD */ #ifdef CONFIG_VIDEO -#define CONFIG_VIDEO_IPUV3 #define CONFIG_VIDEO_BMP_RLE8 #define CONFIG_VIDEO_BMP_GZIP #define CONFIG_SPLASH_SCREEN
include/configs/mx51evk.h +0 -1
@@ -68,7 +68,6 @@/* Framebuffer and LCD */ #define CONFIG_PREBOOT -#define CONFIG_VIDEO_IPUV3 #define CONFIG_VIDEO_BMP_RLE8 #define CONFIG_SPLASH_SCREEN #define CONFIG_BMP_16BPP
include/configs/mx53cx9020.h +0 -1
@@ -161,7 +161,6 @@/* Framebuffer and LCD */ #define CONFIG_PREBOOT -#define CONFIG_VIDEO_IPUV3 #define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE #define CONFIG_VIDEO_BMP_RLE8 #define CONFIG_SPLASH_SCREEN
include/configs/mx53loco.h +0 -1
@@ -178,7 +178,6 @@/* Framebuffer and LCD */ #define CONFIG_PREBOOT -#define CONFIG_VIDEO_IPUV3 #define CONFIG_VIDEO_BMP_RLE8 #define CONFIG_SPLASH_SCREEN #define CONFIG_BMP_16BPP
include/configs/mx53ppd.h +0 -5
@@ -215,9 +215,4 @@#define CONFIG_PWM_IMX #define CONFIG_IMX6_PWM_PER_CLK 66666000 -/* Framebuffer and LCD */ -#ifdef CONFIG_VIDEO -#define CONFIG_VIDEO_IPUV3 -#endif -#endif /* __CONFIG_H */
include/configs/mx6cuboxi.h +0 -1
@@ -35,7 +35,6 @@#define CONFIG_PHY_ATHEROS /* Framebuffer */ -#define CONFIG_VIDEO_IPUV3 #define CONFIG_VIDEO_BMP_RLE8 #define CONFIG_SPLASH_SCREEN #define CONFIG_SPLASH_SCREEN_ALIGN
include/configs/mx6sabre_common.h +0 -1
@@ -192,7 +192,6 @@#endif /* Framebuffer */ -#define CONFIG_VIDEO_IPUV3 #define CONFIG_VIDEO_BMP_RLE8 #define CONFIG_SPLASH_SCREEN #define CONFIG_SPLASH_SCREEN_ALIGN
include/configs/nitrogen6x.h +0 -1
@@ -65,7 +65,6 @@#define CONFIG_MXC_USB_FLAGS 0/* Framebuffer and LCD */ -#define CONFIG_VIDEO_IPUV3 #define CONFIG_VIDEO_BMP_RLE8 #define CONFIG_SPLASH_SCREEN #define CONFIG_SPLASH_SCREEN_ALIGN
include/configs/novena.h +0 -1
@@ -125,7 +125,6 @@/* Video output */ #ifdef CONFIG_VIDEO -#define CONFIG_VIDEO_IPUV3 #define CONFIG_VIDEO_BMP_RLE8 #define CONFIG_SPLASH_SCREEN #define CONFIG_BMP_16BPP
include/configs/tbs2910.h +0 -1
@@ -58,7 +58,6 @@/* Framebuffer */ #ifdef CONFIG_VIDEO -#define CONFIG_VIDEO_IPUV3 #define CONFIG_VIDEO_BMP_RLE8 #define CONFIG_IMX_HDMI #define CONFIG_IMX_VIDEO_SKIP
include/configs/wandboard.h +0 -1
@@ -65,7 +65,6 @@/* Framebuffer */ #ifdef CONFIG_VIDEO -#define CONFIG_VIDEO_IPUV3 #define CONFIG_VIDEO_BMP_RLE8 #define CONFIG_SPLASH_SCREEN #define CONFIG_SPLASH_SCREEN_ALIGN
Signature · 1 line
2.17.1
PATCH 3/17 imx: move CONFIG_VIDEO_IPUV3 to defconfigs
Quoted 1 line
Signed-off-by Anatolij Gustschin <[email protected]>
Applied to u-boot-imx, -next, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
PATCH 4/17 imx6: dts: add 'u-boot, dm-pre-reloc' to soc and ipu nodes
In reply to Anatolij Gustschinu-boot,dm-pre-reloc is required for reserving video memory when binding DM_VIDEO driver.
--- arch/arm/dts/imx6qdl.dtsi | 2 ++ 1 file changed, 2 insertions(+)
arch/arm/dts/imx6qdl.dtsi +2 -0
@@ -145,6 +145,7 @@ compatible = "simple-bus"; interrupt-parent = <&gpc>; ranges; + u-boot,dm-pre-reloc; dma_apbh: dma-apbh at 110000 { compatible = "fsl,imx6q-dma-apbh", "fsl,imx28-dma-apbh";
@@ -1261,6 +1262,7 @@ <&clks IMX6QDL_CLK_IPU1_DI1>; clock-names = "bus", "di0", "di1"; resets = <&src 2>; + u-boot,dm-pre-reloc; ipu1_csi0: port at 0 { reg = <0>;
Signature · 1 line
2.17.1
PATCH 4/17 imx6: dts: add 'u-boot, dm-pre-reloc' to soc and ipu nodes
Quoted 3 lines
u-boot,dm-pre-reloc is required for reserving video memory when binding
DM_VIDEOdriver.Signed-off-by Anatolij Gustschin <[email protected]>
Applied to u-boot-imx, -next, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
PATCH 5/17 apalis_imx6: convert to DM_VIDEO
In reply to Anatolij GustschinEnable DM_VIDEO in defconfig.
--- configs/apalis_imx6_defconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
configs/apalis_imx6_defconfig +2 -1
@@ -81,7 +81,8 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0x4000 CONFIG_CI_UDC=y CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_USB_HOST_ETHER=y -CONFIG_VIDEO=y +CONFIG_DM_VIDEO=y +CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_VIDEO_IPUV3=y CONFIG_FAT_WRITE=y CONFIG_OF_LIBFDT_OVERLAY=y
Signature · 1 line
2.17.1
PATCH 5/17 apalis_imx6: convert to DM_VIDEO
Quoted 2 lines
Enable
DM_VIDEOin defconfig.Signed-off-by Anatolij Gustschin <[email protected]>
Applied to u-boot-imx, -next, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
PATCH 6/17 imx6: icore: convert to DM_VIDEO
In reply to Anatolij GustschinEnable DM_VIDEO in defconfigs.
--- configs/imx6dl_icore_nand_defconfig | 2 +- configs/imx6q_icore_nand_defconfig | 2 +- configs/imx6qdl_icore_mmc_defconfig | 2 +- configs/imx6qdl_icore_nand_defconfig | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)
configs/imx6dl_icore_nand_defconfig +1 -1
@@ -49,5 +49,5 @@ CONFIG_PINCTRL=y CONFIG_PINCTRL_IMX6=y CONFIG_MXC_UART=y CONFIG_IMX_THERMAL=y -CONFIG_VIDEO=y +CONFIG_DM_VIDEO=y CONFIG_VIDEO_IPUV3=y
configs/imx6q_icore_nand_defconfig +1 -1
@@ -50,5 +50,5 @@ CONFIG_PINCTRL=y CONFIG_PINCTRL_IMX6=y CONFIG_MXC_UART=y CONFIG_IMX_THERMAL=y -CONFIG_VIDEO=y +CONFIG_DM_VIDEO=y CONFIG_VIDEO_IPUV3=y
configs/imx6qdl_icore_mmc_defconfig +1 -1
@@ -67,5 +67,5 @@ CONFIG_PINCTRL_IMX6=y CONFIG_DEBUG_UART_MXC=y CONFIG_MXC_UART=y CONFIG_IMX_THERMAL=y -CONFIG_VIDEO=y +CONFIG_DM_VIDEO=y CONFIG_VIDEO_IPUV3=y
configs/imx6qdl_icore_nand_defconfig +1 -1
@@ -50,5 +50,5 @@ CONFIG_PINCTRL=y CONFIG_PINCTRL_IMX6=y CONFIG_MXC_UART=y CONFIG_IMX_THERMAL=y -CONFIG_VIDEO=y +CONFIG_DM_VIDEO=y CONFIG_VIDEO_IPUV3=y
Signature · 1 line
2.17.1
PATCH 6/17 imx6: icore: convert to DM_VIDEO
Quoted 2 lines
Enable
DM_VIDEOin defconfigs.Signed-off-by Anatolij Gustschin <[email protected]>
Applied to u-boot-imx, -next, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
PATCH 7/17 imx6: ge_bx50v3: convert to DM_VIDEO
In reply to Anatolij GustschinEnable DM_VIDEO in defconfig.
--- configs/ge_bx50v3_defconfig | 2 +- include/configs/ge_bx50v3.h | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-)
configs/ge_bx50v3_defconfig +1 -1
@@ -60,5 +60,5 @@ CONFIG_DM_GPIO=y CONFIG_DM_SPI=y CONFIG_DM_SPI_FLASH=y CONFIG_OF_BOARD_SETUP=y -CONFIG_VIDEO=y +CONFIG_DM_VIDEO=y CONFIG_VIDEO_IPUV3=y
include/configs/ge_bx50v3.h +0 -2
@@ -208,12 +208,10 @@#define CONFIG_SYS_FSL_USDHC_NUM 3/* Framebuffer */ -#ifdef CONFIG_VIDEO #define CONFIG_HIDE_LOGO_VERSION #define CONFIG_IMX_HDMI #define CONFIG_IMX_VIDEO_SKIP #define CONFIG_CMD_BMP -#endif #define CONFIG_PWM_IMX #define CONFIG_IMX6_PWM_PER_CLK 66000000
Signature · 1 line
2.17.1
PATCH 7/17 imx6: ge_bx50v3: convert to DM_VIDEO
Quoted 2 lines
Enable
DM_VIDEOin defconfig.Signed-off-by Anatolij Gustschin <[email protected]>
Applied to u-boot-imx, -next, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
PATCH 8/17 colibri_imx6: convert to DM_VIDEO
In reply to Anatolij GustschinEnable DM_VIDEO in defconfig.
--- configs/colibri_imx6_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
configs/colibri_imx6_defconfig +1 -1
@@ -77,7 +77,7 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0x4000 CONFIG_CI_UDC=y CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_USB_HOST_ETHER=y -CONFIG_VIDEO=y +CONFIG_DM_VIDEO=y CONFIG_VIDEO_IPUV3=y CONFIG_FAT_WRITE=y CONFIG_OF_LIBFDT_OVERLAY=y
Signature · 1 line
2.17.1
PATCH 8/17 colibri_imx6: convert to DM_VIDEO
Quoted 2 lines
Enable
DM_VIDEOin defconfig.Signed-off-by Anatolij Gustschin <[email protected]>
Applied to u-boot-imx, -next, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
PATCH 9/17 mx6sabresd: convert to DM_VIDEO
In reply to Anatolij GustschinEnable DM_VIDEO in defconfig.
--- configs/mx6sabresd_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
configs/mx6sabresd_defconfig +1 -1
@@ -93,6 +93,6 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_CI_UDC=y CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y -CONFIG_VIDEO=y +CONFIG_DM_VIDEO=y CONFIG_VIDEO_IPUV3=y # CONFIG_VIDEO_SW_CURSOR is not set
Signature · 1 line
2.17.1
PATCH 9/17 mx6sabresd: convert to DM_VIDEO
Quoted 2 lines
Enable
DM_VIDEOin defconfig.Signed-off-by Anatolij Gustschin <[email protected]>
Applied to u-boot-imx, -next, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
Fabio Estevam
reviewerPATCH 9/17 mx6sabresd: convert to DM_VIDEO
In reply to Anatolij GustschinHi Anatolij,
Quoted 13 lines · Anatolij Gustschin
Enable
DM_VIDEOin defconfig.Signed-off-by Anatolij Gustschin <[email protected]>--- configs/mx6sabresd_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)configs/mx6sabresd_defconfig +0
-0
configs/mx6sabresd_defconfig CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 · line 96
Quoted 5 lines
configs/mx6sabresd_defconfig +1
-1@@ -93,6 +93,6 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_CI_UDC=y CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y -CONFIG_VIDEO=y +CONFIG_DM_VIDEO=y
I am running the latest tree from Stefano and I do not have LVDS output after this patch.
If I revert it, then LVDS output is normal again.
Any ideas?
Thanks
PATCH 9/17 mx6sabresd: convert to DM_VIDEO
Hi Fabio,
On Mon, 16 Sep 2019 15:18:34 -0300
Fabio Estevam festevam at gmail.com wrote:
...
Quoted 9 lines
configs/mx6sabresd_defconfig CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 · line 96
Quoted 2 lines
configs/mx6sabresd_defconfig +1
-1-CONFIG_VIDEO=y +CONFIG_DM_VIDEO=yI am running the latest tree from Stefano and I do not have LVDS output after this patch.
If I revert it, then LVDS output is normal again.
Any ideas?
Most probably this is because there was no user of the video device when booting and therefore the video driver was not probed/bound. Please try do display some bitmap with bmp command or try to switch to the video console by command "setenv stdout vidconsole0". Then, the video device will be probed and you should see the LVDS output.
--
Anatolij
PATCH 9/17 mx6sabresd: convert to DM_VIDEO
Hi Fabio,
Quoted 13 lines · On Mon, 16 Sep 2019 21:21:38 +0200 Anatolij Gustschin agust at denx.de wrote:
Hi Fabio,
On Mon, 16 Sep 2019 15:18:34 -0300
Fabio Estevam festevam at gmail.com wrote:
...Quoted 8 lines
configs/mx6sabresd_defconfig CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 · line 96
Quoted 2 lines
configs/mx6sabresd_defconfig +1
-1-CONFIG_VIDEO=y +CONFIG_DM_VIDEO=yI am running the latest tree from Stefano and I do not have LVDS output after this patch.
If I revert it, then LVDS output is normal again.
Quoted 8 lines
Quoted 1 line
Any ideas?
Most probably this is because there was no user of the video device when booting and therefore the video driver was not probed/bound. Please try do display some bitmap with bmp command or try to switch to the video console by command "setenv stdout vidconsole0". Then, the video device will be probed and you should see the LVDS output.
There is an example how boards can enforce using video device when booting, e.g. for displaying splash image. Please see commit f0be8ff45fb8 (ARM: imx: m53menlo: Convert to DM VIDEO).
I'm not happy that it requires to extend the board code for this and would prefer if it could be in common code. But this is what we have now.
--
Anatolij
Fabio Estevam
reviewerPATCH 9/17 mx6sabresd: convert to DM_VIDEO
In reply to Anatolij GustschinHi Anatolij,
Quoted 6 lines · Anatolij Gustschin
Most probably this is because there was no user of the video device when booting and therefore the video driver was not probed/bound. Please try do display some bitmap with bmp command or try to switch to the video console by command "setenv stdout vidconsole0". Then, the video device will be probed and you should see the LVDS output.
Here is what I tried:
=> setenv stdout vidconsole0
## Error inserting "stdout" variable, errno=22
Then I see garbage on the LVDS panel.
Any ideas as to why setting "stdout" failed?
Thanks
PATCH 9/17 mx6sabresd: convert to DM_VIDEO
Hi Fabio,
Quoted 11 lines · On Tue, 17 Sep 2019 09:32:37 -0300 Fabio Estevam festevam at gmail.com wrote:
Hi Anatolij,
Quoted 6 lines · Anatolij Gustschin
Most probably this is because there was no user of the video device when booting and therefore the video driver was not probed/bound. Please try do display some bitmap with bmp command or try to switch to the video console by command "setenv stdout vidconsole0". Then, the video device will be probed and you should see the LVDS output.
Quoted 8 lines
Here is what I tried:
=> setenv stdout vidconsole0
## Error inserting "stdout" variable, errno=22Then I see garbage on the LVDS panel.
Any ideas as to why setting "stdout" failed?
Does "setenv stdout vidconsole" work? I think I've suggested wrong command, sorry. "vidconsole0" is the driver instance name for the first video console, "vidconsole" is the correct name for console device on framebuffer.
--
Anatolij
PATCH 10/17 mx6sabreauto: convert to DM_VIDEO
In reply to Anatolij GustschinEnable DM_VIDEO in defconfig.
--- configs/mx6sabreauto_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
configs/mx6sabreauto_defconfig +1 -1
@@ -82,6 +82,6 @@ CONFIG_CI_UDC=y CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y -CONFIG_VIDEO=y +CONFIG_DM_VIDEO=y CONFIG_VIDEO_IPUV3=y # CONFIG_VIDEO_SW_CURSOR is not set
Signature · 1 line
2.17.1
PATCH 10/17 mx6sabreauto: convert to DM_VIDEO
Quoted 2 lines
Enable
DM_VIDEOin defconfig.Signed-off-by Anatolij Gustschin <[email protected]>
Applied to u-boot-imx, -next, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
PATCH 11/17 imx6: wandboard: add device tree
In reply to Anatolij GustschinAdd device trees from Linux in preparation for driver model conversions.
--- arch/arm/dts/imx6dl-wandboard-revb1.dts | 18 ++ arch/arm/dts/imx6qdl-wandboard-revb1.dtsi | 41 ++++ arch/arm/dts/imx6qdl-wandboard.dtsi | 279 ++++++++++++++++++++++ board/wandboard/MAINTAINERS | 3 + configs/wandboard_defconfig | 3 +- 5 files changed, 343 insertions(+), 1 deletion(-) create mode 100644 arch/arm/dts/imx6dl-wandboard-revb1.dts create mode 100644 arch/arm/dts/imx6qdl-wandboard-revb1.dtsi create mode 100644 arch/arm/dts/imx6qdl-wandboard.dtsi
arch/arm/dts/imx6dl-wandboard-revb1.dts new file +18 -0
@@ -0,0 +1,18 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright 2013 Freescale Semiconductor, Inc. + * + * Author: Fabio Estevam <[email protected]> + */ +/dts-v1/; +#include "imx6dl.dtsi" +#include "imx6qdl-wandboard-revb1.dtsi" + +/ { + model = "Wandboard i.MX6 Dual Lite Board rev B1"; + compatible = "wand,imx6dl-wandboard", "fsl,imx6dl"; + + memory at 10000000 { + reg = <0x10000000 0x40000000>; + }; +};
arch/arm/dts/imx6qdl-wandboard-revb1.dtsi new file +41 -0
41 lines not on this page · raw message
arch/arm/dts/imx6qdl-wandboard.dtsi new file +279 -0
279 lines not on this page · raw message
board/wandboard/MAINTAINERS +3 -0
@@ -1,6 +1,9 @@ WANDBOARD BOARD M: Fabio Estevam <[email protected]> S: Maintained +F: arch/arm/dts/imx6qdl-wandboard.dtsi +F: arch/arm/dts/imx6qdl-wandboard-revb1.dtsi +F: arch/arm/dts/imx6dl-wandboard-revb1.dts F: board/wandboard/ F: include/configs/wandboard.h F: configs/wandboard_defconfig
configs/wandboard_defconfig +2 -1
@@ -32,6 +32,8 @@ CONFIG_CMD_SATA=y CONFIG_CMD_USB=y CONFIG_CMD_CACHE=y CONFIG_CMD_EXT4_WRITE=y +CONFIG_OF_CONTROL=y +CONFIG_DEFAULT_DEVICE_TREE="imx6dl-wandboard-revb1" CONFIG_ENV_IS_IN_MMC=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_DM=y
@@ -44,4 +46,3 @@ CONFIG_USB=y CONFIG_VIDEO=y CONFIG_VIDEO_IPUV3=y # CONFIG_VIDEO_SW_CURSOR is not set -CONFIG_OF_LIBFDT=y
Signature · 1 line
2.17.1
PATCH 11/17 imx6: wandboard: add device tree
Quoted 3 lines
Add device trees from Linux in preparation for driver model conversions.
Signed-off-by Anatolij Gustschin <[email protected]>
Applied to u-boot-imx, -next, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
PATCH 12/17 imx6: wandboard: convert to DM_GPIO and enable pinctrl driver
In reply to Anatolij GustschinEnable DM_GPIO and pinctrl in defconfig and add gpio_request() calls where required.
--- board/wandboard/wandboard.c | 12 ++++++++++++ configs/wandboard_defconfig | 3 +++ 2 files changed, 15 insertions(+)
board/wandboard/wandboard.c +12 -0
@@ -131,12 +131,14 @@ static void setup_iomux_enet(void)if (with_pmic) {SETUP_IOMUX_PADS (enet_ar8035_power_pads);/* enable AR8035 POWER */ +gpio_request (ETH_PHY_AR8035_POWER ,"PHY_POWER" );gpio_direction_output (ETH_PHY_AR8035_POWER ,0 ); }/* wait until 3.3V of PHY and clock become stable */ mdelay (10 );/* Reset AR8031 PHY */ +gpio_request (ETH_PHY_RESET ,"PHY_RESET" );gpio_direction_output (ETH_PHY_RESET ,0 );mdelay (10 );gpio_set_value (ETH_PHY_RESET ,1 );
@@ -170,6 +172,11 @@ int board_mmc_init(bd_t *bis)int ret;u32 index =0 ; +#if !CONFIG_IS_ENABLED (DM_MMC ) +gpio_request (USDHC1_CD_GPIO ,"USDHC1_CD" ); +gpio_request (USDHC3_CD_GPIO ,"USDHC3_CD" ); +#endif +/* * Following map is done: * (U-Boot device node) (Physical Port)
@@ -356,6 +363,8 @@ static void enable_fwadapt_7wvga(struct display_info_t const *dev) {SETUP_IOMUX_PADS (fwadapt_7wvga_pads); +gpio_request (IMX_GPIO_NR (2 ,10 ),"DISP0_BKLEN" ); +gpio_request (IMX_GPIO_NR (2 ,11 ),"DISP0_VDDEN" );gpio_direction_output (IMX_GPIO_NR (2 ,10 ),1 );gpio_direction_output (IMX_GPIO_NR (2 ,11 ),1 ); }
@@ -418,6 +427,7 @@ static void setup_display(void)/* Disable LCD backlight */ SETUP_IOMUX_PAD (PAD_DI0_PIN4__GPIO4_IO20 ); +gpio_request (IMX_GPIO_NR (4 ,20 ),"LCD_BKLEN" ); gpio_direction_input(IMX_GPIO_NR(4, 20)); }#endif /* CONFIG_VIDEO_IPUV3 */
@@ -548,6 +558,8 @@ int board_init(void)int checkboard (void ) { +gpio_request (REV_DETECTION ,"REV_DETECT" ); +if (is_revd1 ())puts ("Board: Wandboard rev D1\n" );else if (is_revc1 ())
configs/wandboard_defconfig +3 -0
@@ -38,9 +38,12 @@ CONFIG_ENV_IS_IN_MMC=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_DM=y CONFIG_DWC_AHSATA=y +CONFIG_DM_GPIO=y CONFIG_FSL_ESDHC=y CONFIG_PHYLIB=y CONFIG_MII=y +CONFIG_PINCTRL=y +CONFIG_PINCTRL_IMX6=y CONFIG_DM_THERMAL=y CONFIG_USB=y CONFIG_VIDEO=y
Signature · 1 line
2.17.1
PATCH 12/17 imx6: wandboard: convert to DM_GPIO and enable pinctrl driver
Quoted 3 lines
Enable
DM_GPIOand pinctrl in defconfig and addgpio_request()calls where required.Signed-off-by Anatolij Gustschin <[email protected]>
Applied to u-boot-imx, -next, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
PATCH 13/17 imx6: wandboard: convert to DM_USB
In reply to Anatolij GustschinDrop CONFIG_USB_MAX_CONTROLLER_COUNT and enable DM_USB in defconfig.
--- configs/wandboard_defconfig | 1 + include/configs/wandboard.h | 1 - 2 files changed, 1 insertion(+), 1 deletion(-)
configs/wandboard_defconfig +1 -0
@@ -46,6 +46,7 @@ CONFIG_PINCTRL=y CONFIG_PINCTRL_IMX6=y CONFIG_DM_THERMAL=y CONFIG_USB=y +CONFIG_DM_USB=y CONFIG_VIDEO=y CONFIG_VIDEO_IPUV3=y # CONFIG_VIDEO_SW_CURSOR is not set
include/configs/wandboard.h +0 -1
@@ -51,7 +51,6 @@#define CONFIG_SYS_FSL_ESDHC_ADDR 0/* USB Configs */ -#define CONFIG_USB_MAX_CONTROLLER_COUNT 2#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)#define CONFIG_MXC_USB_FLAGS 0
Signature · 1 line
2.17.1
PATCH 13/17 imx6: wandboard: convert to DM_USB
Quoted 3 lines
Drop
CONFIG_USB_MAX_CONTROLLER_COUNTand enableDM_USBin defconfig.Signed-off-by Anatolij Gustschin <[email protected]>
Applied to u-boot-imx, -next, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
PATCH 14/17 imx6: wandboard: convert to DM_VIDEO
In reply to Anatolij GustschinEnable DM_VIDEO in defconfig.
--- configs/wandboard_defconfig | 2 +- include/configs/wandboard.h | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-)
configs/wandboard_defconfig +1 -1
@@ -47,6 +47,6 @@ CONFIG_PINCTRL_IMX6=y CONFIG_DM_THERMAL=y CONFIG_USB=y CONFIG_DM_USB=y -CONFIG_VIDEO=y +CONFIG_DM_VIDEO=y CONFIG_VIDEO_IPUV3=y # CONFIG_VIDEO_SW_CURSOR is not set
include/configs/wandboard.h +0 -2
@@ -63,7 +63,6 @@#define CONFIG_PHY_ATHEROS /* Framebuffer */ -#ifdef CONFIG_VIDEO #define CONFIG_VIDEO_BMP_RLE8 #define CONFIG_SPLASH_SCREEN #define CONFIG_SPLASH_SCREEN_ALIGN
@@ -72,7 +71,6 @@#define CONFIG_VIDEO_BMP_LOGO #define CONFIG_IMX_HDMI #define CONFIG_IMX_VIDEO_SKIP -#endif #define CONFIG_EXTRA_ENV_SETTINGS \ "console=ttymxc0\0" \
Signature · 1 line
2.17.1
PATCH 14/17 imx6: wandboard: convert to DM_VIDEO
Quoted 2 lines
Enable
DM_VIDEOin defconfig.Signed-off-by Anatolij Gustschin <[email protected]>
Applied to u-boot-imx, -next, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
PATCH 15/17 imx6: wandboard: convert to DM_PMIC
In reply to Anatolij GustschinEnable DM_PMIC_PFUZE100 driver and add PMIC description to DTS. Rework power_init_board() code.
--- arch/arm/dts/imx6qdl-wandboard.dtsi | 101 ++++++++++++++++++++++++++++ board/wandboard/wandboard.c | 38 ++++++----- configs/wandboard_defconfig | 2 + include/configs/wandboard.h | 6 -- 4 files changed, 125 insertions(+), 22 deletions(-)
arch/arm/dts/imx6qdl-wandboard.dtsi +101 -0
@@ -90,6 +90,107 @@ VDDIO-supply = <®_3p3v>; lrclk-strength = <3>; }; + + pmic: pfuze100 at 8 { + compatible = "fsl,pfuze100"; + reg = <0x08>; + + regulators { + sw1a_reg: sw1ab { + regulator-min-microvolt = <300000>; + regulator-max-microvolt = <1875000>; + regulator-boot-on; + regulator-always-on; + regulator-ramp-delay = <6250>; + }; + + sw1c_reg: sw1c { + regulator-min-microvolt = <300000>; + regulator-max-microvolt = <1875000>; + regulator-boot-on; + regulator-always-on; + regulator-ramp-delay = <6250>; + }; + + sw2_reg: sw2 { + regulator-min-microvolt = <800000>; + regulator-max-microvolt = <3300000>; + regulator-boot-on; + regulator-always-on; + regulator-ramp-delay = <6250>; + }; + + sw3a_reg: sw3a { + regulator-min-microvolt = <400000>; + regulator-max-microvolt = <1975000>; + regulator-boot-on; + regulator-always-on; + }; + + sw3b_reg: sw3b { + regulator-min-microvolt = <400000>; + regulator-max-microvolt = <1975000>; + regulator-boot-on; + regulator-always-on; + }; + + sw4_reg: sw4 { + regulator-min-microvolt = <800000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + }; + + swbst_reg: swbst { + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5150000>; + }; + + snvs_reg: vsnvs { + regulator-min-microvolt = <1000000>; + regulator-max-microvolt = <3000000>; + regulator-boot-on; + regulator-always-on; + }; + + vref_reg: vrefddr { + regulator-boot-on; + regulator-always-on; + }; + + vgen1_reg: vgen1 { + regulator-min-microvolt = <800000>; + regulator-max-microvolt = <1550000>; + }; + + vgen2_reg: vgen2 { + regulator-min-microvolt = <800000>; + regulator-max-microvolt = <1550000>; + }; + + vgen3_reg: vgen3 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <3300000>; + }; + + vgen4_reg: vgen4 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + }; + + vgen5_reg: vgen5 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + }; + + vgen6_reg: vgen6 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + }; + }; + }; }; &iomuxc {
board/wandboard/wandboard.c +22 -16
@@ -453,24 +453,30 @@ int board_early_init_f(void)int power_init_board (void ) { -struct pmic *p; -u32 reg; - -/* configure PFUZE100 PMIC */ -power_pfuze100_init (PMIC_I2C_BUS ); - p =pmic_get ("PFUZE100" ); -if (p && !pmic_probe (p)) { -pmic_reg_read (p,PFUZE100_DEVICEID , ®); -printf ("PMIC: PFUZE100 ID=0x%02x\n" , reg); - with_pmic = true; - -/* Set VGEN2 to 1.5V and enable */ -pmic_reg_read (p,PFUZE100_VGEN2VOL , ®); - reg &= ~(LDO_VOL_MASK ); - reg |= (LDOA_1_50V | (1 << (LDO_EN ))); -pmic_reg_write (p,PFUZE100_VGEN2VOL , reg); +struct udevice *dev; +int reg, ret; + +puts ("PMIC: " ); + + ret =pmic_get ("pfuze100" , &dev); +if (ret <0 ) { +printf ("pmic_get() ret %d\n" , ret); +return 0 ; } + reg =pmic_reg_read (dev,PFUZE100_DEVICEID ); +if (reg <0 ) { +printf ("pmic_reg_read() ret %d\n" , reg); +return 0 ; + } +printf ("PMIC: PFUZE100 ID=0x%02x\n" , reg); + with_pmic = true; + +/* Set VGEN2 to 1.5V and enable */ + reg =pmic_reg_read (dev,PFUZE100_VGEN2VOL ); + reg &= ~(LDO_VOL_MASK ); + reg |= (LDOA_1_50V | (1 << (LDO_EN ))); +pmic_reg_write (dev,PFUZE100_VGEN2VOL , reg);return 0 ; }
configs/wandboard_defconfig +2 -0
@@ -44,6 +44,8 @@ CONFIG_PHYLIB=y CONFIG_MII=y CONFIG_PINCTRL=y CONFIG_PINCTRL_IMX6=y +CONFIG_DM_PMIC=y +CONFIG_DM_PMIC_PFUZE100=y CONFIG_DM_THERMAL=y CONFIG_USB=y CONFIG_DM_USB=y
include/configs/wandboard.h +0 -6
@@ -40,12 +40,6 @@#define CONFIG_SYS_I2C_MXC_I2C3 /* enable I2C bus 3 */ #define CONFIG_SYS_I2C_SPEED 100000 -/* PMIC */ -#define CONFIG_POWER -#define CONFIG_POWER_I2C -#define CONFIG_POWER_PFUZE100 -#define CONFIG_POWER_PFUZE100_I2C_ADDR 0x08 -/* MMC Configuration */ #define CONFIG_SYS_FSL_USDHC_NUM 2#define CONFIG_SYS_FSL_ESDHC_ADDR 0
Signature · 1 line
2.17.1
PATCH 15/17 imx6: wandboard: convert to DM_PMIC
Quoted 3 lines
Enable
DM_PMIC_PFUZE100driver and add PMIC description to DTS. Reworkpower_init_board()code.Signed-off-by Anatolij Gustschin <[email protected]>
Applied to u-boot-imx, -next, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
PATCH 16/17 imx6: wandboard: convert to DM_I2C
In reply to Anatolij GustschinAllow building with DM_I2C enabled.
--- board/wandboard/wandboard.c | 23 ++++++++++++++++++----- configs/wandboard_defconfig | 5 +++++ include/configs/wandboard.h | 8 -------- 3 files changed, 23 insertions(+), 13 deletions(-)
board/wandboard/wandboard.c +18 -5
@@ -355,8 +355,21 @@ static void do_enable_hdmi(struct display_info_t const *dev)static int detect_i2c (struct display_info_t const *dev) { +#ifdef CONFIG_DM_I2C +struct udevice *bus, *udev; +int rc; + + rc =uclass_get_device_by_seq (UCLASS_I2C , dev->bus, &bus); +if (rc) +return rc; + rc =dm_i2c_probe (bus, dev->addr,0 , &udev); +if (rc) +return 0 ; +return 1 ; +#else return (0 ==i2c_set_bus_num (dev->bus)) && (0 ==i2c_probe (dev->addr)); +#endif }static void enable_fwadapt_7wvga (struct display_info_t const *dev)
@@ -547,13 +560,13 @@ int board_init(void) gd->bd->bi_boot_params =PHYS_SDRAM +0x100 ;#if defined(CONFIG_VIDEO_IPUV3 ) -setup_i2c (1 ,CONFIG_SYS_I2C_SPEED ,0x7f , &mx6dl_i2c2_pad_info); +setup_i2c (1 ,CONFIG_SYS_MXC_I2C1_SPEED ,0x7f , &mx6dl_i2c2_pad_info);if (is_mx6dq () ||is_mx6dqp ()) { -setup_i2c (1 ,CONFIG_SYS_I2C_SPEED ,0x7f , &mx6q_i2c2_pad_info); -setup_i2c (2 ,CONFIG_SYS_I2C_SPEED ,0x7f , &mx6q_i2c3_pad_info); +setup_i2c (1 ,CONFIG_SYS_MXC_I2C1_SPEED ,0x7f , &mx6q_i2c2_pad_info); +setup_i2c (2 ,CONFIG_SYS_MXC_I2C2_SPEED ,0x7f , &mx6q_i2c3_pad_info); }else { -setup_i2c (1 ,CONFIG_SYS_I2C_SPEED ,0x7f , &mx6dl_i2c2_pad_info); -setup_i2c (2 ,CONFIG_SYS_I2C_SPEED ,0x7f , &mx6dl_i2c3_pad_info); +setup_i2c (1 ,CONFIG_SYS_MXC_I2C1_SPEED ,0x7f , &mx6dl_i2c2_pad_info); +setup_i2c (2 ,CONFIG_SYS_MXC_I2C2_SPEED ,0x7f , &mx6dl_i2c3_pad_info); }setup_display ();
configs/wandboard_defconfig +5 -0
@@ -39,6 +39,11 @@ CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_DM=y CONFIG_DWC_AHSATA=y CONFIG_DM_GPIO=y +CONFIG_DM_I2C=y +CONFIG_SYS_I2C_MXC=y +CONFIG_SYS_I2C_MXC_I2C1=y +CONFIG_SYS_I2C_MXC_I2C2=y +CONFIG_SYS_I2C_MXC_I2C3=y CONFIG_FSL_ESDHC=y CONFIG_PHYLIB=y CONFIG_MII=y
include/configs/wandboard.h +0 -8
@@ -32,14 +32,6 @@#define CONFIG_SYS_MEMTEST_START 0x10000000#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 500 * SZ_1M) -/* I2C Configs */ -#define CONFIG_SYS_I2C -#define CONFIG_SYS_I2C_MXC -#define CONFIG_SYS_I2C_MXC_I2C1 /* enable I2C bus 1 */ -#define CONFIG_SYS_I2C_MXC_I2C2 /* enable I2C bus 2 */ -#define CONFIG_SYS_I2C_MXC_I2C3 /* enable I2C bus 3 */ -#define CONFIG_SYS_I2C_SPEED 100000 -/* MMC Configuration */ #define CONFIG_SYS_FSL_USDHC_NUM 2#define CONFIG_SYS_FSL_ESDHC_ADDR 0
Signature · 1 line
2.17.1
PATCH 16/17 imx6: wandboard: convert to DM_I2C
Quoted 2 lines
Allow building with
DM_I2Cenabled.Signed-off-by Anatolij Gustschin <[email protected]>
Applied to u-boot-imx, -next, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
PATCH 17/17 imx6: wandboard: convert to DM_MMC
In reply to Anatolij GustschinMove SDHC init to SPL code since it is not required with DM_MMC. Enable DM_MMC support.
--- board/wandboard/spl.c | 92 +++++++++++++++++++++++++++++++++++ board/wandboard/wandboard.c | 97 ------------------------------------- configs/wandboard_defconfig | 1 + 3 files changed, 93 insertions(+), 97 deletions(-)
board/wandboard/spl.c +92 -0
@@ -422,4 +422,96 @@ void board_init_f(ulong dummy)/* DDR initialization */ spl_dram_init (); } + +#define USDHC1_CD_GPIO IMX_GPIO_NR(1, 2) +#define USDHC3_CD_GPIO IMX_GPIO_NR(3, 9) + +#define USDHC_PAD_CTRL (PAD_CTL_PUS_47K_UP | \ + PAD_CTL_SPEED_LOW | PAD_CTL_DSE_80ohm | \ + PAD_CTL_SRE_FAST | PAD_CTL_HYS) + +static struct fsl_esdhc_cfg usdhc_cfg[2 ] = { + {USDHC3_BASE_ADDR }, + {USDHC1_BASE_ADDR }, +}; + +static iomux_v3_cfg_t const usdhc1_pads[] = { +IOMUX_PADS (PAD_SD1_CLK__SD1_CLK |MUX_PAD_CTRL (USDHC_PAD_CTRL )), +IOMUX_PADS (PAD_SD1_CMD__SD1_CMD |MUX_PAD_CTRL (USDHC_PAD_CTRL )), +IOMUX_PADS (PAD_SD1_DAT0__SD1_DATA0 |MUX_PAD_CTRL (USDHC_PAD_CTRL )), +IOMUX_PADS (PAD_SD1_DAT1__SD1_DATA1 |MUX_PAD_CTRL (USDHC_PAD_CTRL )), +IOMUX_PADS (PAD_SD1_DAT2__SD1_DATA2 |MUX_PAD_CTRL (USDHC_PAD_CTRL )), +IOMUX_PADS (PAD_SD1_DAT3__SD1_DATA3 |MUX_PAD_CTRL (USDHC_PAD_CTRL )), +/* Carrier MicroSD Card Detect */ +IOMUX_PADS (PAD_GPIO_2__GPIO1_IO02 |MUX_PAD_CTRL (NO_PAD_CTRL )), +}; + +static iomux_v3_cfg_t const usdhc3_pads[] = { +IOMUX_PADS (PAD_SD3_CLK__SD3_CLK |MUX_PAD_CTRL (USDHC_PAD_CTRL )), +IOMUX_PADS (PAD_SD3_CMD__SD3_CMD |MUX_PAD_CTRL (USDHC_PAD_CTRL )), +IOMUX_PADS (PAD_SD3_DAT0__SD3_DATA0 |MUX_PAD_CTRL (USDHC_PAD_CTRL )), +IOMUX_PADS (PAD_SD3_DAT1__SD3_DATA1 |MUX_PAD_CTRL (USDHC_PAD_CTRL )), +IOMUX_PADS (PAD_SD3_DAT2__SD3_DATA2 |MUX_PAD_CTRL (USDHC_PAD_CTRL )), +IOMUX_PADS (PAD_SD3_DAT3__SD3_DATA3 |MUX_PAD_CTRL (USDHC_PAD_CTRL )), +/* SOM MicroSD Card Detect */ +IOMUX_PADS (PAD_EIM_DA9__GPIO3_IO09 |MUX_PAD_CTRL (NO_PAD_CTRL )), +}; + +int board_mmc_getcd (struct mmc *mmc) +{ +struct fsl_esdhc_cfg *cfg = (struct fsl_esdhc_cfg *)mmc->priv; +int ret =0 ; + +switch (cfg->esdhc_base) { +case USDHC1_BASE_ADDR : + ret = !gpio_get_value (USDHC1_CD_GPIO ); +break ; +case USDHC3_BASE_ADDR : + ret = !gpio_get_value (USDHC3_CD_GPIO ); +break ; + } + +return ret; +} + +int board_mmc_init (bd_t *bis) +{ +int ret; +u32 index =0 ; + +/* +* Following map is done: +* (U-Boot device node) (Physical Port) +* mmc0 SOM MicroSD +* mmc1 Carrier board MicroSD +*/ +for (index =0 ; index <CONFIG_SYS_FSL_USDHC_NUM ; ++index) { +switch (index) { +case 0 : +SETUP_IOMUX_PADS (usdhc3_pads); + usdhc_cfg[0 ].sdhc_clk =mxc_get_clock (MXC_ESDHC3_CLK ); + usdhc_cfg[0 ].max_bus_width =4 ; +gpio_direction_input (USDHC3_CD_GPIO ); +break ; +case 1 : +SETUP_IOMUX_PADS (usdhc1_pads); + usdhc_cfg[1 ].sdhc_clk =mxc_get_clock (MXC_ESDHC_CLK ); + usdhc_cfg[1 ].max_bus_width =4 ; +gpio_direction_input (USDHC1_CD_GPIO ); +break ; +default : +printf ("Warning: you configured more USDHC controllers" +"(%d) then supported by the board (%d)\n" , + index +1 ,CONFIG_SYS_FSL_USDHC_NUM ); +return -EINVAL ; + } + + ret =fsl_esdhc_initialize (bis, &usdhc_cfg[index]); +if (ret) +return ret; + } + +return 0 ; +} +#endif
board/wandboard/wandboard.c +0 -97
127 lines not on this page · raw message
configs/wandboard_defconfig +1 -0
@@ -44,6 +44,7 @@ CONFIG_SYS_I2C_MXC=y CONFIG_SYS_I2C_MXC_I2C1=y CONFIG_SYS_I2C_MXC_I2C2=y CONFIG_SYS_I2C_MXC_I2C3=y +CONFIG_DM_MMC=y CONFIG_FSL_ESDHC=y CONFIG_PHYLIB=y CONFIG_MII=y
Signature · 1 line
2.17.1
PATCH 17/17 imx6: wandboard: convert to DM_MMC
Quoted 3 lines
Move SDHC init to SPL code since it is not required with
DM_MMC. EnableDM_MMCsupport.Signed-off-by Anatolij Gustschin <[email protected]>
Applied to u-boot-imx, -next, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
cover Convert some imx6 boards to DM_VIDEO
In reply to Anatolij GustschinQuoted 1 line · On Mon, 18 Mar 2019 23:29:30 +0100 Anatolij Gustschin agust at denx.de wrote:
This series starts conversion of ipuv3 driver to
DM_VIDEO.
These patches are based on 'next' branch of git://git.denx.de/u-boot-imx.git.
--
Anatolij
Fabio Estevam
reviewercover Convert some imx6 boards to DM_VIDEO
In reply to Anatolij GustschinHi Anatolij,
Quoted 13 lines · Anatolij Gustschin
This series starts conversion of ipuv3 driver to
DM_VIDEO. It has been tested onapalis_imx6module with LVDS display attached and on wandboard with HDMI display.With applied "[PATCH 17/17] imx6: wandboard: convert to
DM_MMC" building wandboard target doesn't work. To fix this please apply patches [1], [2] and enableCONFIG_AHCIandCONFIG_DM_SCSIinwandboard_defconfig.[1] http://patchwork.ozlabs.org/patch/1050141
[2] http://patchwork.ozlabs.org/patch/1050143
Quoted 12 lines
Anatolij Gustschin (17):
video: ipuv3: addDM_VIDEOsupport
video: move ipuv3 files to subdirectory
imx: moveCONFIG_VIDEO_IPUV3to defconfigs
imx6: dts: add 'u-boot,dm-pre-reloc' to soc and ipu nodes
apalis_imx6: convert toDM_VIDEO
imx6: icore: convert toDM_VIDEO
imx6:ge_bx50v3: convert toDM_VIDEO
colibri_imx6: convert toDM_VIDEO
mx6sabresd: convert toDM_VIDEO
mx6sabreauto: convert toDM_VIDEO
imx6: wandboard: add device tree
Thanks for converting wandboard to DM.
I haven't had a chance to test this series yet, but I am wondering if the SPL size can still fit in the 64k of the internal RAM available on mx6solo.
Do you know?
Thanks
cover Convert some imx6 boards to DM_VIDEO
Hi Fabio,
On Wed, 20 Mar 2019 10:25:02 -0300
Fabio Estevam festevam at gmail.com wrote:
...
Quoted 7 lines
Thanks for converting wandboard to DM.
I haven't had a chance to test this series yet, but I am wondering if the SPL size can still fit in the 64k of the internal RAM available on mx6solo.
Do you know?
I've tested on wandboard with MX6Solo, the SPL size was 47 KiB.
Thanks,
Anatolij
Fabio Estevam
reviewercover Convert some imx6 boards to DM_VIDEO
Hi Anatolij,
Quoted 1 line · Anatolij Gustschin
I've tested on wandboard with MX6Solo, the SPL size was 47 KiB.
Excellent! That's great news, thanks :-)