diff options
| author | Dan Streetman <ddstreet@ieee.org> | 2015-03-12 01:08:21 -0400 |
|---|---|---|
| committer | Stewart Smith <stewart@linux.vnet.ibm.com> | 2015-03-17 15:24:11 +1100 |
| commit | 1881aeb597abd4c154c76d69dd0f0ede93cc7eb5 (patch) | |
| tree | 49da4021547560f3df132da5183ca3f3678ee8ef /hw | |
| parent | 1f682b8b085b7dcc8457e52c06160c86455c2d47 (diff) | |
| download | skiboot-1881aeb597abd4c154c76d69dd0f0ede93cc7eb5.zip skiboot-1881aeb597abd4c154c76d69dd0f0ede93cc7eb5.tar.gz skiboot-1881aeb597abd4c154c76d69dd0f0ede93cc7eb5.tar.bz2 | |
move nx-842 ct and ci nodes into main nx node
We don't actually need to use a separate node for the nx-842
details, so move its information nodes (for CT and CI) under
each main nx node for each coprocessor.
Part of the reason for this is the kernel driver will need to
read/write xscom registers, for coprocessor monitoring and
error recovery, and locating the CT and CI nodes under the
main nx node allows the nx-842 driver to easily get more
information about the coprocessor, like its base xscom
address, and the processor version (p7, p8, etc).
Signed-off-by: Dan Streetman <ddstreet@ieee.org>
Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/nx-842.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/hw/nx-842.c b/hw/nx-842.c index b2ae425..244c4bd 100644 --- a/hw/nx-842.c +++ b/hw/nx-842.c @@ -164,9 +164,7 @@ void nx_create_842_node(struct dt_node *node) u32 pb_base; u64 cfg_dma, cfg_842, cfg_ee; u64 instance; - struct dt_node *dt_842; int rc; - char node_name[32]; gcid = dt_get_chip_id(node); pb_base = dt_get_address(node, 0, NULL); @@ -200,13 +198,6 @@ void nx_create_842_node(struct dt_node *node) prlog(PR_INFO, "NX%d: 842 Coprocessor Enabled\n", gcid); - snprintf(node_name, sizeof(node_name), "ibm,nx842-powernv#%d", gcid); - dt_842 = dt_new(dt_root, node_name); - if (!dt_842) - return; - - dt_add_property_strings(dt_842, "compatible", "ibm,nx842-powernv"); - dt_add_property_cells(dt_842, "ibm,chip-id", gcid); - dt_add_property_cells(dt_842, "ibm,coprocessor-type", NX_CT_842); - dt_add_property_cells(dt_842, "ibm,coprocessor-instance", instance); + dt_add_property_cells(node, "ibm,842-coprocessor-type", NX_CT_842); + dt_add_property_cells(node, "ibm,842-coprocessor-instance", instance); } |