瀏覽代碼

[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>
Paul Gortmaker 17 年之前
父節點
當前提交
16787b430d
共有 1 個文件被更改,包括 6 次插入0 次删除
  1. 6 0
      arch/powerpc/platforms/86xx/mpc86xx_hpcn.c

+ 6 - 0
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"))
 	if (of_flat_dt_is_compatible(root, "fsl,mpc8641hpcn"))
 		return 1;	/* Looks good */
 		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;
 	return 0;
 }
 }