diff options
| author | Simon Glass <sjg@chromium.org> | 2016-01-30 16:37:49 -0700 |
|---|---|---|
| committer | Tom Warren <twarren@nvidia.com> | 2016-02-16 09:17:51 -0700 |
| commit | 135a87ef43566cdd592fa9fd899bf435aa14aaa3 (patch) | |
| tree | 0ef4aef10bab6055a7f13b9a8609c813a89081ec /arch | |
| parent | 3f2997a40c78ad4dae48809a5c9fdfe9505787c5 (diff) | |
| download | talos-obmc-uboot-135a87ef43566cdd592fa9fd899bf435aa14aaa3.tar.gz talos-obmc-uboot-135a87ef43566cdd592fa9fd899bf435aa14aaa3.zip | |
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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-tegra/board2.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/arm/mach-tegra/board2.c b/arch/arm/mach-tegra/board2.c index 15b5cb6a0d..c03f3e2052 100644 --- a/arch/arm/mach-tegra/board2.c +++ b/arch/arm/mach-tegra/board2.c @@ -139,8 +139,10 @@ int board_init(void) if (pwm_init(gd->fdt_blob)) debug("%s: Failed to init pwm\n", __func__); #endif -#ifdef CONFIG_LCD +#if defined(CONFIG_LCD) || defined(CONFIG_DM_VIDEO) pin_mux_display(); +#endif +#ifdef CONFIG_LCD tegra_lcd_check_next_stage(gd->fdt_blob, 0); #endif /* boot param addr */ @@ -169,11 +171,13 @@ int board_init(void) pin_mux_usb(); #endif -#ifdef CONFIG_LCD +#if defined(CONFIG_LCD) || defined(CONFIG_DM_VIDEO) board_id = tegra_board_id(); err = tegra_lcd_pmic_init(board_id); if (err) return err; +#endif +#ifdef CONFIG_LCD tegra_lcd_check_next_stage(gd->fdt_blob, 0); #endif |
