[<prev] [next>] [day] [month] [year] [list]
Message-id: <000301ce6af4$570edf40$052c9dc0$%choi@samsung.com>
Date: Mon, 17 Jun 2013 09:48:09 +0900
From: Jonghwan Choi <jhbird.choi@...sung.com>
To: 'Jonghwan Choi' <jhbird.choi@...sung.com>,
linux-kernel@...r.kernel.org
Cc: stable@...r.kernel.org,
'Thomas Petazzoni' <thomas.petazzoni@...e-electrons.com>,
'Tony Lindgren' <tony@...mide.com>
Subject: [PATCH 3.9-stable] arm: omap2: fix AM33xx hwmod infos for UART2
This patch looks like it should be in the 3.9-stable tree, should we apply
it?
------------------
From: "Thomas Petazzoni <thomas.petazzoni@...e-electrons.com>"
commit 768dc16397fb18c9de209cbcb84d890b8279faa7 upstream
The UART2 hwmod structure is pointing to the EDMA channels of UART1,
which doesn't look right. This patch fixes this by making the UART2
hwmod structure to a new structure that lists the EDMA channels to be
used by the UART2.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@...e-electrons.com>
Acked-by: Vaibhav Hiremath <hvaibhav@...com>
[paul@...an.com: updated to apply]
Signed-off-by: Paul Walmsley <paul@...an.com>
Signed-off-by: Jonghwan Choi <jhbird.choi@...sung.com>
---
arch/arm/mach-omap2/omap_hwmod_33xx_data.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/arch/arm/mach-omap2/omap_hwmod_33xx_data.c
b/arch/arm/mach-omap2/omap_hwmod_33xx_data.c
index 26eee4a..6a57150 100644
--- a/arch/arm/mach-omap2/omap_hwmod_33xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_33xx_data.c
@@ -1979,6 +1979,13 @@ static struct omap_hwmod am33xx_uart1_hwmod = {
},
};
+/* uart2 */
+static struct omap_hwmod_dma_info uart2_edma_reqs[] = {
+ { .name = "tx", .dma_req = 28, },
+ { .name = "rx", .dma_req = 29, },
+ { .dma_req = -1 }
+};
+
static struct omap_hwmod_irq_info am33xx_uart2_irqs[] = {
{ .irq = 73 + OMAP_INTC_START, },
{ .irq = -1 },
@@ -1989,7 +1996,7 @@ static struct omap_hwmod am33xx_uart2_hwmod = {
.class = &uart_class,
.clkdm_name = "l4ls_clkdm",
.mpu_irqs = am33xx_uart2_irqs,
- .sdma_reqs = uart1_edma_reqs,
+ .sdma_reqs = uart2_edma_reqs,
.main_clk = "dpll_per_m2_div4_ck",
.prcm = {
.omap4 = {
--
1.7.9.5
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists