* [PATCH]OMAP4: McSPI Support for OMAP_4430
@ 2009-06-29 12:55 Syed Rafiuddin
2009-06-29 17:58 ` Pandita, Vikram
2009-07-03 0:27 ` David Brownell
0 siblings, 2 replies; 6+ messages in thread
From: Syed Rafiuddin @ 2009-06-29 12:55 UTC (permalink / raw)
To: spi-devel-general, dbrownell; +Cc: linux-omap
This patch adds McSPI support for OMAP4430 SDP platform. All the base addresses
are changed between OMAP1/2/3 and OMAP4.The fields of the resource structures
are filled at runtime to have McSPI support on OMAP4.
Signed-off-by: Syed Rafiuddin <rafiuddin.syed@ti.com>
Acked-by: Kevin Hilman <khilman@deeprootsystems.com>
Acked-by: Tony Lindgren <tony@atomide.com>
Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
---
arch/arm/mach-omap2/devices.c | 25 +++++++++++++++++++++----
drivers/spi/omap2_mcspi.c | 10 ++++++----
2 files changed, 27 insertions(+), 8 deletions(-)
Index: omap4_dev/arch/arm/mach-omap2/devices.c
=================================================================== ---
omap4_dev.orig/arch/arm/mach-omap2/devices.c 2009-06-24
19:22:04.000000000
+0530
+++ omap4_dev/arch/arm/mach-omap2/devices.c 2009-06-25
10:05:39.000000000 +0530
@@ -257,6 +257,11 @@
#define OMAP2_MCSPI3_BASE 0x480b8000
#define OMAP2_MCSPI4_BASE 0x480ba000
+#define OMAP4_MCSPI1_BASE 0x48098100
+#define OMAP4_MCSPI2_BASE 0x4809a100
+#define OMAP4_MCSPI3_BASE 0x480b8100
+#define OMAP4_MCSPI4_BASE 0x480ba100
+
static struct omap2_mcspi_platform_config omap2_mcspi1_config = {
.num_cs = 4,
};
@@ -301,7 +306,8 @@
},
};
-#if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP3)
+#if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP3) || \ +
defined(CONFIG_ARCH_OMAP4)
static struct omap2_mcspi_platform_config omap2_mcspi3_config = {
.num_cs = 2,
};
@@ -325,7 +331,7 @@
};
#endif
-#ifdef CONFIG_ARCH_OMAP3
+#if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_ARCH_OMAP4)
static struct omap2_mcspi_platform_config omap2_mcspi4_config = {
.num_cs = 1,
};
@@ -351,12 +357,23 @@
static void omap_init_mcspi(void)
{
+ if (cpu_is_omap44xx()) {
+ omap2_mcspi1_resources[0].start = OMAP4_MCSPI1_BASE; +
omap2_mcspi1_resources[0].end = OMAP4_MCSPI1_BASE + 0xff; +
omap2_mcspi2_resources[0].start = OMAP4_MCSPI2_BASE; +
omap2_mcspi2_resources[0].end = OMAP4_MCSPI2_BASE + 0xff; +
omap2_mcspi3_resources[0].start = OMAP4_MCSPI3_BASE; +
omap2_mcspi3_resources[0].end = OMAP4_MCSPI3_BASE + 0xff; +
omap2_mcspi4_resources[0].start = OMAP4_MCSPI4_BASE; +
omap2_mcspi4_resources[0].end = OMAP4_MCSPI4_BASE + 0xff; + }
platform_device_register(&omap2_mcspi1);
platform_device_register(&omap2_mcspi2);
-#if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP3)
+#if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP3) || \ +
defined(CONFIG_ARCH_OMAP4)
platform_device_register(&omap2_mcspi3);
#endif
-#ifdef CONFIG_ARCH_OMAP3
+#if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_ARCH_OMAP4)
platform_device_register(&omap2_mcspi4);
#endif
}
Index: omap4_dev/drivers/spi/omap2_mcspi.c
=================================================================== ---
omap4_dev.orig/drivers/spi/omap2_mcspi.c 2009-06-24
19:22:23.000000000 +0530
+++ omap4_dev/drivers/spi/omap2_mcspi.c 2009-06-24 19:22:46.000000000
+0530 @@ -918,7 +918,8 @@
OMAP24XX_DMA_SPI2_TX1,
};
-#if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP34XX) +#if
defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP34XX) || \ +
defined(CONFIG_ARCH_OMAP4)
static u8 __initdata spi3_rxdma_id[] = {
OMAP24XX_DMA_SPI3_RX0,
OMAP24XX_DMA_SPI3_RX1,
@@ -930,7 +931,7 @@
};
#endif
-#ifdef CONFIG_ARCH_OMAP3
+#if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_ARCH_OMAP4)
static u8 __initdata spi4_rxdma_id[] = {
OMAP34XX_DMA_SPI4_RX0,
};
@@ -960,14 +961,15 @@
txdma_id = spi2_txdma_id;
num_chipselect = 2;
break;
-#if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP3)
+#if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP3) || \ +
defined(CONFIG_ARCH_OMAP4)
case 3:
rxdma_id = spi3_rxdma_id;
txdma_id = spi3_txdma_id;
num_chipselect = 2;
break;
#endif
-#ifdef CONFIG_ARCH_OMAP3
+#if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_ARCH_OMAP4)
case 4:
rxdma_id = spi4_rxdma_id;
txdma_id = spi4_txdma_id;
^ permalink raw reply [flat|nested] 6+ messages in thread
* RE: [PATCH]OMAP4: McSPI Support for OMAP_4430
2009-06-29 12:55 [PATCH]OMAP4: McSPI Support for OMAP_4430 Syed Rafiuddin
@ 2009-06-29 17:58 ` Pandita, Vikram
2009-07-03 0:27 ` David Brownell
1 sibling, 0 replies; 6+ messages in thread
From: Pandita, Vikram @ 2009-06-29 17:58 UTC (permalink / raw)
To: Syed, Rafiuddin, spi-devel-general, dbrownell@users.sourceforge.net
Cc: linux-omap
Rafiuddin
>-----Original Message-----
>From: linux-omap-owner@vger.kernel.org [mailto:linux-omap-owner@vger.kernel.org] On Behalf Of Syed,
>Rafiuddin
>Sent: Monday, June 29, 2009 7:55 AM
>To: spi-devel-general@lists.sourceforge.net; dbrownell@users.sourceforge.net
>Cc: linux-omap@vger.kernel.org
>Subject: [PATCH]OMAP4: McSPI Support for OMAP_4430
Your mailer is having formatting issues like:
TABS getting converted to spaces, etc.
Please use git send-email instead and for setting this up you can refer to this wiki page https://omapzoom.org/gf/project/omapkernel/wiki/?pagename=How+to+submit+patches
>
>This patch adds McSPI support for OMAP4430 SDP platform. All the base addresses
>are changed between OMAP1/2/3 and OMAP4.The fields of the resource structures
>are filled at runtime to have McSPI support on OMAP4.
>
>Signed-off-by: Syed Rafiuddin <rafiuddin.syed@ti.com>
>Acked-by: Kevin Hilman <khilman@deeprootsystems.com>
>Acked-by: Tony Lindgren <tony@atomide.com>
>Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
>---
> arch/arm/mach-omap2/devices.c | 25 +++++++++++++++++++++----
> drivers/spi/omap2_mcspi.c | 10 ++++++----
> 2 files changed, 27 insertions(+), 8 deletions(-)
>
>Index: omap4_dev/arch/arm/mach-omap2/devices.c
>=================================================================== ---
>omap4_dev.orig/arch/arm/mach-omap2/devices.c 2009-06-24
>19:22:04.000000000
>+0530
Here is a bad formatting example.
>+++ omap4_dev/arch/arm/mach-omap2/devices.c 2009-06-25
>10:05:39.000000000 +0530
> static void omap_init_mcspi(void)
> {
>+ if (cpu_is_omap44xx()) {
>+ omap2_mcspi1_resources[0].start = OMAP4_MCSPI1_BASE; +
> omap2_mcspi1_resources[0].end = OMAP4_MCSPI1_BASE + 0xff; +
> omap2_mcspi2_resources[0].start = OMAP4_MCSPI2_BASE; +
>omap2_mcspi2_resources[0].end = OMAP4_MCSPI2_BASE + 0xff; +
> omap2_mcspi3_resources[0].start = OMAP4_MCSPI3_BASE; +
>omap2_mcspi3_resources[0].end = OMAP4_MCSPI3_BASE + 0xff; +
> omap2_mcspi4_resources[0].start = OMAP4_MCSPI4_BASE; +
>omap2_mcspi4_resources[0].end = OMAP4_MCSPI4_BASE + 0xff; + }
> platform_device_register(&omap2_mcspi1);
> platform_device_register(&omap2_mcspi2);
>-#if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP3)
>+#if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP3) || \ +
>defined(CONFIG_ARCH_OMAP4)
> platform_device_register(&omap2_mcspi3);
> #endif
>-#ifdef CONFIG_ARCH_OMAP3
>+#if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_ARCH_OMAP4)
> platform_device_register(&omap2_mcspi4);
> #endif
> }
>Index: omap4_dev/drivers/spi/omap2_mcspi.c
>=================================================================== ---
>omap4_dev.orig/drivers/spi/omap2_mcspi.c 2009-06-24
>19:22:23.000000000 +0530
>+++ omap4_dev/drivers/spi/omap2_mcspi.c 2009-06-24 19:22:46.000000000
>+0530 @@ -918,7 +918,8 @@
> OMAP24XX_DMA_SPI2_TX1,
> };
>
>-#if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP34XX) +#if
This is some formatting issue which will not come if you use git send-email
>defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP34XX) || \ +
>defined(CONFIG_ARCH_OMAP4)
> static u8 __initdata spi3_rxdma_id[] = {
> OMAP24XX_DMA_SPI3_RX0,
> OMAP24XX_DMA_SPI3_RX1,
>@@ -930,7 +931,7 @@
> };
> #endif
>
>-#ifdef CONFIG_ARCH_OMAP3
>+#if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_ARCH_OMAP4)
> static u8 __initdata spi4_rxdma_id[] = {
> OMAP34XX_DMA_SPI4_RX0,
> };
>@@ -960,14 +961,15 @@
> txdma_id = spi2_txdma_id;
> num_chipselect = 2;
> break;
>-#if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP3)
>+#if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP3) || \ +
>defined(CONFIG_ARCH_OMAP4)
> case 3:
> rxdma_id = spi3_rxdma_id;
> txdma_id = spi3_txdma_id;
> num_chipselect = 2;
> break;
> #endif
>-#ifdef CONFIG_ARCH_OMAP3
>+#if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_ARCH_OMAP4)
> case 4:
> rxdma_id = spi4_rxdma_id;
> txdma_id = spi4_txdma_id;
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH]OMAP4: McSPI Support for OMAP_4430
2009-06-29 12:55 [PATCH]OMAP4: McSPI Support for OMAP_4430 Syed Rafiuddin
2009-06-29 17:58 ` Pandita, Vikram
@ 2009-07-03 0:27 ` David Brownell
2009-07-03 4:51 ` Shilimkar, Santosh
1 sibling, 1 reply; 6+ messages in thread
From: David Brownell @ 2009-07-03 0:27 UTC (permalink / raw)
To: Syed Rafiuddin; +Cc: spi-devel-general, linux-omap
On Monday 29 June 2009, Syed Rafiuddin wrote:
> This patch adds McSPI support for OMAP4430 SDP platform. All the base addresses
> are changed between OMAP1/2/3 and OMAP4.The fields of the resource structures
> are filled at runtime to have McSPI support on OMAP4.
>
> Signed-off-by: Syed Rafiuddin <rafiuddin.syed@ti.com>
> Acked-by: Kevin Hilman <khilman@deeprootsystems.com>
> Acked-by: Tony Lindgren <tony@atomide.com>
> Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
I'd add my ack if this patch weren't mangled. :)
> ---
> arch/arm/mach-omap2/devices.c | 25 +++++++++++++++++++++----
Since *most* of this is arch/arm stuff, I think this patch
should go to mainine through Tony. That's the best way to
make sure it doesn't cause conflicts with other patches he
sends.
> drivers/spi/omap2_mcspi.c | 10 ++++++----
> 2 files changed, 27 insertions(+), 8 deletions(-)
None of this seemed particularly controversial.
--
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* RE: [PATCH]OMAP4: McSPI Support for OMAP_4430
2009-07-03 0:27 ` David Brownell
@ 2009-07-03 4:51 ` Shilimkar, Santosh
2009-08-05 8:58 ` Tony Lindgren
0 siblings, 1 reply; 6+ messages in thread
From: Shilimkar, Santosh @ 2009-07-03 4:51 UTC (permalink / raw)
To: David Brownell, Syed, Rafiuddin; +Cc: spi-devel-general, linux-omap
> -----Original Message-----
> From: linux-omap-owner@vger.kernel.org
> [mailto:linux-omap-owner@vger.kernel.org] On Behalf Of David Brownell
> Sent: Friday, July 03, 2009 5:57 AM
> To: Syed, Rafiuddin
> Cc: spi-devel-general@lists.sourceforge.net;
> linux-omap@vger.kernel.org
> Subject: Re: [PATCH]OMAP4: McSPI Support for OMAP_4430
>
> On Monday 29 June 2009, Syed Rafiuddin wrote:
> > This patch adds McSPI support for OMAP4430 SDP platform.
> All the base addresses
> > are changed between OMAP1/2/3 and OMAP4.The fields of the
> resource structures
> > are filled at runtime to have McSPI support on OMAP4.
> >
> > Signed-off-by: Syed Rafiuddin <rafiuddin.syed@ti.com>
> > Acked-by: Kevin Hilman <khilman@deeprootsystems.com>
> > Acked-by: Tony Lindgren <tony@atomide.com>
> > Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
>
> I'd add my ack if this patch weren't mangled. :)
>
> > ---
> > arch/arm/mach-omap2/devices.c | 25 +++++++++++++++++++++----
>
> Since *most* of this is arch/arm stuff, I think this patch
> should go to mainine through Tony. That's the best way to
> make sure it doesn't cause conflicts with other patches he
> sends.
Tony suggested that this patch can be sent through SPI mailing list.
Refer this thread.
http://www.mail-archive.com/linux-omap@vger.kernel.org/msg14011.html
>
> > drivers/spi/omap2_mcspi.c | 10 ++++++----
> > 2 files changed, 27 insertions(+), 8 deletions(-)
>
> None of this seemed particularly controversial.
>
--
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH]OMAP4: McSPI Support for OMAP_4430
2009-07-03 4:51 ` Shilimkar, Santosh
@ 2009-08-05 8:58 ` Tony Lindgren
2009-08-05 9:10 ` Syed Rafiuddin
0 siblings, 1 reply; 6+ messages in thread
From: Tony Lindgren @ 2009-08-05 8:58 UTC (permalink / raw)
To: Shilimkar, Santosh
Cc: David Brownell, Syed, Rafiuddin, spi-devel-general, linux-omap
* Shilimkar, Santosh <santosh.shilimkar@ti.com> [090703 07:52]:
> > -----Original Message-----
> > From: linux-omap-owner@vger.kernel.org
> > [mailto:linux-omap-owner@vger.kernel.org] On Behalf Of David Brownell
> > Sent: Friday, July 03, 2009 5:57 AM
> > To: Syed, Rafiuddin
> > Cc: spi-devel-general@lists.sourceforge.net;
> > linux-omap@vger.kernel.org
> > Subject: Re: [PATCH]OMAP4: McSPI Support for OMAP_4430
> >
> > On Monday 29 June 2009, Syed Rafiuddin wrote:
> > > This patch adds McSPI support for OMAP4430 SDP platform.
> > All the base addresses
> > > are changed between OMAP1/2/3 and OMAP4.The fields of the
> > resource structures
> > > are filled at runtime to have McSPI support on OMAP4.
> > >
> > > Signed-off-by: Syed Rafiuddin <rafiuddin.syed@ti.com>
> > > Acked-by: Kevin Hilman <khilman@deeprootsystems.com>
> > > Acked-by: Tony Lindgren <tony@atomide.com>
> > > Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
> >
> > I'd add my ack if this patch weren't mangled. :)
> >
> > > ---
> > > arch/arm/mach-omap2/devices.c | 25 +++++++++++++++++++++----
> >
> > Since *most* of this is arch/arm stuff, I think this patch
> > should go to mainine through Tony. That's the best way to
> > make sure it doesn't cause conflicts with other patches he
> > sends.
>
> Tony suggested that this patch can be sent through SPI mailing list.
> Refer this thread.
> http://www.mail-archive.com/linux-omap@vger.kernel.org/msg14011.html
Just to confirm, this is OK for me to merge via the SPI once the
mangling is removed.
Tony
> >
> > > drivers/spi/omap2_mcspi.c | 10 ++++++----
> > > 2 files changed, 27 insertions(+), 8 deletions(-)
> >
> > None of this seemed particularly controversial.
> >
> --
> 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
--
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH]OMAP4: McSPI Support for OMAP_4430
2009-08-05 8:58 ` Tony Lindgren
@ 2009-08-05 9:10 ` Syed Rafiuddin
0 siblings, 0 replies; 6+ messages in thread
From: Syed Rafiuddin @ 2009-08-05 9:10 UTC (permalink / raw)
To: Tony Lindgren
Cc: Shilimkar, Santosh, David Brownell, spi-devel-general, linux-omap
> * Shilimkar, Santosh <santosh.shilimkar@ti.com> [090703 07:52]:
>> > -----Original Message-----
>> > From: linux-omap-owner@vger.kernel.org
>> > [mailto:linux-omap-owner@vger.kernel.org] On Behalf Of David Brownell
>> > Sent: Friday, July 03, 2009 5:57 AM
>> > To: Syed, Rafiuddin
>> > Cc: spi-devel-general@lists.sourceforge.net;
>> > linux-omap@vger.kernel.org
>> > Subject: Re: [PATCH]OMAP4: McSPI Support for OMAP_4430
>> >
>> > On Monday 29 June 2009, Syed Rafiuddin wrote:
>> > > This patch adds McSPI support for OMAP4430 SDP platform.
>> > All the base addresses
>> > > are changed between OMAP1/2/3 and OMAP4.The fields of the
>> > resource structures
>> > > are filled at runtime to have McSPI support on OMAP4.
>> > >
>> > > Signed-off-by: Syed Rafiuddin <rafiuddin.syed@ti.com>
>> > > Acked-by: Kevin Hilman <khilman@deeprootsystems.com>
>> > > Acked-by: Tony Lindgren <tony@atomide.com>
>> > > Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
>> >
>> > I'd add my ack if this patch weren't mangled. :)
>> >
>> > > ---
>> > > arch/arm/mach-omap2/devices.c | 25 +++++++++++++++++++++----
>> >
>> > Since *most* of this is arch/arm stuff, I think this patch
>> > should go to mainine through Tony. That's the best way to
>> > make sure it doesn't cause conflicts with other patches he
>> > sends.
>>
>> Tony suggested that this patch can be sent through SPI mailing list.
>> Refer this thread.
>> http://www.mail-archive.com/linux-omap@vger.kernel.org/msg14011.html
>
> Just to confirm, this is OK for me to merge via the SPI once the
> mangling is removed.
>
> Tony
I have resubmitted the patch by removing the mangling, It can be found
at this link location
http://marc.info/?l=linux-omap&m=124827089126638&w=2
>
>
>
>> >
>> > > drivers/spi/omap2_mcspi.c | 10 ++++++----
>> > > 2 files changed, 27 insertions(+), 8 deletions(-)
>> >
>> > None of this seemed particularly controversial.
>> >
>> --
>> 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
>
>
--
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
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2009-08-05 9:10 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-06-29 12:55 [PATCH]OMAP4: McSPI Support for OMAP_4430 Syed Rafiuddin
2009-06-29 17:58 ` Pandita, Vikram
2009-07-03 0:27 ` David Brownell
2009-07-03 4:51 ` Shilimkar, Santosh
2009-08-05 8:58 ` Tony Lindgren
2009-08-05 9:10 ` Syed Rafiuddin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).