public inbox for linux-omap@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH 2/2][RFC] OMAP4: UART4 Support for OMAP_4430SDP.
       [not found] <51950.192.168.10.89.1241612607.squirrel@dbdmail.itg.ti.com>
@ 2009-05-12  6:20 ` Syed Rafiuddin
  2009-05-12  6:44   ` Shilimkar, Santosh
  2009-05-12 14:32   ` Kevin Hilman
  0 siblings, 2 replies; 4+ messages in thread
From: Syed Rafiuddin @ 2009-05-12  6:20 UTC (permalink / raw)
  To: linux-arm-kernel@lists.arm.linux.org.uk; +Cc: linux-omap@vger.kernel.org

This patch enables support for UART4 on OMAP4430 development platform.

Signed-off-by: Syed Rafiuddin <rafiuddin.syed@ti.com>
---
arch/arm/mach-omap2/board-4430sdp.c |    2 +-
 arch/arm/mach-omap2/serial.c        |   12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

Index: linux-2.6/arch/arm/mach-omap2/board-4430sdp.c
===================================================================
--- linux-2.6.orig/arch/arm/mach-omap2/board-4430sdp.c	2009-05-12
10:43:41.000000000 +0530
+++ linux-2.6/arch/arm/mach-omap2/board-4430sdp.c	2009-05-12 11:40:54.000000000
+0530
@@ -38,7 +38,7 @@
 };

 static struct omap_uart_config sdp4430_uart_config __initdata = {
-	.enabled_uarts	= ((1 << 0) | (1 << 1) | (1 << 2)),
+	.enabled_uarts	= ((1 << 0) | (1 << 1) | (1 << 2) | (1 << 3)),
 };

 static struct omap_lcd_config sdp4430_lcd_config __initdata = {
Index: linux-2.6/arch/arm/mach-omap2/serial.c
===================================================================
--- linux-2.6.orig/arch/arm/mach-omap2/serial.c	2009-05-12 11:35:55.000000000
+0530
+++ linux-2.6/arch/arm/mach-omap2/serial.c	2009-05-12 11:46:13.000000000 +0530
@@ -53,8 +53,20 @@
 		.iotype		= UPIO_MEM,
 		.regshift	= 2,
 		.uartclk	= OMAP24XX_BASE_BAUD * 16,
+
+	}, {
+#ifdef CONFIG_ARCH_OMAP4
+		.membase        = IO_ADDRESS(OMAP_UART3_BASE),
+		.mapbase        = OMAP_UART4_BASE,
+		.irq            = 70,
+		.flags          = UPF_BOOT_AUTOCONF,
+		.iotype         = UPIO_MEM,
+		.regshift       = 2,
+		.uartclk        = OMAP24XX_BASE_BAUD * 16,
 	}, {
+#else
 		.flags		= 0
+#endif
 	}
 };


^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH 2/2][RFC] OMAP4: UART4 Support for OMAP_4430SDP.
@ 2009-05-12  6:40 vimal singh
  0 siblings, 0 replies; 4+ messages in thread
From: vimal singh @ 2009-05-12  6:40 UTC (permalink / raw)
  To: Syed Rafiuddin
  Cc: linux-arm-kernel@lists.arm.linux.org.uk,
	linux-omap@vger.kernel.org



On Tue, May 12, 2009 at 11:50 AM, Syed Rafiuddin <rafiuddin.syed@ti.com> wrote:
> This patch enables support for UART4 on OMAP4430 development platform.
>
> Signed-off-by: Syed Rafiuddin <rafiuddin.syed@ti.com>
> ---
> arch/arm/mach-omap2/board-4430sdp.c |    2 +-
>  arch/arm/mach-omap2/serial.c        |   12 ++++++++++++
>  2 files changed, 13 insertions(+), 1 deletion(-)
>
> Index: linux-2.6/arch/arm/mach-omap2/board-4430sdp.c
> ===================================================================
> --- linux-2.6.orig/arch/arm/mach-omap2/board-4430sdp.c  2009-05-12
> 10:43:41.000000000 +0530
> +++ linux-2.6/arch/arm/mach-omap2/board-4430sdp.c       2009-05-12
11:40:54.000000000
> +0530
This patch has lines wrapped here. Please correct this and re-send the patch.

> @@ -38,7 +38,7 @@
>  };
>
>  static struct omap_uart_config sdp4430_uart_config __initdata = {
> -       .enabled_uarts  = ((1 << 0) | (1 << 1) | (1 << 2)),
> +       .enabled_uarts  = ((1 << 0) | (1 << 1) | (1 << 2) | (1 << 3)),
>  };
>
>  static struct omap_lcd_config sdp4430_lcd_config __initdata = {
> Index: linux-2.6/arch/arm/mach-omap2/serial.c
> ===================================================================
> --- linux-2.6.orig/arch/arm/mach-omap2/serial.c 2009-05-12 11:35:55.000000000
> +0530
> +++ linux-2.6/arch/arm/mach-omap2/serial.c      2009-05-12 11:46:13.000000000
+0530

Ditto...

> @@ -53,8 +53,20 @@
>                .iotype         = UPIO_MEM,
>                .regshift       = 2,
>                .uartclk        = OMAP24XX_BASE_BAUD * 16,
> +
> +       }, {
> +#ifdef CONFIG_ARCH_OMAP4
> +               .membase        = IO_ADDRESS(OMAP_UART3_BASE),
> +               .mapbase        = OMAP_UART4_BASE,
> +               .irq            = 70,
> +               .flags          = UPF_BOOT_AUTOCONF,
> +               .iotype         = UPIO_MEM,
> +               .regshift       = 2,
> +               .uartclk        = OMAP24XX_BASE_BAUD * 16,
>        }, {
> +#else
>                .flags          = 0
> +#endif
>        }
>  };
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>




---
Regards,
\/ | |\/| /-\ |_



^ permalink raw reply	[flat|nested] 4+ messages in thread

* RE: [PATCH 2/2][RFC] OMAP4: UART4 Support for OMAP_4430SDP.
  2009-05-12  6:20 ` [PATCH 2/2][RFC] OMAP4: UART4 Support for OMAP_4430SDP Syed Rafiuddin
