diff mbox

[U-Boot,v2,2/2] stv0991: use fdt for serial port platform data

Message ID 1430525238-11378-3-git-send-email-vikas.manocha@st.com
State Superseded
Delegated to: Tom Rini
Headers show

Commit Message

Vikas MANOCHA May 2, 2015, 12:07 a.m. UTC 
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>
---

Changes in v2:
- added commit message.

 board/st/stv0991/stv0991.c |    2 ++
 1 file changed, 2 insertions(+)
diff mbox

Patch

diff --git a/board/st/stv0991/stv0991.c b/board/st/stv0991/stv0991.c
index 38f6e1d..09f973f 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)