aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2015-05-12 17:03:02 +1000
committerStewart Smith <stewart@linux.vnet.ibm.com>2015-05-13 14:01:35 +1000
commit8f527a0290068f1b2224fcfd7d88d91eab6ddd6f (patch)
treea5abaa38e1d959b27c829b91910ce8040616bd6e
parent64d7f65e191f9e2a8130cba1a698f4edb848a4b3 (diff)
downloadskiboot-8f527a0290068f1b2224fcfd7d88d91eab6ddd6f.zip
skiboot-8f527a0290068f1b2224fcfd7d88d91eab6ddd6f.tar.gz
skiboot-8f527a0290068f1b2224fcfd7d88d91eab6ddd6f.tar.bz2
Add a couple more missing Naples references
The i2c and SLW code are testing for P8 chips by chip type and missing Naples. Fix this. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>
-rw-r--r--hw/p8-i2c.c2
-rw-r--r--hw/slw.c3
2 files changed, 4 insertions, 1 deletions
diff --git a/hw/p8-i2c.c b/hw/p8-i2c.c
index 52b9489..f1bddc7 100644
--- a/hw/p8-i2c.c
+++ b/hw/p8-i2c.c
@@ -288,6 +288,8 @@ static bool p8_i2c_has_irqs(void)
return chip->ec_level >= 0x21;
case PROC_CHIP_P8_VENICE:
return chip->ec_level >= 0x20;
+ case PROC_CHIP_P8_NAPLES:
+ return true;
default:
return false;
}
diff --git a/hw/slw.c b/hw/slw.c
index ffa9de1..d4b648c 100644
--- a/hw/slw.c
+++ b/hw/slw.c
@@ -537,7 +537,8 @@ static void add_cpu_idle_state_properties(void)
chip = next_chip(NULL);
assert(chip);
if (chip->type == PROC_CHIP_P8_MURANO ||
- chip->type == PROC_CHIP_P8_VENICE) {
+ chip->type == PROC_CHIP_P8_VENICE ||
+ chip->type == PROC_CHIP_P8_NAPLES) {
const struct dt_property *p;
p = dt_find_property(dt_root, "ibm,enabled-idle-states");