@ 2009-05-12  6:44   ` Shilimkar, Santosh
  2009-05-12 14:32   ` Kevin Hilman
  1 sibling, 0 replies; 4+ messages in thread
From: Shilimkar, Santosh @ 2009-05-12  6:44 UTC (permalink / raw)
  To: Syed, Rafiuddin, linux-arm-kernel@lists.arm.linux.org.uk
  Cc: linux-omap@vger.kernel.org

Both patches looks independent. In that case this need not be a series.

> -----Original Message-----
> From: linux-omap-owner@vger.kernel.org 
> [mailto:linux-omap-owner@vger.kernel.org] On Behalf Of Syed Rafiuddin
> Sent: Tuesday, May 12, 2009 11:51 AM
> To: linux-arm-kernel@lists.arm.linux.org.uk
> Cc: linux-omap@vger.kernel.org
> Subject: [PATCH 2/2][RFC] OMAP4: UART4 Support for OMAP_4430SDP.
> 
> This patch enables support for UART4 on OMAP4430 development platform.
> 
> Signed-off-by: Syed Rafiuddin <rafiuddin.syed@ti.com>
> ---
> arch/arm/mach-omap2/board-4430sdp.c |    2 +-
>  arch/arm/mach-omap2/serial.c        |   12 ++++++++++++
>  2 files changed, 13 insertions(+), 1 deletion(-)
> 
> Index: linux-2.6/arch/arm/mach-omap2/board-4430sdp.c
> ===================================================================
> --- linux-2.6.orig/arch/arm/mach-omap2/board-4430sdp.c	
> 2009-05-12
> 10:43:41.000000000 +0530
> +++ linux-2.6/arch/arm/mach-omap2/board-4430sdp.c	
> 2009-05-12 11:40:54.000000000
> +0530
> @@ -38,7 +38,7 @@
>  };
> 
>  static struct omap_uart_config sdp4430_uart_config __initdata = {
> -	.enabled_uarts	= ((1 << 0) | (1 << 1) | (1 << 2)),
> +	.enabled_uarts	= ((1 << 0) | (1 << 1) | (1 << 2) | (1 << 3)),
>  };
> 
>  static struct omap_lcd_config sdp4430_lcd_config __initdata = {
> Index: linux-2.6/arch/arm/mach-omap2/serial.c
> ===================================================================
> --- linux-2.6.orig/arch/arm/mach-omap2/serial.c	
> 2009-05-12 11:35:55.000000000
> +0530
> +++ linux-2.6/arch/arm/mach-omap2/serial.c	2009-05-12 
> 11:46:13.000000000 +0530
> @@ -53,8 +53,20 @@
>  		.iotype		= UPIO_MEM,
>  		.regshift	= 2,
>  		.uartclk	= OMAP24XX_BASE_BAUD * 16,
> +
> +	}, {
> +#ifdef CONFIG_ARCH_OMAP4
> +		.membase        = IO_ADDRESS(OMAP_UART3_BASE),
> +		.mapbase        = OMAP_UART4_BASE,
> +		.irq            = 70,
> +		.flags          = UPF_BOOT_AUTOCONF,
> +		.iotype         = UPIO_MEM,
> +		.regshift       = 2,
> +		.uartclk        = OMAP24XX_BASE_BAUD * 16,
>  	}, {
> +#else
>  		.flags		= 0
> +#endif
>  	}
>  };


