From f555a58abc487270d4ba42527b1b43850bd718c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= <kyosti.malkki@gmail.com>
Date: Mon, 6 Jan 2020 19:41:42 +0200
Subject: sb/intel/common: Declare common smbus_base() and enable_smbus()
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This avoids including platform-specific headers with different
filenames from common code.

Change-Id: Idf9893e55949d63f3ceca2249e618d0f81320321
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/38232
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
---
 src/southbridge/intel/lynxpoint/early_pch.c   |  1 +
 src/southbridge/intel/lynxpoint/early_smbus.c | 21 ++++++++++-----------
 src/southbridge/intel/lynxpoint/pch.h         |  1 -
 3 files changed, 11 insertions(+), 12 deletions(-)

(limited to 'src/southbridge/intel/lynxpoint')

diff --git a/src/southbridge/intel/lynxpoint/early_pch.c b/src/southbridge/intel/lynxpoint/early_pch.c
index 25ffdc495d..e0e4613d0b 100644
--- a/src/southbridge/intel/lynxpoint/early_pch.c
+++ b/src/southbridge/intel/lynxpoint/early_pch.c
@@ -19,6 +19,7 @@
 #include <device/pci_ops.h>
 #include <device/device.h>
 #include <device/pci_def.h>
+#include <device/smbus_host.h>
 #include <southbridge/intel/common/pmclib.h>
 #include <elog.h>
 #include "pch.h"
diff --git a/src/southbridge/intel/lynxpoint/early_smbus.c b/src/southbridge/intel/lynxpoint/early_smbus.c
index 5ecce284d6..91f1bc3448 100644
--- a/src/southbridge/intel/lynxpoint/early_smbus.c
+++ b/src/southbridge/intel/lynxpoint/early_smbus.c
@@ -15,26 +15,27 @@
  */
 
 #include <device/pci_ops.h>
-#include <console/console.h>
 #include <device/pci_def.h>
 #include <device/smbus_host.h>
 #include "pch.h"
 
-void enable_smbus(void)
+uintptr_t smbus_base(void)
 {
-	pci_devfn_t dev;
+	return SMBUS_IO_BASE;
+}
 
+int smbus_enable_iobar(uintptr_t base)
+{
 	/* Set the SMBus device statically. */
-	dev = PCI_DEV(0x0, 0x1f, 0x3);
+	pci_devfn_t dev = PCI_DEV(0x0, 0x1f, 0x3);
 
 	/* Check to make sure we've got the right device. */
-	if (pci_read_config16(dev, 0x0) != 0x8086) {
-		die("SMBus controller not found!");
-	}
+	if (pci_read_config16(dev, 0x0) != 0x8086)
+		return -1;
 
 	/* Set SMBus I/O base. */
 	pci_write_config32(dev, SMB_BASE,
-			   SMBUS_IO_BASE | PCI_BASE_ADDRESS_SPACE_IO);
+			   base | PCI_BASE_ADDRESS_SPACE_IO);
 
 	/* Set SMBus enable. */
 	pci_write_config8(dev, HOSTC, HST_EN);
@@ -42,9 +43,7 @@ void enable_smbus(void)
 	/* Set SMBus I/O space enable. */
 	pci_write_config16(dev, PCI_COMMAND, PCI_COMMAND_IO);
 
-	smbus_host_reset(SMBUS_IO_BASE);
-
-	printk(BIOS_DEBUG, "SMBus controller enabled.\n");
+	return 0;
 }
 
 int smbus_read_byte(unsigned int device, unsigned int address)
diff --git a/src/southbridge/intel/lynxpoint/pch.h b/src/southbridge/intel/lynxpoint/pch.h
index 71f42ea723..9622c67255 100644
--- a/src/southbridge/intel/lynxpoint/pch.h
+++ b/src/southbridge/intel/lynxpoint/pch.h
@@ -174,7 +174,6 @@ void pch_log_state(void);
 void acpi_create_intel_hpet(acpi_hpet_t * hpet);
 void acpi_create_serialio_ssdt(acpi_header_t *ssdt);
 
-void enable_smbus(void);
 
 #if ENV_ROMSTAGE
 int smbus_read_byte(unsigned int device, unsigned int address);
-- 
cgit v1.2.3