summaryrefslogtreecommitdiffstats
path: root/arch/powerpc
diff options
context:
space:
mode:
authorPaul Gortmaker <paul.gortmaker@windriver.com>2011-12-05 17:41:07 +0100
committerKumar Gala <galak@kernel.crashing.org>2012-01-04 22:27:59 +0100
commitdabc78403fc2ad96e6fc8b53c6c6abcc02e152ee (patch)
treeeb356aa380aab4de38cf58aaf2bc1dc4b51a81ca /arch/powerpc
parentpowerpc/fsl-pci: Allow 64-bit PCIe devices to DMA to any memory address (diff)
downloadlinux-dabc78403fc2ad96e6fc8b53c6c6abcc02e152ee.tar.xz
linux-dabc78403fc2ad96e6fc8b53c6c6abcc02e152ee.zip
sbc834x: put full compat string in board match check
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>
Diffstat (limited to 'arch/powerpc')
-rw-r--r--arch/powerpc/platforms/83xx/sbc834x.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/83xx/sbc834x.c b/arch/powerpc/platforms/83xx/sbc834x.c
index 1c3dfc8556f0..8a81d7640b1f 100644
--- a/arch/powerpc/platforms/83xx/sbc834x.c
+++ b/arch/powerpc/platforms/83xx/sbc834x.c
@@ -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,