summaryrefslogtreecommitdiff
path: root/src/soc/intel/cannonlake
diff options
context:
space:
mode:
authorChris Ching <chingcodes@chromium.org>2017-12-06 14:26:15 -0700
committerChris Ching <chingcodes@chromium.org>2017-12-22 16:39:42 +0000
commitb8dc63bdfe04fc15553f1ea6e42583cbdaad38ac (patch)
tree6c25cdb3bb62df3cb80b01f111467b98800d18d0 /src/soc/intel/cannonlake
parent17e85adc91d905919f8c4a512125ebd457ce99db (diff)
downloadcoreboot-b8dc63bdfe04fc15553f1ea6e42583cbdaad38ac.tar.xz
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/cannonlake')
-rw-r--r--src/soc/intel/cannonlake/Kconfig4
-rw-r--r--src/soc/intel/cannonlake/chip.h4
-rw-r--r--src/soc/intel/cannonlake/i2c.c4
3 files changed, 8 insertions, 4 deletions
diff --git a/src/soc/intel/cannonlake/Kconfig b/src/soc/intel/cannonlake/Kconfig
index beb812b080..b628370297 100644
--- a/src/soc/intel/cannonlake/Kconfig
+++ b/src/soc/intel/cannonlake/Kconfig
@@ -135,6 +135,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 3
diff --git a/src/soc/intel/cannonlake/chip.h b/src/soc/intel/cannonlake/chip.h
index fd89339e63..e984b4de23 100644
--- a/src/soc/intel/cannonlake/chip.h
+++ b/src/soc/intel/cannonlake/chip.h
@@ -18,8 +18,8 @@
#ifndef _SOC_CHIP_H_
#define _SOC_CHIP_H_
+#include <drivers/i2c/designware/dw_i2c.h>
#include <intelblocks/gspi.h>
-#include <intelblocks/lpss_i2c.h>
#include <stdint.h>
#include <soc/pch.h>
#include <soc/gpio_defs.h>
@@ -255,7 +255,7 @@ struct soc_intel_cannonlake_config {
unsigned int sdcard_cd_gpio;
/* I2C bus configuration */
- struct lpss_i2c_bus_config i2c[CANNONLAKE_I2C_DEV_MAX];
+ struct dw_i2c_bus_config i2c[CANNONLAKE_I2C_DEV_MAX];
};
typedef struct soc_intel_cannonlake_config config_t;
diff --git a/src/soc/intel/cannonlake/i2c.c b/src/soc/intel/cannonlake/i2c.c
index b0c35238ee..03ced5f936 100644
--- a/src/soc/intel/cannonlake/i2c.c
+++ b/src/soc/intel/cannonlake/i2c.c
@@ -17,12 +17,12 @@
#include <console/console.h>
#include <device/device.h>
#include <device/pci_def.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_cannonlake_config *config;