diff options
| author | Chris Ching <chingcodes@chromium.org> | 2017-12-06 14:26:15 -0700 |
|---|---|---|
| committer | Chris Ching <chingcodes@chromium.org> | 2017-12-22 16:39:42 +0000 |
| commit | b8dc63bdfe04fc15553f1ea6e42583cbdaad38ac (patch) | |
| tree | 6c25cdb3bb62df3cb80b01f111467b98800d18d0 /src/soc/intel/skylake | |
| parent | 17e85adc91d905919f8c4a512125ebd457ce99db (diff) | |
ic2/designware: Move Intel i2c logic to shared driver
BUG=b:70232394
BRANCH=none
TEST=emerge-reef coreboot
emerge-glados
Change-Id: Idb453a4d2411163e6b4a8422310bf272eac5d379
Signed-off-by: Chris Ching <chingcodes@chromium.org>
Reviewed-on: https://review.coreboot.org/22822
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Diffstat (limited to 'src/soc/intel/skylake')
| -rw-r--r-- | src/soc/intel/skylake/Kconfig | 4 | ||||
| -rw-r--r-- | src/soc/intel/skylake/bootblock/bootblock.c | 2 | ||||
| -rw-r--r-- | src/soc/intel/skylake/chip.h | 4 | ||||
| -rw-r--r-- | src/soc/intel/skylake/i2c.c | 4 |
4 files changed, 9 insertions, 5 deletions
diff --git a/src/soc/intel/skylake/Kconfig b/src/soc/intel/skylake/Kconfig index 97ba7af7f2..7bb16d20d8 100644 --- a/src/soc/intel/skylake/Kconfig +++ b/src/soc/intel/skylake/Kconfig @@ -334,6 +334,10 @@ config SOC_INTEL_COMMON_LPSS_CLOCK_MHZ int default 120 +config DRIVERS_I2C_DESIGNWARE_CLOCK_MHZ + int + default SOC_INTEL_COMMON_LPSS_CLOCK_MHZ + config SOC_INTEL_COMMON_BLOCK_GSPI_MAX int default 2 diff --git a/src/soc/intel/skylake/bootblock/bootblock.c b/src/soc/intel/skylake/bootblock/bootblock.c index 058cec855b..57b01962a3 100644 --- a/src/soc/intel/skylake/bootblock/bootblock.c +++ b/src/soc/intel/skylake/bootblock/bootblock.c @@ -14,8 +14,8 @@ */ #include <bootblock_common.h> +#include <drivers/i2c/designware/dw_i2c.h> #include <intelblocks/gspi.h> -#include <intelblocks/lpss_i2c.h> #include <soc/bootblock.h> asmlinkage void bootblock_c_entry(uint64_t base_timestamp) diff --git a/src/soc/intel/skylake/chip.h b/src/soc/intel/skylake/chip.h index 8540e210aa..813974909a 100644 --- a/src/soc/intel/skylake/chip.h +++ b/src/soc/intel/skylake/chip.h @@ -21,8 +21,8 @@ #include <arch/acpi_device.h> #include <device/i2c_simple.h> +#include <drivers/i2c/designware/dw_i2c.h> #include <intelblocks/gspi.h> -#include <intelblocks/lpss_i2c.h> #include <stdint.h> #include <soc/gpe.h> #include <soc/gpio.h> @@ -251,7 +251,7 @@ struct soc_intel_skylake_config { /* I2C */ /* Bus voltage level, default is 3.3V */ enum skylake_i2c_voltage i2c_voltage[SKYLAKE_I2C_DEV_MAX]; - struct lpss_i2c_bus_config i2c[SKYLAKE_I2C_DEV_MAX]; + struct dw_i2c_bus_config i2c[SKYLAKE_I2C_DEV_MAX]; /* GSPI */ struct gspi_cfg gspi[CONFIG_SOC_INTEL_COMMON_BLOCK_GSPI_MAX]; diff --git a/src/soc/intel/skylake/i2c.c b/src/soc/intel/skylake/i2c.c index 55e23e0906..6b457ce62c 100644 --- a/src/soc/intel/skylake/i2c.c +++ b/src/soc/intel/skylake/i2c.c @@ -15,12 +15,12 @@ #include <console/console.h> #include <device/device.h> -#include <intelblocks/lpss_i2c.h> +#include <drivers/i2c/designware/dw_i2c.h> #include <soc/iomap.h> #include <soc/pci_devs.h> #include "chip.h" -const struct lpss_i2c_bus_config *i2c_get_soc_cfg(unsigned int bus, +const struct dw_i2c_bus_config *i2c_get_soc_cfg(unsigned int bus, const struct device *dev) { const struct soc_intel_skylake_config *config; |