| Submitter | Benjamin Herrenschmidt |
|---|---|
| Date | Aug. 29, 2013, 6:56 a.m. |
| Message ID | <1377759419.4028.26.camel@pasglop> |
| Download | mbox | patch |
| Permalink | /patch/270694/ |
| State | Accepted |
| Commit | 762fd3ab6d2c4b438ce49f54860dc509e591209c |
| Delegated to: | Benjamin Herrenschmidt |
| Headers | show |
Comments
Patch
diff --git a/arch/powerpc/sysdev/scom.c b/arch/powerpc/sysdev/scom.c index 413622d..cb20d54 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; }
When creating the debugfs scom files, use "ibm,chip-id" as the scom%d index rather than a simple made up number when possible. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> --- arch/powerpc/sysdev/scom.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)