[PATCH 0/3] OMAP4: SMP: Patch series

[PATCH 0/3] OMAP4: SMP: Patch series

[Shilimkar, Santosh]

This patch series enables SMP support for OMAP4430 development platform. This series depends on the earlier patch series sent on the mailing list. [1]

The patches are generated against mainline version 2.6.30 -rc2. The kernel is validated on the OMAP4430 software simulator platform. SMP kernel is functional with debug UART. No additional drivers are supported yet.

The series contains:

[PATCH 1/3]OMAP4: SMP: Add OMAP4430 SMP board files
[PATCH 2/3]OMAP4: SMP: Add mpu timer support for OMAP4430
[PATCH 3/3]OMAP4: SMP: Enable SMP support for OMAP4430

Regards,
Santosh

[1]:	[PATCH 0/7] OMAP4: Basic board support patch series
	http://lists.arm.linux.org.uk/lurker/message/20090428.094757.6642f1e3.en.html

[PATCH 0/2] OMAP4: Patch series

[Syed Rafiuddin]

This patch series enables McBSP and UART4 support for OMAP4430 development
platform.

The series contains:
[PATCH 1/2]OMAP4: McBSP support for OMAP4430
[PATCH 2/2]OMAP4: UART4 support for OMAP4430

Regards,
Syed Rafiuddin

[PATCH 1/2][RFC] OMAP4: McBSP support for OMAP_4430SDP.

[Syed Rafiuddin]

This patch creates McBSP support on OMAP4430 development platform.
This patch includes corresponding base address changes for OMAP4.

Signed-off-by: Syed Rafiuddin <rafiuddin.syed@ti.com>
---
 arch/arm/mach-omap2/mcbsp.c             |   46 ++++++++++++++++++++++++++++++++
 arch/arm/plat-omap/include/mach/mcbsp.h |    8 ++++-
 2 files changed, 53 insertions(+), 1 deletion(-)

Index: linux-2.6/arch/arm/mach-omap2/mcbsp.c
===================================================================
--- linux-2.6.orig/arch/arm/mach-omap2/mcbsp.c	2009-05-12 10:57:12.000000000 +0530
+++ linux-2.6/arch/arm/mach-omap2/mcbsp.c	2009-05-12 10:57:32.000000000 +0530
@@ -169,6 +169,47 @@
 #define OMAP34XX_MCBSP_PDATA_SZ		0
 #endif

+#ifdef CONFIG_ARCH_OMAP4
+static struct omap_mcbsp_platform_data omap44xx_mcbsp_pdata[] = {
+	{
+		.phys_base      = OMAP44XX_MCBSP1_BASE,
+		.dma_rx_sync    = OMAP44XX_DMA_MCBSP1_RX,
+		.dma_tx_sync    = OMAP44XX_DMA_MCBSP1_TX,
+		.rx_irq         = INT_24XX_MCBSP1_IRQ_RX,
+		.tx_irq         = INT_24XX_MCBSP1_IRQ_TX,
+		.ops            = &omap2_mcbsp_ops,
+	},
+	{
+		.phys_base      = OMAP44XX_MCBSP2_BASE,
+		.dma_rx_sync    = OMAP44XX_DMA_MCBSP2_RX,
+		.dma_tx_sync    = OMAP44XX_DMA_MCBSP2_TX,
+		.rx_irq         = INT_24XX_MCBSP2_IRQ_RX,
+		.tx_irq         = INT_24XX_MCBSP2_IRQ_TX,
+		.ops            = &omap2_mcbsp_ops,
+	},
+	{
+		.phys_base      = OMAP44XX_MCBSP3_BASE,
+		.dma_rx_sync    = OMAP44XX_DMA_MCBSP3_RX,
+		.dma_tx_sync    = OMAP44XX_DMA_MCBSP3_TX,
+		.rx_irq         = INT_24XX_MCBSP3_IRQ_RX,
+		.tx_irq         = INT_24XX_MCBSP3_IRQ_TX,
+		.ops            = &omap2_mcbsp_ops,
+	},
+	{
+		.phys_base      = OMAP44XX_MCBSP4_BASE,
+		.dma_rx_sync    = OMAP44XX_DMA_MCBSP4_RX,
+		.dma_tx_sync    = OMAP44XX_DMA_MCBSP4_TX,
+		.rx_irq         = INT_24XX_MCBSP4_IRQ_RX,
+		.tx_irq         = INT_24XX_MCBSP4_IRQ_TX,
+		.ops            = &omap2_mcbsp_ops,
+	},
+}
+#define OMAP44XX_MCBSP_PDATA_SZ		ARRAY_SIZE(omap44xx_mcbsp_pdata)
+#else
+#define omap44xx_mcbsp_pdata		NULL
+#define OMAP44XX_MCBSP_PDATA_SZ		0
+#endif
+
 static int __init omap2_mcbsp_init(void)
 {
 	if (cpu_is_omap2420())
@@ -177,6 +218,8 @@
 		omap_mcbsp_count = OMAP2430_MCBSP_PDATA_SZ;
 	if (cpu_is_omap34xx())
 		omap_mcbsp_count = OMAP34XX_MCBSP_PDATA_SZ;
+	if (cpu_is_omap44xx())
+		omap_mcbsp_count = OMAP44XX_MCBSP_PDATA_SZ;

 	mcbsp_ptr = kzalloc(omap_mcbsp_count * sizeof(struct omap_mcbsp *),
 								GFP_KERNEL);
@@ -192,6 +235,9 @@
 	if (cpu_is_omap34xx())
 		omap_mcbsp_register_board_cfg(omap34xx_mcbsp_pdata,
 						OMAP34XX_MCBSP_PDATA_SZ);
+	if (cpu_is_omap44xx())
+		omap_mcbsp_register_board_cfg(omap44xx_mcbsp_pdata,
+						OMAP44XX_MCBSP_PDATA_SZ);

 	return omap_mcbsp_init();
 }
