[PATCH] arm: omap2: fix AM33xx hwmod infos for UART2

Hiremath, Vaibhav hvaibhav at ti.com
Wed May 29 01:22:23 EDT 2013


> -----Original Message-----
> From: Thomas Petazzoni [mailto:thomas.petazzoni at free-electrons.com]
> Sent: Tuesday, May 28, 2013 8:48 PM
> To: Tony Lindgren
> Cc: linux-omap at vger.kernel.org; linux-arm-kernel at lists.infradead.org;
> Hiremath, Vaibhav; Paul Walmsley
> Subject: [PATCH] arm: omap2: fix AM33xx hwmod infos for UART2
> 
> 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 at free-electrons.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 01d8f32..9113251 100644
> --- a/arch/arm/mach-omap2/omap_hwmod_33xx_data.c
> +++ b/arch/arm/mach-omap2/omap_hwmod_33xx_data.c
> @@ -2006,6 +2006,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 },
> @@ -2016,7 +2023,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	= {

Good catch.

Acked-by: Vaibhav Hiremath <hvaibhav at ti.com>

Thanks,
Vaibhav



More information about the linux-arm-kernel mailing list