sbc834x: put full compat string in board match check
authorPaul Gortmaker <paul.gortmaker@windriver.com>
Mon, 5 Dec 2011 16:41:07 +0000 (11:41 -0500)
committerKumar Gala <galak@kernel.crashing.org>
Wed, 4 Jan 2012 21:27:59 +0000 (15:27 -0600)
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>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
arch/powerpc/platforms/83xx/sbc834x.c

index 1c3dfc8556f07ee66a04037b16f6b8f9b5f3fc21..8a81d7640b1fbdc0963e9e1cba3f45fe0bd256f5 100644 (file)
@@ -63,11 +63,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               = mpc83xx_ipic_init_IRQ,