Index: linux-2.6/arch/arm/plat-omap/include/mach/mcbsp.h
===================================================================
--- linux-2.6.orig/arch/arm/plat-omap/include/mach/mcbsp.h	2009-05-12
10:57:12.000000000 +0530
+++ linux-2.6/arch/arm/plat-omap/include/mach/mcbsp.h	2009-05-12
10:58:24.000000000 +0530
@@ -53,6 +53,11 @@
 #define OMAP34XX_MCBSP4_BASE	0x49026000
 #define OMAP34XX_MCBSP5_BASE	0x48096000

+#define OMAP44XX_MCBSP1_BASE	0x49022000
+#define OMAP44XX_MCBSP2_BASE	0x49024000
+#define OMAP44XX_MCBSP3_BASE	0x49026000
+#define OMAP44XX_MCBSP4_BASE	0x48074000
+
 #if defined(CONFIG_ARCH_OMAP15XX) || defined(CONFIG_ARCH_OMAP16XX) ||
defined(CONFIG_ARCH_OMAP730)

 #define OMAP_MCBSP_REG_DRR2	0x00
@@ -98,7 +103,8 @@
 #define AUDIO_DMA_TX		OMAP_DMA_MCBSP1_TX
 #define AUDIO_DMA_RX		OMAP_DMA_MCBSP1_RX

-#elif defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX)
+#elif defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) || \
+	defined(CONFIG_ARCH_OMAP4)

 #define OMAP_MCBSP_REG_DRR2	0x00
 #define OMAP_MCBSP_REG_DRR1	0x04

RE: [PATCH 1/2][RFC] OMAP4: McBSP support for OMAP_4430SDP.

[Shilimkar, Santosh]

> -----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:50 AM
> To: linux-arm-kernel@lists.arm.linux.org.uk
> Cc: linux-omap@vger.kernel.org
> Subject: [PATCH 1/2][RFC] OMAP4: McBSP support for OMAP_4430SDP.
> 
> This patch creates McBSP support on OMAP4430 development platform.
> This patch includes corresponding base address changes for OMAP4.
> 
> Signed-off-by: Syed Rafiuddin <rafiuddin.syed@ti.com>
> ---
>  arch/arm/mach-omap2/mcbsp.c             |   46 
> ++++++++++++++++++++++++++++++++
>  arch/arm/plat-omap/include/mach/mcbsp.h |    8 ++++-
>  2 files changed, 53 insertions(+), 1 deletion(-)
> 
> Index: linux-2.6/arch/arm/mach-omap2/mcbsp.c
> ===================================================================
> --- linux-2.6.orig/arch/arm/mach-omap2/mcbsp.c	
> 2009-05-12 10:57:12.000000000 +0530
> +++ linux-2.6/arch/arm/mach-omap2/mcbsp.c	2009-05-12 
> 10:57:32.000000000 +0530
> @@ -169,6 +169,47 @@
>  #define OMAP34XX_MCBSP_PDATA_SZ		0
>  #endif
> 
> +#ifdef CONFIG_ARCH_OMAP4

This #if can be removed since the structure is any ways OMAP4 specific.

