aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Gortmaker <paul.gortmaker@windriver.com>2008-04-16 13:53:07 -0400
committerKumar Gala <galak@kernel.crashing.org>2008-04-17 09:51:59 -0500
commit16787b430dde9431445fd0874409adbb26558a2e (patch)
tree0178de890f8ef5127880c1c7796f95e1e33fa6ac
parent06f35b4ba658ec9a447a5406a574258aaab1ba8d (diff)
downloadkernel_samsung_smdk4412-16787b430dde9431445fd0874409adbb26558a2e.zip
kernel_samsung_smdk4412-16787b430dde9431445fd0874409adbb26558a2e.tar.gz
kernel_samsung_smdk4412-16787b430dde9431445fd0874409adbb26558a2e.tar.bz2
[POWERPC] 86xx: mpc86xx_hpcn - Temporarily accept old dts node identifier.
As suggested by Timur Tabi, we match on the old compat node ID for one version and warn accordingly. If we don't do this, we plunge people who try to use an old DTB into silent boot death with no clear indication of what the problem is. This patch should be removed at the beginning of the 2.6.27 dev cycle. It is only meant to ease the transition in the short term. Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
-rw-r--r--arch/powerpc/platforms/86xx/mpc86xx_hpcn.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c b/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
index 0764032..f947f55 100644
--- a/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
+++ b/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
@@ -193,6 +193,12 @@ static int __init mpc86xx_hpcn_probe(void)
if (of_flat_dt_is_compatible(root, "fsl,mpc8641hpcn"))
return 1; /* Looks good */
+ /* Be nice and don't give silent boot death. Delete this in 2.6.27 */
+ if (of_flat_dt_is_compatible(root, "mpc86xx")) {
+ pr_warning("WARNING: your dts/dtb is old. You must update before the next kernel release\n");
+ return 1;
+ }
+
return 0;
}