aboutsummaryrefslogtreecommitdiff
path: root/platforms/astbmc
diff options
context:
space:
mode:
authorFrederic Barrat <fbarrat@linux.ibm.com>2020-01-22 16:03:35 +0100
committerVasant Hegde <hegdevasant@linux.vnet.ibm.com>2020-03-11 11:03:04 +0530
commit4a166db990dba98d4c41ef242ae863f6f20e3ea6 (patch)
tree0041c8ceb6e26d75d5ed8c4f8f40acba3e0deee2 /platforms/astbmc
parent766af5e64932cc0e947fb970dcb4416accf2bf21 (diff)
downloadskiboot-4a166db990dba98d4c41ef242ae863f6f20e3ea6.zip
skiboot-4a166db990dba98d4c41ef242ae863f6f20e3ea6.tar.gz
skiboot-4a166db990dba98d4c41ef242ae863f6f20e3ea6.tar.bz2
npu2, npu3: Remove ibm, phb-index property from the NPU dt node
[ Upstream commit bbb4777f682dab0f1411a493861af9e340e81229 ] The 'ibm,phb-index' property of the NPU node is now useless, as we can have multiple PHBs associated to the same NPU on P9. Let's remove it to avoid confusion. Reviewed-by: Reza Arbab <arbab@linux.ibm.com> Reviewed-by: Andrew Donnellan <ajd@linux.ibm.com> Signed-off-by: Frederic Barrat <fbarrat@linux.ibm.com> Signed-off-by: Oliver O'Halloran <oohall@gmail.com> Signed-off-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
Diffstat (limited to 'platforms/astbmc')
-rw-r--r--platforms/astbmc/mihawk.c2
-rw-r--r--platforms/astbmc/zaius.c2
2 files changed, 0 insertions, 4 deletions
diff --git a/platforms/astbmc/mihawk.c b/platforms/astbmc/mihawk.c
index 0491887..6816acc 100644
--- a/platforms/astbmc/mihawk.c
+++ b/platforms/astbmc/mihawk.c
@@ -184,7 +184,6 @@ static void mihawk_create_npu(void)
{
struct dt_node *xscom, *npu;
int npu_index = 0;
- int phb_index = 7;
char namebuf[32];
/* Return if there's already an NPU in the device tree */
@@ -198,7 +197,6 @@ static void mihawk_create_npu(void)
dt_add_property_cells(npu, "reg", NPU_BASE, NPU_SIZE);
dt_add_property_strings(npu, "compatible", "ibm,power9-npu");
dt_add_property_cells(npu, "ibm,npu-index", npu_index++);
- dt_add_property_cells(npu, "ibm,phb-index", phb_index++);
dt_add_property_cells(npu, "ibm,npu-links", 2);
create_link(npu, 1, 2);
create_link(npu, 2, 3);
diff --git a/platforms/astbmc/zaius.c b/platforms/astbmc/zaius.c
index ab35588..36dee63 100644
--- a/platforms/astbmc/zaius.c
+++ b/platforms/astbmc/zaius.c
@@ -157,7 +157,6 @@ static void zaius_create_npu(void)
{
struct dt_node *xscom, *npu;
int npu_index = 0;
- int phb_index = 7;
char namebuf[32];
/* Abort if there's already an NPU in the device tree */
@@ -171,7 +170,6 @@ static void zaius_create_npu(void)
dt_add_property_cells(npu, "reg", NPU_BASE, NPU_SIZE);
dt_add_property_strings(npu, "compatible", "ibm,power9-npu");
dt_add_property_cells(npu, "ibm,npu-index", npu_index++);
- dt_add_property_cells(npu, "ibm,phb-index", phb_index++);
dt_add_property_cells(npu, "ibm,npu-links", 2);
create_link(npu, 1, 2);
create_link(npu, 2, 3);