> +static struct omap_mcbsp_platform_data omap44xx_mcbsp_pdata[] = {
> +	{
> +		.phys_base      = OMAP44XX_MCBSP1_BASE,
> +		.dma_rx_sync    = OMAP44XX_DMA_MCBSP1_RX,
> +		.dma_tx_sync    = OMAP44XX_DMA_MCBSP1_TX,
> +		.rx_irq         = INT_24XX_MCBSP1_IRQ_RX,

IRQ lines should also be updated.
> +		.tx_irq         = INT_24XX_MCBSP1_IRQ_TX,
> +		.ops            = &omap2_mcbsp_ops,
> +	},
> +	{
> +		.phys_base      = OMAP44XX_MCBSP2_BASE,
> +		.dma_rx_sync    = OMAP44XX_DMA_MCBSP2_RX,
> +		.dma_tx_sync    = OMAP44XX_DMA_MCBSP2_TX,
> +		.rx_irq         = INT_24XX_MCBSP2_IRQ_RX,
> +		.tx_irq         = INT_24XX_MCBSP2_IRQ_TX,
dito
> +		.ops            = &omap2_mcbsp_ops,
> +	},
> +	{
> +		.phys_base      = OMAP44XX_MCBSP3_BASE,
> +		.dma_rx_sync    = OMAP44XX_DMA_MCBSP3_RX,
> +		.dma_tx_sync    = OMAP44XX_DMA_MCBSP3_TX,
> +		.rx_irq         = INT_24XX_MCBSP3_IRQ_RX,
> +		.tx_irq         = INT_24XX_MCBSP3_IRQ_TX,
dito
> +		.ops            = &omap2_mcbsp_ops,
> +	},
> +	{
> +		.phys_base      = OMAP44XX_MCBSP4_BASE,
> +		.dma_rx_sync    = OMAP44XX_DMA_MCBSP4_RX,
> +		.dma_tx_sync    = OMAP44XX_DMA_MCBSP4_TX,
> +		.rx_irq         = INT_24XX_MCBSP4_IRQ_RX,
> +		.tx_irq         = INT_24XX_MCBSP4_IRQ_TX,
dito
> +		.ops            = &omap2_mcbsp_ops,
> +	},
> +}
> +#define OMAP44XX_MCBSP_PDATA_SZ		
> ARRAY_SIZE(omap44xx_mcbsp_pdata)
> +#else
> +#define omap44xx_mcbsp_pdata		NULL
> +#define OMAP44XX_MCBSP_PDATA_SZ		0
> +#endif
> +
>  static int __init omap2_mcbsp_init(void)
>  {
>  	if (cpu_is_omap2420())
> @@ -177,6 +218,8 @@
>  		omap_mcbsp_count = OMAP2430_MCBSP_PDATA_SZ;
>  	if (cpu_is_omap34xx())
>  		omap_mcbsp_count = OMAP34XX_MCBSP_PDATA_SZ;
> +	if (cpu_is_omap44xx())
> +		omap_mcbsp_count = OMAP44XX_MCBSP_PDATA_SZ;
> 
>  	mcbsp_ptr = kzalloc(omap_mcbsp_count * sizeof(struct 
> omap_mcbsp *),
>  								
> GFP_KERNEL);
> @@ -192,6 +235,9 @@
>  	if (cpu_is_omap34xx())
>  		omap_mcbsp_register_board_cfg(omap34xx_mcbsp_pdata,
>  						
> OMAP34XX_MCBSP_PDATA_SZ);
> +	if (cpu_is_omap44xx())
> +		omap_mcbsp_register_board_cfg(omap44xx_mcbsp_pdata,
> +						
> OMAP44XX_MCBSP_PDATA_SZ);
> 
>  	return omap_mcbsp_init();
>  }
> Index: linux-2.6/arch/arm/plat-omap/include/mach/mcbsp.h
> ===================================================================
> --- linux-2.6.orig/arch/arm/plat-omap/include/mach/mcbsp.h	
> 2009-05-12
> 10:57:12.000000000 +0530
> +++ linux-2.6/arch/arm/plat-omap/include/mach/mcbsp.h	2009-05-12
> 10:58:24.000000000 +0530
> @@ -53,6 +53,11 @@
>  #define OMAP34XX_MCBSP4_BASE	0x49026000
>  #define OMAP34XX_MCBSP5_BASE	0x48096000
> 
> +#define OMAP44XX_MCBSP1_BASE	0x49022000
> +#define OMAP44XX_MCBSP2_BASE	0x49024000
> +#define OMAP44XX_MCBSP3_BASE	0x49026000
> +#define OMAP44XX_MCBSP4_BASE	0x48074000
> +
>  #if defined(CONFIG_ARCH_OMAP15XX) || defined(CONFIG_ARCH_OMAP16XX) ||
> defined(CONFIG_ARCH_OMAP730)
> 
>  #define OMAP_MCBSP_REG_DRR2	0x00
> @@ -98,7 +103,8 @@
>  #define AUDIO_DMA_TX		OMAP_DMA_MCBSP1_TX
>  #define AUDIO_DMA_RX		OMAP_DMA_MCBSP1_RX
> 
> -#elif defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX)
> +#elif defined(CONFIG_ARCH_OMAP24XX) || 
> defined(CONFIG_ARCH_OMAP34XX) || \
> +	defined(CONFIG_ARCH_OMAP4)
Not sure this is because of mailer. In case not try to align it.

