1 files changed, 7 insertions, 2 deletions

diff --git a/arch/powerpc/sysdev/scom.c b/arch/powerpc/sysdev/scom.c
index 413622d54395..cb20d542a5aa 100644
--- a/arch/powerpc/sysdev/scom.c
+++ b/arch/powerpc/sysdev/scom.c
@@ -196,8 +196,13 @@ static int scom_debug_init(void)
                 return -1;
 
         i = rc = 0;
-        for_each_node_with_property(dn, "scom-controller")
-                rc |= scom_debug_init_one(root, dn, i++);
+        for_each_node_with_property(dn, "scom-controller") {
+                int id = of_get_ibm_chip_id(dn);
+                if (id == -1)
+                        id = i;
+                rc |= scom_debug_init_one(root, dn, id);
+                i++;
+        }
 
         return rc;
 }