summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Hendricks <dhendrix@chromium.org>2015-01-30 17:23:20 -0800
committerStefan Reinauer <stefan.reinauer@coreboot.org>2015-04-15 16:50:45 +0200
commitd7d50fdd260190fc4d6f2ee084cb43aff0427b1a (patch)
tree1722b933eeab8000a40baa9d991956d282b39841
parent3be454e5ebeba8bdc82184ca12cb92c569cc908a (diff)
downloadcoreboot-d7d50fdd260190fc4d6f2ee084cb43aff0427b1a.tar.xz
veyron_danger: Enable EDP display init
Danger has EDP, the original code was copied from Brain which didn't. BUG=none BRANCH=none TEST=built and booted on danger Change-Id: Ib8e48078cc51fe0e1fb7049f70e810b8f0a7690a Signed-off-by: Patrick Georgi <pgeorgi@chromium.org> Original-Commit-Id: 25fc6b4d82fb4bd80798cc809af4dacc6208109e Original-Change-Id: Ic8b3f685e08bb96125c57d42db6a10e348a1a096 Original-Signed-off-by: David Hendricks <dhendrix@chromium.org> Original-Reviewed-on: https://chromium-review.googlesource.com/245161 Original-Reviewed-by: Julius Werner <jwerner@chromium.org> Reviewed-on: http://review.coreboot.org/9679 Tested-by: build bot (Jenkins) Reviewed-by: Marc Jones <marc.jones@se-eng.com>
-rw-r--r--src/mainboard/google/veyron_danger/Kconfig8
-rw-r--r--src/mainboard/google/veyron_danger/board.h1
-rw-r--r--src/mainboard/google/veyron_danger/mainboard.c1
3 files changed, 2 insertions, 8 deletions
diff --git a/src/mainboard/google/veyron_danger/Kconfig b/src/mainboard/google/veyron_danger/Kconfig
index b11f454d71..719064ef8e 100644
--- a/src/mainboard/google/veyron_danger/Kconfig
+++ b/src/mainboard/google/veyron_danger/Kconfig
@@ -74,14 +74,6 @@ config CONSOLE_SERIAL_UART_ADDRESS
depends on CONSOLE_SERIAL_UART
default 0xFF690000
-# FIXME(dhendrix): This is a gross hack intended to get us past
-# display init which currently hangs the machine. It will be removed
-# once we've re-factored the display init code to properly handle
-# various types of displays.
-config SKIP_DISPLAY_INIT_HACK
- int
- default 1
-
config PMIC_BUS
int
default 0
diff --git a/src/mainboard/google/veyron_danger/board.h b/src/mainboard/google/veyron_danger/board.h
index 96159d41e8..bd826aafdf 100644
--- a/src/mainboard/google/veyron_danger/board.h
+++ b/src/mainboard/google/veyron_danger/board.h
@@ -23,6 +23,7 @@
#include <boardid.h>
#include <gpio.h>
+#define GPIO_BACKLIGHT GPIO(7, A, 3)
#define GPIO_RESET GPIO(0, B, 5)
/* TODO: move setup_chromeos_gpios() here once bootblock code is in mainboard */
diff --git a/src/mainboard/google/veyron_danger/mainboard.c b/src/mainboard/google/veyron_danger/mainboard.c
index 4d817e65b0..716b2b8643 100644
--- a/src/mainboard/google/veyron_danger/mainboard.c
+++ b/src/mainboard/google/veyron_danger/mainboard.c
@@ -129,4 +129,5 @@ void lb_board(struct lb_header *header)
void mainboard_power_on_backlight(void)
{
+ gpio_output(GPIO_BACKLIGHT, 1); /* BL_EN */
}