From 439cee90984ed9b5b614af2707aa0017528890d0 Mon Sep 17 00:00:00 2001 From: Aaron Durbin Date: Mon, 22 Jan 2018 21:24:35 -0700 Subject: device/i2c_bus: allow i2c_bus and i2c_simple to coexist If one wants to implement both i2c_bus.h and i2c_simple.h APIs the compilation unit needs to be guarded or coordinated carefully with different compilation units. Instead, name the i2c_bus functions with _dev such that it indicates that they operate on struct device. One other change to allow i2c_bus.h to be built in non-ramstage environments is to ensure DEVTREE_CONST is used for the dev field in struct bus. BUG=b:72121803 Change-Id: I267e27e62c95013e8ff8b0728dbe9e7b523de453 Signed-off-by: Aaron Durbin Reviewed-on: https://review.coreboot.org/23370 Tested-by: build bot (Jenkins) Reviewed-by: Martin Roth Reviewed-by: Furquan Shaikh --- src/include/device/smbus.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/include/device/smbus.h') diff --git a/src/include/device/smbus.h b/src/include/device/smbus.h index 5e51b5d267..50857fe85f 100644 --- a/src/include/device/smbus.h +++ b/src/include/device/smbus.h @@ -32,22 +32,22 @@ int smbus_set_link(device_t dev); static inline int smbus_recv_byte(struct device *const dev) { - return i2c_readb(dev); + return i2c_dev_readb(dev); } static inline int smbus_send_byte(struct device *const dev, u8 byte) { - return i2c_writeb(dev, byte); + return i2c_dev_writeb(dev, byte); } static inline int smbus_read_byte(struct device *const dev, u8 addr) { - return i2c_readb_at(dev, addr); + return i2c_dev_readb_at(dev, addr); } static inline int smbus_write_byte(struct device *const dev, u8 addr, u8 val) { - return i2c_writeb_at(dev, addr, val); + return i2c_dev_writeb_at(dev, addr, val); } int smbus_block_read(device_t dev, u8 cmd, u8 bytes, u8 *buffer); -- cgit v1.2.3