Regards,
Santosh
  

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH 2/2][RFC] OMAP4: UART4 Support for OMAP_4430SDP.
  2009-05-12  6:20 ` [PATCH 2/2][RFC] OMAP4: UART4 Support for OMAP_4430SDP Syed Rafiuddin
  2009-05-12  6:44   ` Shilimkar, Santosh
@ 2009-05-12 14:32   ` Kevin Hilman
  1 sibling, 0 replies; 4+ messages in thread
From: Kevin Hilman @ 2009-05-12 14:32 UTC (permalink / raw)
  To: Syed Rafiuddin
  Cc: linux-arm-kernel@lists.arm.linux.org.uk,
	linux-omap@vger.kernel.org

"Syed Rafiuddin" <rafiuddin.syed@ti.com> writes:

> This patch enables support for UART4 on OMAP4430 development platform.
>
> Signed-off-by: Syed Rafiuddin <rafiuddin.syed@ti.com>
> ---
> arch/arm/mach-omap2/board-4430sdp.c |    2 +-
>  arch/arm/mach-omap2/serial.c        |   12 ++++++++++++
>  2 files changed, 13 insertions(+), 1 deletion(-)
>
> Index: linux-2.6/arch/arm/mach-omap2/board-4430sdp.c
> ===================================================================
> --- linux-2.6.orig/arch/arm/mach-omap2/board-4430sdp.c	2009-05-12
> 10:43:41.000000000 +0530
> +++ linux-2.6/arch/arm/mach-omap2/board-4430sdp.c	2009-05-12 11:40:54.000000000
> +0530
> @@ -38,7 +38,7 @@
>  };
>
>  static struct omap_uart_config sdp4430_uart_config __initdata = {
> -	.enabled_uarts	= ((1 << 0) | (1 << 1) | (1 << 2)),
> +	.enabled_uarts	= ((1 << 0) | (1 << 1) | (1 << 2) | (1 << 3)),
>  };
>
>  static struct omap_lcd_config sdp4430_lcd_config __initdata = {
> Index: linux-2.6/arch/arm/mach-omap2/serial.c
> ===================================================================
> --- linux-2.6.orig/arch/arm/mach-omap2/serial.c	2009-05-12 11:35:55.000000000
> +0530
> +++ linux-2.6/arch/arm/mach-omap2/serial.c	2009-05-12 11:46:13.000000000 +0530
> @@ -53,8 +53,20 @@
>  		.iotype		= UPIO_MEM,
>  		.regshift	= 2,
>  		.uartclk	= OMAP24XX_BASE_BAUD * 16,
> +
> +	}, {
> +#ifdef CONFIG_ARCH_OMAP4
> +		.membase        = IO_ADDRESS(OMAP_UART3_BASE),
> +		.mapbase        = OMAP_UART4_BASE,
> +		.irq            = 70,
> +		.flags          = UPF_BOOT_AUTOCONF,
> +		.iotype         = UPIO_MEM,
> +		.regshift       = 2,
> +		.uartclk        = OMAP24XX_BASE_BAUD * 16,
>  	}, {
> +#else
>  		.flags		= 0
> +#endif
>  	}
>  };

You dropped the terminator entry (flags == 0) in the OMAP4 case.  That
should remain the last entry whether or not OMAP4 support is enabled.

Kevin

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2009-05-12 14:32 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
     [not found] <51950.192.168.10.89.1241612607.squirrel@dbdmail.itg.ti.com>
2009-05-12  6:20 ` [PATCH 2/2][RFC] OMAP4: UART4 Support for OMAP_4430SDP Syed Rafiuddin
2009-05-12  6:44   ` Shilimkar, Santosh
2009-05-12 14:32   ` Kevin Hilman
2009-05-12  6:40 vimal singh

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox