[pm-wip/uart][PATCH 3/6] Serial: Modify OMAP3 hwmod data file with uart data.

[pm-wip/uart][PATCH 3/6] Serial: Modify OMAP3 hwmod data file with uart data.

[Govindraj.R]

With this patch we retain uart name and just "uart"
rather than uart_hwmod as per autogenerated file for
omap4 just to retain common names across hwmod data files.
Also pass rx channel id as first dma platform parameter
to driver.

Cc: Kevin Hilman <khilman@deeprootsystems.com>
Signed-off-by: Govindraj.R <govindraj.raja@ti.com>
---
 arch/arm/mach-omap2/omap_hwmod_3xxx_data.c |   12 ++++++------
 arch/arm/mach-omap2/serial.c               |    2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
index 079a65e..580ca5b 100644
--- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
@@ -350,8 +350,8 @@ static struct omap_hwmod_irq_info uart1_mpu_irqs[] = {
 };

 static struct omap_hwmod_dma_info uart1_sdma_chs[] = {
-	{ .name = "tx",	.dma_ch = OMAP24XX_DMA_UART1_TX, },
 	{ .name = "rx",	.dma_ch = OMAP24XX_DMA_UART1_RX, },
+	{ .name = "tx",	.dma_ch = OMAP24XX_DMA_UART1_TX, },
 };

 static struct omap_hwmod_ocp_if *omap3xxx_uart1_slaves[] = {
@@ -359,7 +359,7 @@ static struct omap_hwmod_ocp_if *omap3xxx_uart1_slaves[] = {
 };

 static struct omap_hwmod omap3xxx_uart1_hwmod = {
-	.name		= "uart1_hwmod",
+	.name		= "uart1",
 	.mpu_irqs	= uart1_mpu_irqs,
 	.mpu_irqs_cnt	= ARRAY_SIZE(uart1_mpu_irqs),
 	.sdma_chs	= uart1_sdma_chs,
@@ -384,8 +384,8 @@ static struct omap_hwmod_irq_info uart2_mpu_irqs[] = {
 };

 static struct omap_hwmod_dma_info uart2_sdma_chs[] = {
-	{ .name = "tx",	.dma_ch = OMAP24XX_DMA_UART2_TX, },
 	{ .name = "rx",	.dma_ch = OMAP24XX_DMA_UART2_RX, },
+	{ .name = "tx",	.dma_ch = OMAP24XX_DMA_UART2_TX, },
 };

 static struct omap_hwmod_ocp_if *omap3xxx_uart2_slaves[] = {
@@ -393,7 +393,7 @@ static struct omap_hwmod_ocp_if *omap3xxx_uart2_slaves[] = {
 };

 static struct omap_hwmod omap3xxx_uart2_hwmod = {
-	.name		= "uart2_hwmod",
+	.name		= "uart2",
 	.mpu_irqs	= uart2_mpu_irqs,
 	.mpu_irqs_cnt	= ARRAY_SIZE(uart2_mpu_irqs),
 	.sdma_chs	= uart2_sdma_chs,
@@ -418,8 +418,8 @@ static struct omap_hwmod_irq_info uart3_mpu_irqs[] = {
 };

 static struct omap_hwmod_dma_info uart3_sdma_chs[] = {
-	{ .name = "tx",	.dma_ch = OMAP24XX_DMA_UART3_TX, },
 	{ .name = "rx",	.dma_ch = OMAP24XX_DMA_UART3_RX, },
+	{ .name = "tx",	.dma_ch = OMAP24XX_DMA_UART3_TX, },
 };

 static struct omap_hwmod_ocp_if *omap3xxx_uart3_slaves[] = {
@@ -427,7 +427,7 @@ static struct omap_hwmod_ocp_if *omap3xxx_uart3_slaves[] = {
 };

 static struct omap_hwmod omap3xxx_uart3_hwmod = {
-	.name		= "uart3_hwmod",
+	.name		= "uart3",
 	.mpu_irqs	= uart3_mpu_irqs,
 	.mpu_irqs_cnt	= ARRAY_SIZE(uart3_mpu_irqs),
 	.sdma_chs	= uart3_sdma_chs,
diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c
index 7d0dc3a..9b71c1e 100644
--- a/arch/arm/mach-omap2/serial.c
+++ b/arch/arm/mach-omap2/serial.c
@@ -578,7 +578,7 @@ void __init omap_serial_early_init(void)
 		struct omap_uart_state *uart;

 		snprintf(oh_name, MAX_UART_HWMOD_NAME_LEN,
-			 "uart%d_hwmod", i + 1);
+			 "uart%d", i + 1);
 		oh = omap_hwmod_lookup(oh_name);
 		if (!oh)
 			break;
-- 
1.6.3.3

Re: [pm-wip/uart][PATCH 3/6] Serial: Modify OMAP3 hwmod data file with uart data.

[Benoit Cousson]

Hi Govindraj,

On 5/20/2010 3:38 PM, Govindraj.R wrote:
>
> With this patch we retain uart name and just "uart"
> rather than uart_hwmod as per autogenerated file for
> omap4 just to retain common names across hwmod data files.
> Also pass rx channel id as first dma platform parameter
> to driver.

Why do you need to change the order of the DMA channels?
They are supposed to be queried using the name, not by position.
The point is that I'm not taking care of the position during the
OMAP4 generation, so you should not rely on that.

Thanks,
Benoit


> Cc: Kevin Hilman<khilman@deeprootsystems.com>
> Signed-off-by: Govindraj.R<govindraj.raja@ti.com>
> ---
>   arch/arm/mach-omap2/omap_hwmod_3xxx_data.c |   12 ++++++------
>   arch/arm/mach-omap2/serial.c               |    2 +-
>   2 files changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
> index 079a65e..580ca5b 100644
> --- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
> +++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
> @@ -350,8 +350,8 @@ static struct omap_hwmod_irq_info uart1_mpu_irqs[] = {
>   };
>
>   static struct omap_hwmod_dma_info uart1_sdma_chs[] = {
> -	{ .name = "tx",	.dma_ch = OMAP24XX_DMA_UART1_TX, },
>   	{ .name = "rx",	.dma_ch = OMAP24XX_DMA_UART1_RX, },
> +	{ .name = "tx",	.dma_ch = OMAP24XX_DMA_UART1_TX, },
>   };
>
>   static struct omap_hwmod_ocp_if *omap3xxx_uart1_slaves[] = {
> @@ -359,7 +359,7 @@ static struct omap_hwmod_ocp_if *omap3xxx_uart1_slaves[] = {
>   };
>
>   static struct omap_hwmod omap3xxx_uart1_hwmod = {
> -	.name		= "uart1_hwmod",
> +	.name		= "uart1",
>   	.mpu_irqs	= uart1_mpu_irqs,
>   	.mpu_irqs_cnt	= ARRAY_SIZE(uart1_mpu_irqs),
>   	.sdma_chs	= uart1_sdma_chs,
> @@ -384,8 +384,8 @@ static struct omap_hwmod_irq_info uart2_mpu_irqs[] = {
>   };
>
>   static struct omap_hwmod_dma_info uart2_sdma_chs[] = {
> -	{ .name = "tx",	.dma_ch = OMAP24XX_DMA_UART2_TX, },
>   	{ .name = "rx",	.dma_ch = OMAP24XX_DMA_UART2_RX, },
> +	{ .name = "tx",	.dma_ch = OMAP24XX_DMA_UART2_TX, },
>   };
>
>   static struct omap_hwmod_ocp_if *omap3xxx_uart2_slaves[] = {
> @@ -393,7 +393,7 @@ static struct omap_hwmod_ocp_if *omap3xxx_uart2_slaves[] = {
>   };
>
>   static struct omap_hwmod omap3xxx_uart2_hwmod = {
> -	.name		= "uart2_hwmod",
> +	.name		= "uart2",
>   	.mpu_irqs	= uart2_mpu_irqs,
>   	.mpu_irqs_cnt	= ARRAY_SIZE(uart2_mpu_irqs),
>   	.sdma_chs	= uart2_sdma_chs,
> @@ -418,8 +418,8 @@ static struct omap_hwmod_irq_info uart3_mpu_irqs[] = {
>   };
>
>   static struct omap_hwmod_dma_info uart3_sdma_chs[] = {
> -	{ .name = "tx",	.dma_ch = OMAP24XX_DMA_UART3_TX, },
>   	{ .name = "rx",	.dma_ch = OMAP24XX_DMA_UART3_RX, },
> +	{ .name = "tx",	.dma_ch = OMAP24XX_DMA_UART3_TX, },
>   };
>
>   static struct omap_hwmod_ocp_if *omap3xxx_uart3_slaves[] = {
> @@ -427,7 +427,7 @@ static struct omap_hwmod_ocp_if *omap3xxx_uart3_slaves[] = {
>   };
>
>   static struct omap_hwmod omap3xxx_uart3_hwmod = {
> -	.name		= "uart3_hwmod",
> +	.name		= "uart3",
>   	.mpu_irqs	= uart3_mpu_irqs,
>   	.mpu_irqs_cnt	= ARRAY_SIZE(uart3_mpu_irqs),
>   	.sdma_chs	= uart3_sdma_chs,
> diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c
> index 7d0dc3a..9b71c1e 100644
> --- a/arch/arm/mach-omap2/serial.c
> +++ b/arch/arm/mach-omap2/serial.c
> @@ -578,7 +578,7 @@ void __init omap_serial_early_init(void)
>   		struct omap_uart_state *uart;
>
>   		snprintf(oh_name, MAX_UART_HWMOD_NAME_LEN,
> -			 "uart%d_hwmod", i + 1);
> +			 "uart%d", i + 1);
>   		oh = omap_hwmod_lookup(oh_name);
>   		if (!oh)
>   			break;

Re: [pm-wip/uart][PATCH 3/6] Serial: Modify OMAP3 hwmod data file with uart data.

[Govindraj]

On Tue, May 25, 2010 at 3:09 AM, Benoit Cousson <b-cousson@ti.com> wrote:
> Hi Govindraj,
>
> On 5/20/2010 3:38 PM, Govindraj.R wrote:
>>
>> With this patch we retain uart name and just "uart"
>> rather than uart_hwmod as per autogenerated file for
>> omap4 just to retain common names across hwmod data files.
>> Also pass rx channel id as first dma platform parameter
>> to driver.
>
> Why do you need to change the order of the DMA channels?
> They are supposed to be queried using the name, not by position.
> The point is that I'm not taking care of the position during the
> OMAP4 generation, so you should not rely on that.
>
> Thanks,
> Benoit
>

I was using in driver platform_get_resource

Thus kept rx as first,

I will replace in driver with platform_get_resource_byname

Thanks,
Govindraj.R