[U-Boot] [PATCH 4/7] serial: mxc: Move common init into _mxc_serial_init
Jagan Teki
jagannadh.teki at gmail.com
Tue Jun 6 05:31:48 UTC 2017
From: Jagan Teki <jagan at amarulasolutions.com>
Move the common initialization code into _mxc_serial_init
so-that dm and non-dm can call this func.
Signed-off-by: Jagan Teki <jagan at amarulasolutions.com>
---
drivers/serial/serial_mxc.c | 37 +++++++++++++++++--------------------
1 file changed, 17 insertions(+), 20 deletions(-)
diff --git a/drivers/serial/serial_mxc.c b/drivers/serial/serial_mxc.c
index 288b610..4b19052 100644
--- a/drivers/serial/serial_mxc.c
+++ b/drivers/serial/serial_mxc.c
@@ -137,6 +137,21 @@ struct mxc_uart {
u32 ts;
};
+static void _mxc_serial_init(struct mxc_uart *base)
+{
+ writel(0, &base->cr1);
+ writel(0, &base->cr2);
+
+ while (!(readl(&base->cr2) & UCR2_SRST));
+
+ writel(0x704 | UCR3_ADNIMP, &base->cr3);
+ writel(0x8000, &base->cr4);
+ writel(0x2b, &base->esc);
+ writel(0, &base->tim);
+
+ writel(0, &base->ts);
+}
+
#ifndef CONFIG_DM_SERIAL
#ifndef CONFIG_MXC_UART_BASE
@@ -205,17 +220,7 @@ static int mxc_serial_tstc(void)
*/
static int mxc_serial_init(void)
{
- writel(0, &mxc_base->cr1);
- writel(0, &mxc_base->cr2);
-
- while (!(readl(&mxc_base->cr2) & UCR2_SRST));
-
- writel(0x704 | UCR3_ADNIMP, &mxc_base->cr3);
- writel(0x8000, &mxc_base->cr4);
- writel(0x2b, &mxc_base->esc);
- writel(0, &mxc_base->tim);
-
- writel(0, &mxc_base->ts);
+ _mxc_serial_init(mxc_base);
serial_setbrg();
@@ -271,16 +276,8 @@ int mxc_serial_setbrg(struct udevice *dev, int baudrate)
static int mxc_serial_probe(struct udevice *dev)
{
struct mxc_serial_platdata *plat = dev->platdata;
- struct mxc_uart *const uart = plat->reg;
- writel(0, &uart->cr1);
- writel(0, &uart->cr2);
- while (!(readl(&uart->cr2) & UCR2_SRST));
- writel(0x704 | UCR3_ADNIMP, &uart->cr3);
- writel(0x8000, &uart->cr4);
- writel(0x2b, &uart->esc);
- writel(0, &uart->tim);
- writel(0, &uart->ts);
+ _mxc_serial_init(plat->reg);
return 0;
}
--
1.9.1
More information about the U-Boot
mailing list