Kyösti Mälkki submitted this change.

View Change

Approvals: build bot (Jenkins): Verified Angel Pons: Looks good to me, approved
soc/intel/common: Split some SMBUS support file

It is expected that smbuslib.c will be removed, leave the
parts we want to keep in smbus_early.c.

Change-Id: I21355fe95385d07c9f254fc80c90264a9539bb00
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/38049
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
---
M src/soc/intel/common/block/smbus/smbus_early.c
M src/soc/intel/common/block/smbus/smbuslib.c
2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/soc/intel/common/block/smbus/smbus_early.c b/src/soc/intel/common/block/smbus/smbus_early.c
index 76de352..9ecd7e0 100644
--- a/src/soc/intel/common/block/smbus/smbus_early.c
+++ b/src/soc/intel/common/block/smbus/smbus_early.c
@@ -14,7 +14,6 @@
*/

#include <device/pci_def.h>
-#include <device/early_smbus.h>
#include <intelblocks/smbus.h>
#include <reg_script.h>
#include <soc/pci_devs.h>
@@ -35,21 +34,6 @@
REG_SCRIPT_END,
};

-u16 smbus_read_word(u32 smbus_dev, u8 addr, u8 offset)
-{
- return smbus_read16(SMBUS_IO_BASE, addr, offset);
-}
-
-u8 smbus_read_byte(u32 smbus_dev, u8 addr, u8 offset)
-{
- return smbus_read8(SMBUS_IO_BASE, addr, offset);
-}
-
-u8 smbus_write_byte(u32 smbus_dev, u8 addr, u8 offset, u8 value)
-{
- return smbus_write8(SMBUS_IO_BASE, addr, offset, value);
-}
-
void smbus_common_init(void)
{
reg_script_run_on_dev(PCH_DEV_SMBUS, smbus_init_script);
diff --git a/src/soc/intel/common/block/smbus/smbuslib.c b/src/soc/intel/common/block/smbus/smbuslib.c
index 0d3901f..e2a0ed9 100644
--- a/src/soc/intel/common/block/smbus/smbuslib.c
+++ b/src/soc/intel/common/block/smbus/smbuslib.c
@@ -14,6 +14,7 @@
*/

#include <arch/io.h>
+#include <device/early_smbus.h>
#include <device/smbus_def.h>
#include <timer.h>
#include "smbuslib.h"
@@ -176,3 +177,18 @@

return data;
}
+
+u16 smbus_read_word(u32 smbus_dev, u8 addr, u8 offset)
+{
+ return smbus_read16(SMBUS_IO_BASE, addr, offset);
+}
+
+u8 smbus_read_byte(u32 smbus_dev, u8 addr, u8 offset)
+{
+ return smbus_read8(SMBUS_IO_BASE, addr, offset);
+}
+
+u8 smbus_write_byte(u32 smbus_dev, u8 addr, u8 offset, u8 value)
+{
+ return smbus_write8(SMBUS_IO_BASE, addr, offset, value);
+}

To view, visit change 38049. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I21355fe95385d07c9f254fc80c90264a9539bb00
Gerrit-Change-Number: 38049
Gerrit-PatchSet: 3
Gerrit-Owner: Kyösti Mälkki <kyosti.malkki@gmail.com>
Gerrit-Reviewer: Angel Pons <th3fanbus@gmail.com>
Gerrit-Reviewer: Kyösti Mälkki <kyosti.malkki@gmail.com>
Gerrit-Reviewer: Patrick Rudolph <siro@das-labor.org>
Gerrit-Reviewer: build bot (Jenkins) <no-reply@coreboot.org>
Gerrit-CC: Paul Menzel <paulepanter@users.sourceforge.net>
Gerrit-MessageType: merged