mirror of
https://git.yoctoproject.org/meta-ti
synced 2026-07-21 03:17:18 +00:00
Koen Kooi
aefc6c8c3c
The psp tree added a patch to limit the beaglebone to 500MHz when powered by USB, which triggered conflicts in the patches. The 3.2.16 series has been rediffed as well, no functional changes. Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
56 lines
2.0 KiB
Diff
56 lines
2.0 KiB
Diff
From 39f2e7d1ec34222f7e7262c87425b18964d16b25 Mon Sep 17 00:00:00 2001
|
|
From: Linus Walleij <linus.walleij@linaro.org>
|
|
Date: Wed, 21 Mar 2012 20:15:18 +0100
|
|
Subject: [PATCH 42/68] serial: PL011: move interrupt clearing
|
|
|
|
commit c3d8b76f61586714cdc5f219ba45592a54caaa55 upstream.
|
|
|
|
Commit 360f748b204275229f8398cb2f9f53955db1503b
|
|
"serial: PL011: clear pending interrupts"
|
|
attempts to clear interrupts by writing to a
|
|
yet-unassigned memory address. This fixes the issue.
|
|
|
|
The breaking patch is marked for stable so should be
|
|
carried along with the other patch.
|
|
|
|
Cc: Shreshtha Kumar Sahu <shreshthakumar.sahu@stericsson.com>
|
|
Cc: Russell King <linux@arm.linux.org.uk>
|
|
Cc: Nicolas Pitre <nico@fluxnic.net>
|
|
Reported-by: Viresh Kumar <viresh.kumar@st.com>
|
|
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
|
|
Tested-by: Grant Likely <grant.likely@secretlab.ca>
|
|
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
---
|
|
drivers/tty/serial/amba-pl011.c | 8 ++++----
|
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c
|
|
index dddc3f2..6da8cf8 100644
|
|
--- a/drivers/tty/serial/amba-pl011.c
|
|
+++ b/drivers/tty/serial/amba-pl011.c
|
|
@@ -1919,10 +1919,6 @@ static int pl011_probe(struct amba_device *dev, const struct amba_id *id)
|
|
goto unmap;
|
|
}
|
|
|
|
- /* Ensure interrupts from this UART are masked and cleared */
|
|
- writew(0, uap->port.membase + UART011_IMSC);
|
|
- writew(0xffff, uap->port.membase + UART011_ICR);
|
|
-
|
|
uap->vendor = vendor;
|
|
uap->lcrh_rx = vendor->lcrh_rx;
|
|
uap->lcrh_tx = vendor->lcrh_tx;
|
|
@@ -1939,6 +1935,10 @@ static int pl011_probe(struct amba_device *dev, const struct amba_id *id)
|
|
uap->port.line = i;
|
|
pl011_dma_probe(uap);
|
|
|
|
+ /* Ensure interrupts from this UART are masked and cleared */
|
|
+ writew(0, uap->port.membase + UART011_IMSC);
|
|
+ writew(0xffff, uap->port.membase + UART011_ICR);
|
|
+
|
|
snprintf(uap->type, sizeof(uap->type), "PL011 rev%u", amba_rev(dev));
|
|
|
|
amba_ports[i] = uap;
|
|
--
|
|
1.7.10
|
|
|