V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

tegra: Allow CONFIG_DM_VIDEO to be used as well as CONFIG_LCD 

While we transition to using driver model for video, we need to support both
options.

Signed-off-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Tom Warren <twarren@nvidia.com>
This commit is contained in:
Simon Glass 2016-01-30 16:37:49 -07:00 committed by Tom Warren
parent 3f2997a40c
commit 135a87ef43
2 changed files with 14 additions and 4 deletions
arch/arm/mach-tegra
board2.c
include/configs
tegra-common-post.h

8
arch/arm/mach-tegra/board2.c
View File

@ -139,8 +139,10 @@ int board_init(void)
if (pwm_init(gd->fdt_blob)) if (pwm_init(gd->fdt_blob))
debug("%s: Failed to init pwm\n", __func__); debug("%s: Failed to init pwm\n", __func__);
#endif #endif
#ifdef CONFIG_LCD #if defined(CONFIG_LCD) || defined(CONFIG_DM_VIDEO)
pin_mux_display(); pin_mux_display();
#endif
#ifdef CONFIG_LCD
tegra_lcd_check_next_stage(gd->fdt_blob, 0); tegra_lcd_check_next_stage(gd->fdt_blob, 0);
#endif #endif
/* boot param addr */ /* boot param addr */
@ -169,11 +171,13 @@ int board_init(void)
pin_mux_usb(); pin_mux_usb();
#endif #endif
#ifdef CONFIG_LCD #if defined(CONFIG_LCD) || defined(CONFIG_DM_VIDEO)
board_id = tegra_board_id(); board_id = tegra_board_id();
err = tegra_lcd_pmic_init(board_id); err = tegra_lcd_pmic_init(board_id);
if (err) if (err)
return err; return err;
#endif
#ifdef CONFIG_LCD
tegra_lcd_check_next_stage(gd->fdt_blob, 0); tegra_lcd_check_next_stage(gd->fdt_blob, 0);
#endif #endif

10
include/configs/tegra-common-post.h
View File

@ -53,6 +53,12 @@
#define STDOUT_LCD "" #define STDOUT_LCD ""
#endif #endif
#ifdef CONFIG_DM_VIDEO
#define STDOUT_VIDEO ",vidconsole"
#else
#define STDOUT_VIDEO ""
#endif
#ifdef CONFIG_CROS_EC_KEYB #ifdef CONFIG_CROS_EC_KEYB
#define STDOUT_CROS_EC ",cros-ec-keyb" #define STDOUT_CROS_EC ",cros-ec-keyb"
#else #else
@ -61,8 +67,8 @@
#define TEGRA_DEVICE_SETTINGS \ #define TEGRA_DEVICE_SETTINGS \
"stdin=serial" STDIN_KBD_KBC STDIN_KBD_USB STDOUT_CROS_EC "\0" \ "stdin=serial" STDIN_KBD_KBC STDIN_KBD_USB STDOUT_CROS_EC "\0" \
"stdout=serial" STDOUT_LCD "\0" \ "stdout=serial" STDOUT_LCD STDOUT_VIDEO "\0" \
"stderr=serial" STDOUT_LCD "\0" \ "stderr=serial" STDOUT_LCD STDOUT_VIDEO "\0" \
"" ""
#ifndef BOARD_EXTRA_ENV_SETTINGS #ifndef BOARD_EXTRA_ENV_SETTINGS