From: Vikas Manocha <vikas.manocha@st.com>
Date: Sun, 3 May 2015 21:10:35 +0000 (-0700)
Subject: stv0991: use fdt for serial port platform data
X-Git-Tag: v2015.07-rc2~258
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=e0320b746a784cb31dc0faa882e4b4bf16d0be4f;p=oweals%2Fu-boot.git

stv0991: use fdt for serial port platform data

This patch ignores the serial port static platform data at compilation time
in case of device tree control.

Signed-off-by: Vikas Manocha <vikas.manocha@st.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
---

diff --git a/board/st/stv0991/stv0991.c b/board/st/stv0991/stv0991.c
index 38f6e1da83..09f973f403 100644
--- a/board/st/stv0991/stv0991.c
+++ b/board/st/stv0991/stv0991.c
@@ -21,6 +21,7 @@ DECLARE_GLOBAL_DATA_PTR;
 struct gpio_regs *const gpioa_regs =
 		(struct gpio_regs *) GPIOA_BASE_ADDR;
 
+#ifndef CONFIG_OF_CONTROL
 static const struct pl01x_serial_platdata serial_platdata = {
 	.base = 0x80406000,
 	.type = TYPE_PL011,
@@ -31,6 +32,7 @@ U_BOOT_DEVICE(stv09911_serials) = {
 	.name = "serial_pl01x",
 	.platdata = &serial_platdata,
 };
+#endif
 
 #ifdef CONFIG_SHOW_BOOT_PROGRESS
 void show_boot_progress(int progress)