1 files changed, 12 insertions, 102 deletions

diff --git a/src/soc/amd/stoneyridge/i2c.c b/src/soc/amd/stoneyridge/i2c.c
index 7b0bc77e59..a098775537 100644
--- a/src/soc/amd/stoneyridge/i2c.c
+++ b/src/soc/amd/stoneyridge/i2c.c
@@ -1,118 +1,28 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-#include <device/mmio.h>
-#include <acpi/acpi.h>
-#include <console/console.h>
-#include <delay.h>
-#include <device/device.h>
-#include <drivers/i2c/designware/dw_i2c.h>
 #include <amdblocks/acpimmio.h>
 #include <amdblocks/i2c.h>
 #include <soc/iomap.h>
-#include <soc/pci_devs.h>
-#include <soc/southbridge.h>
 #include <soc/i2c.h>
 #include "chip.h"
 
-#define I2C_BUS_ADDRESS(x) (I2C_BASE_ADDRESS + I2C_DEVICE_SIZE * (x))
-#define I2CA_BASE_ADDRESS (I2C_BUS_ADDRESS(0))
-#define I2CB_BASE_ADDRESS (I2C_BUS_ADDRESS(1))
-#define I2CC_BASE_ADDRESS (I2C_BUS_ADDRESS(2))
-#define I2CD_BASE_ADDRESS (I2C_BUS_ADDRESS(3))
-
-/* Global to provide access to chip.c */
-const char *i2c_acpi_name(const struct device *dev);
-
-static const uintptr_t i2c_bus_address[] = {
-	I2CA_BASE_ADDRESS,
-	I2CB_BASE_ADDRESS,
-	I2CC_BASE_ADDRESS,
-	I2CD_BASE_ADDRESS,
+static const struct soc_i2c_ctrlr_info i2c_ctrlr[] = {
+	{ I2C_MASTER_MODE, I2CA_BASE_ADDRESS, "I2CA" },
+	{ I2C_MASTER_MODE, I2CB_BASE_ADDRESS, "I2CB" },
+	{ I2C_MASTER_MODE, I2CC_BASE_ADDRESS, "I2CC" },
+	{ I2C_MASTER_MODE, I2CD_BASE_ADDRESS, "I2CD" },
 };
 
-uintptr_t dw_i2c_base_address(unsigned int bus)
+const struct soc_i2c_ctrlr_info *soc_get_i2c_ctrlr_info(size_t *num_ctrlrs)
 {
-	return bus < I2C_DEVICE_COUNT ? i2c_bus_address[bus] : 0;
+	*num_ctrlrs = ARRAY_SIZE(i2c_ctrlr);
+	return i2c_ctrlr;
 }
 
-const struct dw_i2c_bus_config *dw_i2c_get_soc_cfg(unsigned int bus)
+const struct dw_i2c_bus_config *soc_get_i2c_bus_config(size_t *num_buses)
 {
-	const struct soc_amd_stoneyridge_config *config;
-
-	if (bus >= ARRAY_SIZE(i2c_bus_address))
-		return NULL;
-
-	/* config is not NULL; if it was, config_of_soc calls die() internally */
-	config = config_of_soc();
+	const struct soc_amd_stoneyridge_config *config = config_of_soc();
 
-	return &config->i2c[bus];
-}
-
-const char *i2c_acpi_name(const struct device *dev)
-{
-	switch (dev->path.mmio.addr) {
-	case I2CA_BASE_ADDRESS:
-		return "I2CA";
-	case I2CB_BASE_ADDRESS:
-		return "I2CB";
-	case I2CC_BASE_ADDRESS:
-		return "I2CC";
-	case I2CD_BASE_ADDRESS:
-		return "I2CD";
-	default:
-		return NULL;
-	}
+	*num_buses = ARRAY_SIZE(config->i2c);
+	return config->i2c;
 }
-
-int dw_i2c_soc_dev_to_bus(const struct device *dev)
-{
-	switch (dev->path.mmio.addr) {
-	case I2CA_BASE_ADDRESS:
-		return 0;
-	case I2CB_BASE_ADDRESS:
-		return 1;
-	case I2CC_BASE_ADDRESS:
-		return 2;
-	case I2CD_BASE_ADDRESS:
-		return 3;
-	}
-	return -1;
-}
-
-static void dw_i2c_soc_init(bool is_early_init)
-{
-	size_t i;
-	const struct soc_amd_stoneyridge_config *config;
-
-	/* config is not NULL; if it was, config_of_soc calls die() internally */
-	config = config_of_soc();
-
-	for (i = 0; i < ARRAY_SIZE(config->i2c); i++) {
-		const struct dw_i2c_bus_config *cfg  = &config->i2c[i];
-
-		if (cfg->early_init != is_early_init)
-			continue;
-
-		if (dw_i2c_init(i, cfg))
-			printk(BIOS_ERR, "Failed to init i2c bus %zd\n", i);
-	}
-}
-
-void i2c_soc_early_init(void)
-{
-	dw_i2c_soc_init(true);
-}
-
-void i2c_soc_init(void)
-{
-	dw_i2c_soc_init(false);
-}
-
-struct device_operations stoneyridge_i2c_mmio_ops = {
-	/* TODO(teravest): Move I2C resource info here. */
-	.read_resources = noop_read_resources,
-	.set_resources = noop_set_resources,
-	.scan_bus = scan_smbus,
-	.acpi_name = i2c_acpi_name,
-	.acpi_fill_ssdt = dw_i2c_acpi_fill_ssdt,
-};