Patchwork sbc834x: put full compat string in board match check

login
register
mail settings
Submitter Paul Gortmaker
Date Dec. 5, 2011, 4:41 p.m.
Message ID <1323103267-22786-1-git-send-email-paul.gortmaker@windriver.com>
Download mbox | patch
Permalink /patch/129358/
State Accepted
Delegated to: Kumar Gala
Headers show

Comments

Paul Gortmaker - Dec. 5, 2011, 4:41 p.m.
The commit 883c2cfc8bcc0fd00c5d9f596fb8870f481b5bda:

 "fix of_flat_dt_is_compatible() to match the full compatible string"

causes silent boot death on the sbc8349 board because it was
just looking for 8349 and not 8349E -- as originally there
were non-E (no SEC/encryption) chips available.  Just add the
E to the board detection string since all boards I've seen
were manufactured with the E versions.

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Kumar Gala - Dec. 8, 2011, 7:23 a.m.
On Dec 5, 2011, at 10:41 AM, Paul Gortmaker wrote:

> The commit 883c2cfc8bcc0fd00c5d9f596fb8870f481b5bda:
> 
> "fix of_flat_dt_is_compatible() to match the full compatible string"
> 
> causes silent boot death on the sbc8349 board because it was
> just looking for 8349 and not 8349E -- as originally there
> were non-E (no SEC/encryption) chips available.  Just add the
> E to the board detection string since all boards I've seen
> were manufactured with the E versions.
> 
> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>

applied to merge

- k

Patch

diff --git a/arch/powerpc/platforms/83xx/sbc834x.c b/arch/powerpc/platforms/83xx/sbc834x.c
index af41d8c..f5a783a 100644
--- a/arch/powerpc/platforms/83xx/sbc834x.c
+++ b/arch/powerpc/platforms/83xx/sbc834x.c
@@ -102,11 +102,11 @@  static int __init sbc834x_probe(void)
 {
 	unsigned long root = of_get_flat_dt_root();
 
-	return of_flat_dt_is_compatible(root, "SBC834x");
+	return of_flat_dt_is_compatible(root, "SBC834xE");
 }
 
 define_machine(sbc834x) {
-	.name			= "SBC834x",
+	.name			= "SBC834xE",
 	.probe			= sbc834x_probe,
 	.setup_arch		= sbc834x_setup_arch,
 	.init_IRQ		= sbc834x_init_IRQ,