From ddea486fd4410394417c4e59039d46a324918bdc Mon Sep 17 00:00:00 2001
From: David Hendricks <dhendrix@chromium.org>
Date: Mon, 3 Feb 2014 16:33:45 -0800
Subject: [PATCH] tegra124: move FB_SIZE_MB to a more appropriate location

This just moves FB_SIZE_MB to a more suitable location. It was likely
placed in addressmap.h originally since it was together with some
other constants which relied on config variables. But now those are
determined via helper functions instead.

BUG=none
BRANCH=none
TEST=compiled and booted on nyan
Signed-off-by: David Hendricks <dhendrix@chromium.org>

Change-Id: I9b03839bbe8924c313c45a81af85b3db6f464add
Reviewed-on: https://chromium-review.googlesource.com/184930
Reviewed-by: Julius Werner <jwerner@chromium.org>
Commit-Queue: David Hendricks <dhendrix@chromium.org>
Tested-by: David Hendricks <dhendrix@chromium.org>
---
 src/soc/nvidia/tegra124/cbmem.c                  | 2 +-
 src/soc/nvidia/tegra124/include/soc/addressmap.h | 2 --
 src/soc/nvidia/tegra124/include/soc/display.h    | 4 ++++
 src/soc/nvidia/tegra124/soc.c                    | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/soc/nvidia/tegra124/cbmem.c b/src/soc/nvidia/tegra124/cbmem.c
index 3226c978f7..7f20702e63 100644
--- a/src/soc/nvidia/tegra124/cbmem.c
+++ b/src/soc/nvidia/tegra124/cbmem.c
@@ -18,7 +18,7 @@
  */
 
 #include <cbmem.h>
-#include <soc/addressmap.h>
+#include <soc/display.h>
 #include <soc/nvidia/tegra124/sdram.h>
 
 void *cbmem_top(void)
diff --git a/src/soc/nvidia/tegra124/include/soc/addressmap.h b/src/soc/nvidia/tegra124/include/soc/addressmap.h
index d67ba111cb..063e369d50 100644
--- a/src/soc/nvidia/tegra124/include/soc/addressmap.h
+++ b/src/soc/nvidia/tegra124/include/soc/addressmap.h
@@ -80,6 +80,4 @@ enum {
 	TEGRA_I2C_BASE_COUNT = 6,
 };
 
-#define FB_SIZE_MB (32)
-
 #endif /* __SOC_NVIDIA_TEGRA124_INCLUDE_SOC_ADDRESS_MAP_H__ */
diff --git a/src/soc/nvidia/tegra124/include/soc/display.h b/src/soc/nvidia/tegra124/include/soc/display.h
index b764671134..36348ff0c3 100644
--- a/src/soc/nvidia/tegra124/include/soc/display.h
+++ b/src/soc/nvidia/tegra124/include/soc/display.h
@@ -188,6 +188,7 @@
 #define COLORDEPTH	0x6
 #define COLOR_WHITE	0xFFFFFF
 
+struct soc_nvidia_tegra124_config;	/* forward declaration */
 void setup_display(struct soc_nvidia_tegra124_config *config);
 void init_dca_regs(void);
 void dp_io_powerup(void);
@@ -195,4 +196,7 @@ u32 dp_setup_timing(u32 width, u32 height);
 void dp_misc_setting(u32 panel_bpp, u32 width, u32 height, u32 winb_addr,
 		     u32 lane_count, u32 enhanced_framing, u32 panel_edp,
 		     u32 pclkfreq, u32 linkfreq);
+
+#define FB_SIZE_MB (32)
+
 #endif /* __SOC_NVIDIA_TEGRA124_INCLUDE_SOC_DISPLAY_H__ */
diff --git a/src/soc/nvidia/tegra124/soc.c b/src/soc/nvidia/tegra124/soc.c
index 779418c234..11a52c4737 100644
--- a/src/soc/nvidia/tegra124/soc.c
+++ b/src/soc/nvidia/tegra124/soc.c
@@ -23,7 +23,7 @@
 #include <device/device.h>
 #include <soc/nvidia/tegra/dc.h>
 #include <soc/nvidia/tegra124/sdram.h>
-#include <soc/addressmap.h>
+#include <soc/display.h>
 
 /* this sucks, but for now, fb size/location are hardcoded.
  * Will break if we get 2. Sigh.