linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
* [patch] cell: correctly detect systemsim host
@ 2006-04-13 11:41 Christian Krafft
  2006-04-13 11:44 ` [Cbe-oss-dev] " Arnd Bergmann
  0 siblings, 1 reply; 3+ messages in thread
From: Christian Krafft @ 2006-04-13 11:41 UTC (permalink / raw)
  To: cbe-oss-dev, linuxppc-dev

Systemsim uses a different compatible property in the device tree.

Signed-off-by: Christian Krafft <krafft@de.ibm.com>
---

Index: linux/arch/powerpc/platforms/cell/setup.c
===================================================================
--- linux.orig/arch/powerpc/platforms/cell/setup.c
+++ linux/arch/powerpc/platforms/cell/setup.c
@@ -222,10 +222,13 @@ static int __init cell_probe(void)
  	 * more appropriate detection logic
  	 */
  	unsigned long root = of_get_flat_dt_root();
-	if (!of_flat_dt_is_compatible(root, "IBM,CPBW-1.0"))
-		return 0;
+	if (of_flat_dt_is_compatible(root, "IBM,CPBW-1.0"))
+		return 1;

-	return 1;
+	if (of_flat_dt_is_compatible(root, "IBM,CPBW-SystemSim"))
+		return 1;
+
+	return 0;
  }

  /*

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

* Re: [Cbe-oss-dev] [patch] cell: correctly detect systemsim host
  2006-04-13 11:41 [patch] cell: correctly detect systemsim host Christian Krafft
@ 2006-04-13 11:44 ` Arnd Bergmann
  2006-04-14  9:23   ` Joel Schopp
  0 siblings, 1 reply; 3+ messages in thread
From: Arnd Bergmann @ 2006-04-13 11:44 UTC (permalink / raw)
  To: cbe-oss-dev; +Cc: Christian Krafft, linuxppc-dev

On Thursday 13 April 2006 13:41, Christian Krafft wrote:
> Systemsim uses a different compatible property in the device tree.
> 
> Signed-off-by: Christian Krafft <krafft@de.ibm.com>

Thanks.

I'm wondering if we should have that upstream, since some
more patches are currently required to run on systemsim
anyway. For now, I'll keep it in my tree.

	Arnd <><

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

* Re: [Cbe-oss-dev] [patch] cell: correctly detect systemsim host
  2006-04-13 11:44 ` [Cbe-oss-dev] " Arnd Bergmann
@ 2006-04-14  9:23   ` Joel Schopp
  0 siblings, 0 replies; 3+ messages in thread
From: Joel Schopp @ 2006-04-14  9:23 UTC (permalink / raw)
  To: Arnd Bergmann; +Cc: Christian Krafft, cbe-oss-dev, linuxppc-dev

>> Systemsim uses a different compatible property in the device tree.
>>
>> Signed-off-by: Christian Krafft <krafft@de.ibm.com>
> 
> Thanks.
> 
> I'm wondering if we should have that upstream, since some
> more patches are currently required to run on systemsim
> anyway. For now, I'll keep it in my tree.

It is clean enough to go upstream and doesn't depend on anything else, 
so I say put it upstream.  That's just one less patch to carry outside 
of mainline.  No reason to punish perfectly good patches just because 
the rest of the systemsim stuff isn't ready yet.

-Joel

Acked-by: Joel Schopp <jschopp@austin.ibm.com>

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

end of thread, other threads:[~2006-04-14  9:23 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-04-13 11:41 [patch] cell: correctly detect systemsim host Christian Krafft
2006-04-13 11:44 ` [Cbe-oss-dev] " Arnd Bergmann
2006-04-14  9:23   ` Joel Schopp

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).