Messages in this thread Patch in this message | | | From | Jonghwan Choi <> | Subject | [PATCH 3.9-stable] arm: omap2: fix AM33xx hwmod infos for UART2 | Date | Mon, 17 Jun 2013 09:48:09 +0900 |
| |
This patch looks like it should be in the 3.9-stable tree, should we apply it?
------------------
From: "Thomas Petazzoni <thomas.petazzoni@free-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@free-electrons.com> Acked-by: Vaibhav Hiremath <hvaibhav@ti.com> [paul@pwsan.com: updated to apply] Signed-off-by: Paul Walmsley <paul@pwsan.com> Signed-off-by: Jonghwan Choi <jhbird.choi@samsung.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
| |