diff options
| author | Rizwan Qureshi <rizwan.qureshi@intel.com> | 2017-04-26 21:06:35 +0530 |
|---|---|---|
| committer | Martin Roth <martinroth@google.com> | 2017-05-18 06:07:15 +0200 |
| commit | ae6a4b6d3ca60fc697103cbdaaf5df84502f554e (patch) | |
| tree | 60053ac5506eb928c49bdd958f2648972a6c52ac /src/soc/intel/apollolake/include | |
| parent | 36b09b8a6c3367dded5c3f0c6a1dc1d16d9a1335 (diff) | |
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 <rizwan.qureshi@intel.com>
Reviewed-on: https://review.coreboot.org/19468
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Diffstat (limited to 'src/soc/intel/apollolake/include')
| -rw-r--r-- | src/soc/intel/apollolake/include/soc/i2c.h | 45 |
1 files changed, 0 insertions, 45 deletions
diff --git a/src/soc/intel/apollolake/include/soc/i2c.h b/src/soc/intel/apollolake/include/soc/i2c.h deleted file mode 100644 index 8839f1460a..0000000000 --- a/src/soc/intel/apollolake/include/soc/i2c.h +++ /dev/null @@ -1,45 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright 2016 Google Inc. - * - * 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 - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -#ifndef _SOC_APOLLOLAKE_I2C_H_ -#define _SOC_APOLLOLAKE_I2C_H_ - -#include <device/pci_def.h> -#include <soc/pci_devs.h> - -/* Convert I2C bus number to PCI device and function */ -static inline int i2c_bus_to_devfn(unsigned int bus) -{ - if (bus >= 0 && bus <= 3) - return PCI_DEVFN(PCH_DEV_SLOT_SIO1, bus); - else if (bus >= 4 && bus <= 7) - return PCI_DEVFN(PCH_DEV_SLOT_SIO2, (bus - 4)); - else - return -1; -} - -/* Convert PCI device and function to I2C bus number */ -static inline int i2c_devfn_to_bus(unsigned int devfn) -{ - if (PCI_SLOT(devfn) == PCH_DEV_SLOT_SIO1) - return PCI_FUNC(devfn); - else if (PCI_SLOT(devfn) == PCH_DEV_SLOT_SIO2) - return PCI_FUNC(devfn) + 4; - else - return -1; -} - -#endif /* _SOC_APOLLOLAKE_I2C_H_ */ |