>  #define OMAP_MCBSP_REG_DRR2	0x00
>  #define OMAP_MCBSP_REG_DRR1	0x04
> 
> 

Regards,
Santosh
 

Re: [PATCH 0/2] OMAP4: Patch series

[Russell King - ARM Linux]

On Tue, May 12, 2009 at 11:49:35AM +0530, Syed Rafiuddin wrote:
> This patch series enables McBSP and UART4 support for OMAP4430 development
> platform.
> 
> The series contains:
> [PATCH 1/2]OMAP4: McBSP support for OMAP4430
> [PATCH 2/2]OMAP4: UART4 support for OMAP4430

Not nice - you've replied to Santosh's SMP patch series with your
own patch series.  That means your patches are grouped with Santosh's
SMP patches...

Please don't do this.

Santosh - I don't seem to have your SMP patch set, just your introductory
message for them.

Syed - I only have your first patch.

Re: [PATCH 0/2] OMAP4: Patch series

[Russell King - ARM Linux]

On Sat, May 16, 2009 at 11:16:47AM +0100, Russell King - ARM Linux wrote:
> Santosh - I don't seem to have your SMP patch set, just your introductory
> message for them.

Actually, I do have these patches, they just aren't threaded with your
introductory message.

Re: [PATCH 0/3] OMAP4: SMP: Patch series

[Russell King - ARM Linux]

On Thu, May 07, 2009 at 12:47:30PM +0530, Shilimkar, Santosh wrote:
> [PATCH 1/3]OMAP4: SMP: Add OMAP4430 SMP board files
> [PATCH 2/3]OMAP4: SMP: Add mpu timer support for OMAP4430
> [PATCH 3/3]OMAP4: SMP: Enable SMP support for OMAP4430

Overall comment - you seem to be re-using ARMs SCU and TWD blocks in
OMAP, which is fine.  If this is the way other silicon vendors are
going for SMP support, we should move that out of platform dependent
code, so we don't end up with everyone having their own duplicated
implementations of this code.

RE: [PATCH 0/2] OMAP4: Patch series

[Shilimkar, Santosh]

> -----Original Message-----
> From: linux-omap-owner@vger.kernel.org 
> [mailto:linux-omap-owner@vger.kernel.org] On Behalf Of 
> Russell King - ARM Linux
> Sent: Saturday, May 16, 2009 3:59 PM
> To: Syed, Rafiuddin
> Cc: linux-arm-kernel@lists.arm.linux.org.uk; 
> linux-omap@vger.kernel.org
> Subject: Re: [PATCH 0/2] OMAP4: Patch series
> 
> On Sat, May 16, 2009 at 11:16:47AM +0100, Russell King - ARM 
> Linux wrote:
> > Santosh - I don't seem to have your SMP patch set, just 
> your introductory
> > message for them.
> 
> Actually, I do have these patches, they just aren't threaded with your
> introductory message.

I did send the introductory messege for SMP patch series. May be you missed that. Here is it for your info.
********************************************************************************************************
From: linux-omap-owner@vger.kernel.org on behalf of Shilimkar, Santosh
Sent: Thursday, May 07, 2009 12:48 PM
To: linux-arm-kernel@lists.arm.linux.org.uk
Cc: linux-omap@vger.kernel.org
Subject: [PATCH 0/3] OMAP4: SMP: Patch series

This patch series enables SMP support for OMAP4430 development platform. This series depends on the earlier patch series sent on the mailing list. [1]

The patches are generated against mainline version 2.6.30 -rc2. The kernel is validated on the OMAP4430 software simulator platform. SMP kernel is functional with debug UART. No additional drivers are supported yet.

The series contains:

[PATCH 1/3]OMAP4: SMP: Add OMAP4430 SMP board files
[PATCH 2/3]OMAP4: SMP: Add mpu timer support for OMAP4430
[PATCH 3/3]OMAP4: SMP: Enable SMP support for OMAP4430

Regards,
Santosh

[1]:	[PATCH 0/7] OMAP4: Basic board support patch series
	http://lists.arm.linux.org.uk/lurker/message/20090428.094757.6642f1e3.en.html
********************************************************************************************************

Regards,
Santosh