public inbox for linux-omap@vger.kernel.org
 help / color / mirror / Atom feed
From: Tony Lindgren <tony@atomide.com>
To: linux-arm-kernel@lists.arm.linux.org.uk
Cc: Jarkko Nikula <jhnikula@gmail.com>, linux-omap@vger.kernel.org
Subject: [PATCH 4/8] ARM: OMAP2: Fix SPI driver failure on 2420 when running multi-omap config
Date: Thu, 14 May 2009 10:47:20 -0700	[thread overview]
Message-ID: <20090514174719.12080.79578.stgit@localhost> (raw)
In-Reply-To: <20090514174100.12080.9736.stgit@localhost>

From: Jarkko Nikula <jhnikula@gmail.com>

SPI driver will do unhandled fault on OMAP2420 if trying to probe
non-existing SPI busses. Register those additional busses runtime only
for cpus having them.

Signed-off-by: Jarkko Nikula <jhnikula@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---
 arch/arm/mach-omap2/devices.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c
index 496983a..894cc35 100644
--- a/arch/arm/mach-omap2/devices.c
+++ b/arch/arm/mach-omap2/devices.c
@@ -354,10 +354,12 @@ static void omap_init_mcspi(void)
 	platform_device_register(&omap2_mcspi1);
 	platform_device_register(&omap2_mcspi2);
 #if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP3)
-	platform_device_register(&omap2_mcspi3);
+	if (cpu_is_omap2430() || cpu_is_omap343x())
+		platform_device_register(&omap2_mcspi3);
 #endif
 #ifdef CONFIG_ARCH_OMAP3
-	platform_device_register(&omap2_mcspi4);
+	if (cpu_is_omap343x())
+		platform_device_register(&omap2_mcspi4);
 #endif
 }
 


  parent reply	other threads:[~2009-05-14 17:47 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-05-14 17:41 [PATCH 0/8] Omap fixes for 2.6.30-rc5 Tony Lindgren
2009-05-14 17:43 ` [PATCH 1/8] ARM: OMAP: Fix printing of reserved memory for frambuffer Tony Lindgren
2009-05-14 17:44 ` [PATCH 2/8] ARM: OMAP: GPIO de-bounce clocks don't affect module idle state Tony Lindgren
2009-05-14 17:45 ` [PATCH 3/8] ARM: OMAP2: Fix tusb6010 init error and compilation warning Tony Lindgren
2009-05-14 17:47 ` Tony Lindgren [this message]
2009-05-14 17:48 ` [PATCH 5/8] ARM: OMAP2/3: Add name for musb clocks Tony Lindgren
2009-05-14 17:49 ` [PATCH 6/8] ARM: OMAP2/3: Change omapfb to use clkdev for dispc and rfbi Tony Lindgren
2009-05-14 19:03   ` Krzysztof Helt
2009-05-14 20:28     ` Tony Lindgren
2009-05-16  9:06       ` Russell King - ARM Linux
2009-05-16 15:25         ` Tony Lindgren
2009-05-16 16:22           ` Russell King - ARM Linux
2009-05-16 18:02             ` Tony Lindgren
2009-05-14 17:51 ` [PATCH 7/8] ARM: OMAP3: Fix number of GPIO lines for 34xx Tony Lindgren
2009-05-15  2:29   ` Gadiyar, Anand
2009-05-15 15:07     ` Tony Lindgren
2009-05-14 17:52 ` [PATCH 8/8] ARM: OMAP3: Fix HW SAVEANDRESTORE shift define Tony Lindgren
2009-05-15 22:41 ` git pull request for omap-fixes (Re: [PATCH 0/8] Omap fixes for 2.6.30-rc5) Tony Lindgren
2009-05-16 15:41   ` git pull request for omap-fixes, v2 " Tony Lindgren
2009-05-16 18:05     ` git pull request for omap-fixes, v3 " Tony Lindgren

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20090514174719.12080.79578.stgit@localhost \
    --to=tony@atomide.com \
    --cc=jhnikula@gmail.com \
    --cc=linux-arm-kernel@lists.arm.linux.org.uk \
    --cc=linux-omap@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox