diff options
| author | Subrata Banik <subrata.banik@intel.com> | 2018-05-07 16:27:51 +0530 |
|---|---|---|
| committer | Subrata Banik <subrata.banik@intel.com> | 2018-06-06 06:26:11 +0000 |
| commit | e62836b7d61f053cfcdab32ccb49d8eb01f220dd (patch) | |
| tree | c267955eafbda27ce8d203f44cf402f261bd5f9b /src/soc/intel/apollolake | |
| parent | 9ab6d92e96434d6d4975e0d11aae736feef0dfc1 (diff) | |
soc/intel/common/block: Move i2c common functions into block/i2c
This patch cleans soc/intel/{apollolake/cannonlake/skylake} by moving
common soc code into common/block/i2c.
BUG=b:78109109
BRANCH=none
TEST=Build and boot KBL/CNL/APL platform.
Change-Id: I88f2f836eee4f80b79486dd8644d1bb3826c5af1
Signed-off-by: Maulik V Vaghela <maulik.v.vaghela@intel.com>
Signed-off-by: Subrata Banik <subrata.banik@intel.com>
Reviewed-on: https://review.coreboot.org/26056
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Furquan Shaikh <furquan@google.com>
Diffstat (limited to 'src/soc/intel/apollolake')
| -rw-r--r-- | src/soc/intel/apollolake/i2c.c | 18 | ||||
| -rw-r--r-- | src/soc/intel/apollolake/include/soc/iomap.h | 3 |
2 files changed, 3 insertions, 18 deletions
diff --git a/src/soc/intel/apollolake/i2c.c b/src/soc/intel/apollolake/i2c.c index bb14df2a0e..bf378bce34 100644 --- a/src/soc/intel/apollolake/i2c.c +++ b/src/soc/intel/apollolake/i2c.c @@ -2,6 +2,7 @@ * This file is part of the coreboot project. * * Copyright 2016 Google Inc. + * Copyright (C) 2018 Intel Corporation. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -13,27 +14,10 @@ * GNU General Public License for more details. */ -#include <console/console.h> #include <device/device.h> #include <device/pci_def.h> #include <drivers/i2c/designware/dw_i2c.h> -#include <intelblocks/chip.h> -#include <soc/iomap.h> #include <soc/pci_devs.h> -#include "chip.h" - -const struct dw_i2c_bus_config *dw_i2c_get_soc_cfg(unsigned int bus) -{ - const struct soc_intel_common_config *common_config; - common_config = chip_get_common_soc_structure(); - - return &common_config->i2c[bus]; -} - -uintptr_t dw_i2c_get_soc_early_base(unsigned int bus) -{ - return PRERAM_I2C_BASE_ADDRESS(bus); -} /* Convert I2C bus number to PCI device and function */ int dw_i2c_soc_bus_to_devfn(unsigned int bus) diff --git a/src/soc/intel/apollolake/include/soc/iomap.h b/src/soc/intel/apollolake/include/soc/iomap.h index 7e6a795c58..9a2500cd45 100644 --- a/src/soc/intel/apollolake/include/soc/iomap.h +++ b/src/soc/intel/apollolake/include/soc/iomap.h @@ -51,6 +51,7 @@ #define EARLY_GSPI_BASE_ADDRESS 0xfe011000 /* Temporary BAR for early I2C bus access */ -#define PRERAM_I2C_BASE_ADDRESS(x) (0xfe020000 + (0x1000 * (x))) +#define EARLY_I2C_BASE_ADDRESS 0xfe020000 +#define EARLY_I2C_BASE(x) (EARLY_I2C_BASE_ADDRESS + (0x1000 * (x))) #endif /* _SOC_APOLLOLAKE_IOMAP_H_ */ |