diff mbox

[U-Boot,v2,4/5] serial: pl01x: disable as per type of pl01x

Message ID 1416594863-16466-5-git-send-email-vikas.manocha@st.com
State Accepted
Delegated to: Tom Rini
Headers show

Commit Message

Vikas MANOCHA Nov. 21, 2014, 6:34 p.m. UTC 
pl010 & pl011 have different control register offsets, setting it as per
the pl01x type.

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

Changes in v2: None

 drivers/serial/serial_pl01x.c |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

Comments

Tom Rini Dec. 8, 2014, 9:42 p.m. UTC | #1 
On Fri, Nov 21, 2014 at 10:34:22AM -0800, Vikas Manocha wrote:

> pl010 & pl011 have different control register offsets, setting it as per
> the pl01x type.
> 
> Signed-off-by: Vikas Manocha <vikas.manocha@st.com>
> Acked-by: Simon Glass <sjg@chromium.org>

Applied to u-boot/master, thanks!
diff mbox

Patch

diff --git a/drivers/serial/serial_pl01x.c b/drivers/serial/serial_pl01x.c
index fb11210..2a6b61d 100644
--- a/drivers/serial/serial_pl01x.c
+++ b/drivers/serial/serial_pl01x.c
@@ -82,13 +82,14 @@  static int pl01x_generic_serial_init(struct pl01x_regs *regs,
 	}
 #endif
 
-	/* First, disable everything */
-	writel(0, &regs->pl010_cr);
-
 	switch (type) {
 	case TYPE_PL010:
+		/* disable everything */
+		writel(0, &regs->pl010_cr);
 		break;
 	case TYPE_PL011:
+		/* disable everything */
+		writel(0, &regs->pl011_cr);
 		break;
 	default:
 		return -EINVAL;