linux-omap.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Tony Lindgren <tony@atomide.com>
To: linux-arm-kernel@lists.infradead.org
Cc: linux-omap@vger.kernel.org
Subject: [PATCH 06/11] omap4: Fix omap_l2_cache_init not to run for other omaps
Date: Fri, 30 Apr 2010 13:33:59 -0700	[thread overview]
Message-ID: <20100430203359.25812.56284.stgit@baageli.muru.com> (raw)
In-Reply-To: <20100430202603.25812.41834.stgit@baageli.muru.com>

In multi-omap configuration all the initcalls run. To avoid
bad things from happening with 44xx specific initcalls on
other omaps, we need to check that the booted system is
omap4 before running.

Signed-off-by: Tony Lindgren <tony@atomide.com>
---
 arch/arm/mach-omap2/board-4430sdp.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-omap2/board-4430sdp.c b/arch/arm/mach-omap2/board-4430sdp.c
index b88f28c..e603b00 100644
--- a/arch/arm/mach-omap2/board-4430sdp.c
+++ b/arch/arm/mach-omap2/board-4430sdp.c
@@ -55,6 +55,9 @@ static int __init omap_l2_cache_init(void)
 	extern void omap_smc1(u32 fn, u32 arg);
 	void __iomem *l2cache_base;
 
+	if (!cpu_is_omap44xx())
+		return -ENODEV;
+
 	/* To avoid code running on other OMAPs in
 	 * multi-omap builds
 	 */


  parent reply	other threads:[~2010-04-30 20:34 UTC|newest]

Thread overview: 40+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-04-30 20:33 [PATCH 00/11] omap2/3/4: Multi-omap updates to boot test with omap3_defconfig Tony Lindgren
2010-04-30 20:33 ` [PATCH 01/11] omap2/3/4: Fix multi.h when omap3 and omap4 are selected without omap2 Tony Lindgren
2010-04-30 20:33 ` [PATCH 02/11] omap2/3: Fix DEBUG_LL for omap zoom2/3 Tony Lindgren
2010-04-30 20:55   ` Kevin Hilman
2010-04-30 21:02     ` Tony Lindgren
2010-04-30 21:20       ` Kevin Hilman
2010-04-30 21:37         ` Pandita, Vikram
2010-04-30 21:53           ` Pandita, Vikram
2010-04-30 22:00           ` Kevin Hilman
2010-04-30 23:30             ` Tony Lindgren
2010-05-01  0:10               ` Kevin Hilman
2010-05-01  1:37                 ` Tony Lindgren
2010-05-01  1:50                   ` Tony Lindgren
2010-05-03 22:10                     ` Pandita, Vikram
2010-05-04  0:40                       ` Tony Lindgren
2010-05-04  0:57                         ` [PATCH 02a/11] omap: Use a memory address for storing the debug port info instead of UART1 scratchpad Tony Lindgren
2010-05-04  0:58                         ` [PATCH 02b/11] omap2/3: Fix DEBUG_LL for omap zoom2/3 Tony Lindgren
2010-05-04 17:33                           ` Pandita, Vikram
2010-05-04 23:09                             ` Tony Lindgren
2010-04-30 20:33 ` [PATCH 03/11] omap3: Fix compile for board-cm-t35 Tony Lindgren
2010-04-30 20:33 ` [PATCH 04/11] omap3: Remove non-muxable ball entries for 3630 Tony Lindgren
2010-04-30 20:33 ` [PATCH 05/11] omap4: Fix multiboot with CONFIG_PM and CONFIG_ARCH_OMAP3 selected Tony Lindgren
2010-04-30 20:33 ` Tony Lindgren [this message]
2010-05-01  6:18   ` [PATCH 06/11] omap4: Fix omap_l2_cache_init not to run for other omaps Shilimkar, Santosh
2010-05-01 17:46     ` Tony Lindgren
2010-04-30 20:34 ` [PATCH 07/11] omap2/3/4: Add new boards to omap3_defconfig Tony Lindgren
2010-04-30 20:34 ` [PATCH 08/11] omap2/3/4: Make omap3_defconfig usable on Nokia boards Tony Lindgren
2010-04-30 20:34 ` [PATCH 09/11] omap2/3/4: Update PMIC options for TWL and Menelaus chips Tony Lindgren
2010-04-30 20:34 ` [PATCH 10/11] omap2/3/4: Dissable CONFIG_PM_VERBOSE in omap3_defconfig Tony Lindgren
2010-04-30 20:34 ` [PATCH 11/11] omap2/3/4: Disable CONFIG_FB_OMAP " Tony Lindgren
2010-04-30 20:50   ` Tony Lindgren
2010-05-04  0:52     ` Tony Lindgren
2010-05-04  7:26       ` Tomi Valkeinen
2010-05-04 14:40         ` Tony Lindgren
2010-05-04 14:50           ` Tomi Valkeinen
2010-05-04 19:23             ` Tony Lindgren
2010-05-05 17:32   ` Old DSS code broken as module (was "RE: [PATCH 11/11] omap2/3/4: Disable CONFIG_FB_OMAP in omap3_defconfig") Aguirre, Sergio
2010-05-05 17:43     ` Tony Lindgren
2010-05-05 18:23       ` Aguirre, Sergio
2010-05-06  8:07     ` Tomi Valkeinen

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=20100430203359.25812.56284.stgit@baageli.muru.com \
    --to=tony@atomide.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --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;
as well as URLs for NNTP newsgroup(s).