From: Lukasz Majewski <l.majewski@samsung.com>
Date: Thu, 12 May 2016 10:45:42 +0000 (+0200)
Subject: TPL: TM2: serial: Support for s5p_serial on TM2 board
X-Git-Tag: submit/tizen/20160810.050017~27
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8326c557930a7de6bf746ea73cc3fe9c4382cd61;p=platform%2Fkernel%2Fu-boot.git

TPL: TM2: serial: Support for s5p_serial on TM2 board

Signed-off-by: Lukasz Majewski <l.majewski@samsung.com>
---

diff --git a/drivers/serial/Makefile b/drivers/serial/Makefile
index 05bdf56c6f..40e8031e2d 100644
--- a/drivers/serial/Makefile
+++ b/drivers/serial/Makefile
@@ -23,7 +23,11 @@ obj-$(CONFIG_EFI_APP) += serial_efi.o
 obj-$(CONFIG_LPC32XX_HSUART) += lpc32xx_hsuart.o
 obj-$(CONFIG_MCFUART) += mcfuart.o
 obj-$(CONFIG_SYS_NS16550) += ns16550.o
+ifndef CONFIG_TPL_TM2
 obj-$(CONFIG_S5P) += serial_s5p.o
+else
+obj-$(CONFIG_S5P_SERIAL) += serial_s5p.o
+endif
 obj-$(CONFIG_MXC_UART) += serial_mxc.o
 obj-$(CONFIG_PXA_SERIAL) += serial_pxa.o
 obj-$(CONFIG_S3C24X0_SERIAL) += serial_s3c24x0.o
diff --git a/drivers/serial/serial_s5p.c b/drivers/serial/serial_s5p.c
index feba467d80..e45ed4415a 100644
--- a/drivers/serial/serial_s5p.c
+++ b/drivers/serial/serial_s5p.c
@@ -88,12 +88,13 @@ static void __maybe_unused s5p_serial_baud(struct s5p_uart *uart, uint uclk,
 #ifndef CONFIG_SPL_BUILD
 int s5p_serial_setbrg(struct udevice *dev, int baudrate)
 {
+#ifndef CONFIG_TPL_TM2
 	struct s5p_serial_platdata *plat = dev->platdata;
 	struct s5p_uart *const uart = plat->reg;
 	u32 uclk = get_uart_clk(plat->port_id);
 
 	s5p_serial_baud(uart, uclk, baudrate);
-
+#endif
 	return 0;
 }
 
@@ -164,6 +165,7 @@ static int s5p_serial_pending(struct udevice *dev, bool input)
 		return (ufstat & TX_FIFO_COUNT_MASK) >> TX_FIFO_COUNT_SHIFT;
 }
 
+#ifndef CONFIG_TPL_TM2
 static int s5p_serial_ofdata_to_platdata(struct udevice *dev)
 {
 	struct s5p_serial_platdata *plat = dev->platdata;
@@ -178,7 +180,12 @@ static int s5p_serial_ofdata_to_platdata(struct udevice *dev)
 
 	return 0;
 }
-
+#else
+static int s5p_serial_ofdata_to_platdata(struct udevice *dev)
+{
+	return 0;
+}
+#endif
 static const struct dm_serial_ops s5p_serial_ops = {
 	.putc = s5p_serial_putc,
 	.pending = s5p_serial_pending,