diff options
author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2008-04-16 13:53:07 -0400 |
---|---|---|
committer | Kumar Gala <galak@kernel.crashing.org> | 2008-04-17 10:51:59 -0400 |
commit | 16787b430dde9431445fd0874409adbb26558a2e (patch) | |
tree | 0178de890f8ef5127880c1c7796f95e1e33fa6ac | |
parent | 06f35b4ba658ec9a447a5406a574258aaab1ba8d (diff) |
[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.c | 6 |
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 0764032e85aa..f947f555fd46 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) | |||
193 | if (of_flat_dt_is_compatible(root, "fsl,mpc8641hpcn")) | 193 | if (of_flat_dt_is_compatible(root, "fsl,mpc8641hpcn")) |
194 | return 1; /* Looks good */ | 194 | return 1; /* Looks good */ |
195 | 195 | ||
196 | /* Be nice and don't give silent boot death. Delete this in 2.6.27 */ | ||
197 | if (of_flat_dt_is_compatible(root, "mpc86xx")) { | ||
198 | pr_warning("WARNING: your dts/dtb is old. You must update before the next kernel release\n"); | ||
199 | return 1; | ||
200 | } | ||
201 | |||
196 | return 0; | 202 | return 0; |
197 | } | 203 | } |
198 | 204 | ||