From f055aa0632729bfab3116233309bb29294379931 Mon Sep 17 00:00:00 2001
From: Jimmy Zhang <jimmzhang@nvidia.com>
Date: Tue, 9 Dec 2014 15:37:29 -0800
Subject: ryu: display: Move display api to mainboard

Display configuration is board specific. The change here is preparing
for supporting other than dsi interface.

BUG=chrome-os-partner:34336
BRANCH=none
TEST=build ryu and test dev/rec mode, also build rush ok

Change-Id: Ied39d5d539d2be4983ab70976bffbe51fccba276
Signed-off-by: Stefan Reinauer <reinauer@chromium.org>
Original-Commit-Id: 36be6b2e35c6246d5384d71b9ab9d4ddbf17764a
Original-Change-Id: I494a04f7d6c0dbad2d472f4c2cd0aabfb23b8c97
Original-Signed-off-by: Jimmy Zhang <jimmzhang@nvidia.com>
Original-Reviewed-on: https://chromium-review.googlesource.com/234271
Original-Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: http://review.coreboot.org/9584
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
---
 src/mainboard/google/rush_ryu/mainboard.c     | 7 +++++++
 src/soc/nvidia/tegra132/dsi.c                 | 2 +-
 src/soc/nvidia/tegra132/include/soc/display.h | 2 ++
 3 files changed, 10 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/mainboard/google/rush_ryu/mainboard.c b/src/mainboard/google/rush_ryu/mainboard.c
index 8efd0a0de7..2b234815b5 100644
--- a/src/mainboard/google/rush_ryu/mainboard.c
+++ b/src/mainboard/google/rush_ryu/mainboard.c
@@ -32,6 +32,8 @@
 #include <soc/funitcfg.h>
 #include <soc/nvidia/tegra/i2c.h>
 #include <soc/padconfig.h>
+#include <soc/nvidia/tegra/dc.h>
+#include <soc/display.h>
 #include <vendorcode/google/chromeos/chromeos.h>
 #if IS_ENABLED(CONFIG_CHROMEOS)
 #include <vboot_struct.h>
@@ -280,6 +282,11 @@ static void mainboard_init(device_t dev)
 		configure_display_blocks();
 }
 
+void display_startup(device_t dev)
+{
+	dsi_display_startup(dev);
+}
+
 static void mainboard_enable(device_t dev)
 {
 	dev->ops->init = &mainboard_init;
diff --git a/src/soc/nvidia/tegra132/dsi.c b/src/soc/nvidia/tegra132/dsi.c
index cfeb7fdebc..ad27b3d8b4 100644
--- a/src/soc/nvidia/tegra132/dsi.c
+++ b/src/soc/nvidia/tegra132/dsi.c
@@ -875,7 +875,7 @@ static int dsi_enable(struct soc_nvidia_tegra132_config *config)
 	return 0;
 }
 
-void display_startup(device_t dev)
+void dsi_display_startup(device_t dev)
 {
 	struct soc_nvidia_tegra132_config *config = dev->chip_info;
 	struct display_controller *disp_ctrl =
diff --git a/src/soc/nvidia/tegra132/include/soc/display.h b/src/soc/nvidia/tegra132/include/soc/display.h
index b0f2573246..62c4c0f617 100644
--- a/src/soc/nvidia/tegra132/include/soc/display.h
+++ b/src/soc/nvidia/tegra132/include/soc/display.h
@@ -38,6 +38,8 @@
 struct soc_nvidia_tegra132_config;
 struct display_controller;
 
+void dsi_display_startup(device_t dev);
+
 int tegra_dc_init(struct display_controller *disp_ctrl);
 int update_display_mode(struct display_controller *disp_ctrl,
 			struct soc_nvidia_tegra132_config *config);
-- 
cgit v1.2.3