aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorOliver O'Halloran <oohall@gmail.com>2020-04-02 22:13:54 +1100
committerOliver O'Halloran <oohall@gmail.com>2020-04-08 14:38:33 +1000
commit9b612fff557f67f001b4772c180a50a9cb92e6bb (patch)
tree096c013c91df2cda3cd0a10db8f142fb3b63a3f2 /include
parent7b57002d3f5fd45caeb53240bf401803c528b865 (diff)
downloadskiboot-9b612fff557f67f001b4772c180a50a9cb92e6bb.zip
skiboot-9b612fff557f67f001b4772c180a50a9cb92e6bb.tar.gz
skiboot-9b612fff557f67f001b4772c180a50a9cb92e6bb.tar.bz2
hw/centaur: Convert to use the new scom API
Currently we assume any xscom_read / write targeted at a chipid with 0x8 as the top four bits is intended to be a centaur SCOM. On non-P8 platforms there is no reason to assume this so covert it to use the new struct scom_controller infrastructure. Signed-off-by: Oliver O'Halloran <oohall@gmail.com>
Diffstat (limited to 'include')
-rw-r--r--include/centaur.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/centaur.h b/include/centaur.h
index 9089705..9845946 100644
--- a/include/centaur.h
+++ b/include/centaur.h
@@ -22,6 +22,8 @@ struct centaur_chip {
uint32_t error_count;
struct lock lock;
+ struct scom_controller scom;
+
/* Used by hw/p8-i2c.c */
struct list_head i2cms;
};
@@ -29,8 +31,6 @@ struct centaur_chip {
extern int64_t centaur_disable_sensor_cache(uint32_t part_id);
extern int64_t centaur_enable_sensor_cache(uint32_t part_id);
-extern int64_t centaur_xscom_read(uint32_t id, uint64_t pcb_addr, uint64_t *val) __warn_unused_result;
-extern int64_t centaur_xscom_write(uint32_t id, uint64_t pcb_addr, uint64_t val) __warn_unused_result;
extern void centaur_init(void);
extern struct centaur_chip *get_centaur(uint32_t part_id);