aboutsummaryrefslogtreecommitdiff
path: root/platforms
diff options
context:
space:
mode:
authorFrederic Barrat <fbarrat@linux.ibm.com>2020-01-22 16:03:35 +0100
committerOliver O'Halloran <oohall@gmail.com>2020-01-29 13:51:35 +1100
commitbbb4777f682dab0f1411a493861af9e340e81229 (patch)
tree0a12906250c7baed218a7a2467b0f8e35c3323e4 /platforms
parent57d43efd6bbb052b467df3a19ca84feccdd0649b (diff)
downloadskiboot-bbb4777f682dab0f1411a493861af9e340e81229.zip
skiboot-bbb4777f682dab0f1411a493861af9e340e81229.tar.gz
skiboot-bbb4777f682dab0f1411a493861af9e340e81229.tar.bz2
npu2, npu3: Remove ibm, phb-index property from the NPU dt node
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>
Diffstat (limited to 'platforms')
-rw-r--r--platforms/astbmc/mihawk.c2
-rw-r--r--platforms/astbmc/zaius.c2
-rw-r--r--platforms/ibm-fsp/zz.c2
3 files changed, 0 insertions, 6 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);
diff --git a/platforms/ibm-fsp/zz.c b/platforms/ibm-fsp/zz.c
index 2bde315..92f4fcb 100644
--- a/platforms/ibm-fsp/zz.c
+++ b/platforms/ibm-fsp/zz.c
@@ -65,7 +65,6 @@ static void add_opencapi_dt_nodes(void)
{
struct dt_node *npu, *xscom;
int npu_index = 0;
- int phb_index = 7;
/*
* In an ideal world, we should get all the NPU links
@@ -115,7 +114,6 @@ static void add_opencapi_dt_nodes(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);