From ae6a4b6d3ca60fc697103cbdaaf5df84502f554e Mon Sep 17 00:00:00 2001 From: Rizwan Qureshi Date: Wed, 26 Apr 2017 21:06:35 +0530 Subject: intel/common/block/i2c: Add common block for I2C and use the same in SoCs In the intel/common/block * Move I2C common code from intel/common to intel/common/block. * Split the code into common, early init and post mem init stages and put it in lpss_i2c.c, i2c_early.c and i2c.c respectively. * Declare functions for getting platform specific i2c bus config and mapping bus to devfn and vice versa, that have to be implemented by SoC. In skylake/apollolake * Stop using code from soc/intel/common/lpss_i2c.c. * Remove early i2c initialization code from bootblock. * Refactor i2c.c file to implement SoC specific methods required by the I2C IP block. Change-Id: I4d91a04c22e181e3a995112cce6d5f0324130b81 Signed-off-by: Rizwan Qureshi Reviewed-on: https://review.coreboot.org/19468 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin --- src/soc/intel/skylake/include/soc/pci_devs.h | 28 ---------------------------- 1 file changed, 28 deletions(-) (limited to 'src/soc/intel/skylake/include') diff --git a/src/soc/intel/skylake/include/soc/pci_devs.h b/src/soc/intel/skylake/include/soc/pci_devs.h index 13114f1f95..f51691c80b 100644 --- a/src/soc/intel/skylake/include/soc/pci_devs.h +++ b/src/soc/intel/skylake/include/soc/pci_devs.h @@ -148,34 +148,6 @@ #define PCH_DEV_SPI _PCH_DEV(LPC, 5) #define PCH_DEV_GBE _PCH_DEV(LPC, 6) -/* Convert I2C bus number to PCI device and function */ -static inline int i2c_bus_to_devfn(unsigned int bus) -{ - switch (bus) { - case 0: return PCH_DEVFN_I2C0; - case 1: return PCH_DEVFN_I2C1; - case 2: return PCH_DEVFN_I2C2; - case 3: return PCH_DEVFN_I2C3; - case 4: return PCH_DEVFN_I2C4; - case 5: return PCH_DEVFN_I2C5; - } - return -1; -} - -/* Convert PCI device and function to I2C bus number */ -static inline int i2c_devfn_to_bus(unsigned int devfn) -{ - switch (devfn) { - case PCH_DEVFN_I2C0: return 0; - case PCH_DEVFN_I2C1: return 1; - case PCH_DEVFN_I2C2: return 2; - case PCH_DEVFN_I2C3: return 3; - case PCH_DEVFN_I2C4: return 4; - case PCH_DEVFN_I2C5: return 5; - } - return -1; -} - static inline int spi_devfn_to_bus(unsigned int devfn) { switch (devfn) { -- cgit v1.2.3