[PATCH 42/61] 8xx: commproc.c: Use better OF names.
From: Scott Wood <hidden>
Date: 2007-07-18 01:36:01
Subsystem:
linux for powerpc (32-bit and 64-bit), the rest · Maintainers:
Madhavan Srinivasan, Linus Torvalds
Signed-off-by: Scott Wood <redacted> --- arch/powerpc/boot/dts/mpc866ads.dts | 3 +-- arch/powerpc/boot/dts/mpc885ads.dts | 3 +-- arch/powerpc/sysdev/commproc.c | 6 +++--- 3 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/arch/powerpc/boot/dts/mpc866ads.dts b/arch/powerpc/boot/dts/mpc866ads.dts
index b3dbfe8..1807086 100644
--- a/arch/powerpc/boot/dts/mpc866ads.dts
+++ b/arch/powerpc/boot/dts/mpc866ads.dts@@ -103,8 +103,7 @@ interrupt-parent = <&Mpc8xx_pic>; reg = <930 20>; built-in; - device_type = "cpm-pic"; - compatible = "CPM"; + compatible = "fsl,mpc866-cpm-pic", "fsl,cpm1-pic"; }; smc@a80 {
diff --git a/arch/powerpc/boot/dts/mpc885ads.dts b/arch/powerpc/boot/dts/mpc885ads.dts
index 8372469..48717ed 100644
--- a/arch/powerpc/boot/dts/mpc885ads.dts
+++ b/arch/powerpc/boot/dts/mpc885ads.dts@@ -134,8 +134,7 @@ interrupt-parent = <&Mpc8xx_pic>; reg = <930 20>; built-in; - device_type = "cpm-pic"; - compatible = "CPM"; + compatible = "fsl,mpc885-cpm-pic", "fsl,cpm1-pic"; }; smc@a80 {
diff --git a/arch/powerpc/sysdev/commproc.c b/arch/powerpc/sysdev/commproc.c
index f73e96d..b0a58fd 100644
--- a/arch/powerpc/sysdev/commproc.c
+++ b/arch/powerpc/sysdev/commproc.c@@ -141,9 +141,9 @@ unsigned int cpm_pic_init(void) pr_debug("cpm_pic_init\n"); - np = of_find_compatible_node(NULL, "cpm-pic", "CPM"); + np = of_find_compatible_node(NULL, NULL, "fsl,cpm1-pic"); if (np == NULL) { - printk(KERN_ERR "CPM PIC init: can not find cpm-pic node\n"); + printk(KERN_ERR "CPM PIC init: can not find fsl,cpm1-pic node\n"); return sirq; } ret = of_address_to_resource(np, 0, &res);
@@ -177,7 +177,7 @@ unsigned int cpm_pic_init(void) of_node_put(np); /* Install our own error handler. */ - np = of_find_node_by_type(NULL, "cpm"); + np = of_find_compatible_node(NULL, NULL, "fsl,cpm1"); if (np == NULL) { printk(KERN_ERR "CPM PIC init: can not find cpm node\n"); goto end;
--
1.5.0.3