diff options
Diffstat (limited to 'src/soc')
| -rw-r--r-- | src/soc/intel/apollolake/i2c.c | 8 | ||||
| -rw-r--r-- | src/soc/intel/cannonlake/i2c.c | 8 | ||||
| -rw-r--r-- | src/soc/intel/common/block/i2c/i2c.c | 8 | ||||
| -rw-r--r-- | src/soc/intel/common/block/i2c/i2c_early.c | 8 | ||||
| -rw-r--r-- | src/soc/intel/skylake/i2c.c | 8 |
5 files changed, 20 insertions, 20 deletions
diff --git a/src/soc/intel/apollolake/i2c.c b/src/soc/intel/apollolake/i2c.c index 5925f3d22c..bcaf740fe6 100644 --- a/src/soc/intel/apollolake/i2c.c +++ b/src/soc/intel/apollolake/i2c.c @@ -21,7 +21,7 @@ #include <soc/pci_devs.h> #include "chip.h" -const struct dw_i2c_bus_config *i2c_get_soc_cfg(unsigned int bus, +const struct dw_i2c_bus_config *dw_i2c_get_soc_cfg(unsigned int bus, const struct device *dev) { const struct soc_intel_apollolake_config *config; @@ -36,13 +36,13 @@ const struct dw_i2c_bus_config *i2c_get_soc_cfg(unsigned int bus, return &config->i2c[bus]; } -uintptr_t i2c_get_soc_early_base(unsigned int 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 i2c_soc_bus_to_devfn(unsigned int bus) +int dw_i2c_soc_bus_to_devfn(unsigned int bus) { if (bus <= 3) return PCI_DEVFN(PCH_DEV_SLOT_SIO1, bus); @@ -53,7 +53,7 @@ int i2c_soc_bus_to_devfn(unsigned int bus) } /* Convert PCI device and function to I2C bus number */ -int i2c_soc_devfn_to_bus(unsigned int devfn) +int dw_i2c_soc_devfn_to_bus(unsigned int devfn) { if (PCI_SLOT(devfn) == PCH_DEV_SLOT_SIO1) return PCI_FUNC(devfn); diff --git a/src/soc/intel/cannonlake/i2c.c b/src/soc/intel/cannonlake/i2c.c index 03ced5f936..f183253443 100644 --- a/src/soc/intel/cannonlake/i2c.c +++ b/src/soc/intel/cannonlake/i2c.c @@ -22,7 +22,7 @@ #include <soc/pci_devs.h> #include "chip.h" -const struct dw_i2c_bus_config *i2c_get_soc_cfg(unsigned int bus, +const struct dw_i2c_bus_config *dw_i2c_get_soc_cfg(unsigned int bus, const struct device *dev) { const struct soc_intel_cannonlake_config *config; @@ -37,12 +37,12 @@ const struct dw_i2c_bus_config *i2c_get_soc_cfg(unsigned int bus, return &config->i2c[bus]; } -uintptr_t i2c_get_soc_early_base(unsigned int bus) +uintptr_t dw_i2c_get_soc_early_base(unsigned int bus) { return EARLY_I2C_BASE(bus); } -int i2c_soc_devfn_to_bus(unsigned int devfn) +int dw_i2c_soc_devfn_to_bus(unsigned int devfn) { switch (devfn) { case PCH_DEVFN_I2C0: @@ -61,7 +61,7 @@ int i2c_soc_devfn_to_bus(unsigned int devfn) return -1; } -int i2c_soc_bus_to_devfn(unsigned int bus) +int dw_i2c_soc_bus_to_devfn(unsigned int bus) { switch (bus) { case 0: diff --git a/src/soc/intel/common/block/i2c/i2c.c b/src/soc/intel/common/block/i2c/i2c.c index f2154da3f6..4b2b4eb5a8 100644 --- a/src/soc/intel/common/block/i2c/i2c.c +++ b/src/soc/intel/common/block/i2c/i2c.c @@ -27,7 +27,7 @@ uintptr_t dw_i2c_base_address(unsigned int bus) struct resource *res; /* bus -> devfn */ - devfn = i2c_soc_bus_to_devfn(bus); + devfn = dw_i2c_soc_bus_to_devfn(bus); if (devfn < 0) return (uintptr_t)NULL; @@ -48,7 +48,7 @@ uintptr_t dw_i2c_base_address(unsigned int bus) static int lpss_i2c_dev_to_bus(struct device *dev) { pci_devfn_t devfn = dev->path.pci.devfn; - return i2c_soc_devfn_to_bus(devfn); + return dw_i2c_soc_devfn_to_bus(devfn); } /* @@ -98,7 +98,7 @@ static void lpss_i2c_dev_init(struct device *dev) if (bus < 0) return; - config = i2c_get_soc_cfg(bus, dev); + config = dw_i2c_get_soc_cfg(bus, dev); if (!config) return; @@ -132,7 +132,7 @@ static void lpss_i2c_acpi_fill_ssdt(struct device *dev) if (bus < 0) return; - bcfg = i2c_get_soc_cfg(bus, dev); + bcfg = dw_i2c_get_soc_cfg(bus, dev); if (!bcfg) return; diff --git a/src/soc/intel/common/block/i2c/i2c_early.c b/src/soc/intel/common/block/i2c/i2c_early.c index f10147ed95..728e7880b5 100644 --- a/src/soc/intel/common/block/i2c/i2c_early.c +++ b/src/soc/intel/common/block/i2c/i2c_early.c @@ -32,7 +32,7 @@ static int lpss_i2c_early_init_bus(unsigned int bus) uintptr_t base; /* Find the PCI device for this bus controller */ - devfn = i2c_soc_bus_to_devfn(bus); + devfn = dw_i2c_soc_bus_to_devfn(bus); if (devfn < 0) { printk(BIOS_ERR, "I2C%u device not found\n", bus); return -1; @@ -47,14 +47,14 @@ static int lpss_i2c_early_init_bus(unsigned int bus) } /* Skip if not enabled for early init */ - config = i2c_get_soc_cfg(bus, tree_dev); + config = dw_i2c_get_soc_cfg(bus, tree_dev); if (!config || !config->early_init) { printk(BIOS_DEBUG, "I2C%u not enabled for early init\n", bus); return -1; } /* Prepare early base address for access before memory */ - base = i2c_get_soc_early_base(bus); + base = dw_i2c_get_soc_early_base(bus); pci_write_config32(dev, PCI_BASE_ADDRESS_0, base); pci_write_config32(dev, PCI_COMMAND, PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER); @@ -78,7 +78,7 @@ uintptr_t dw_i2c_base_address(unsigned int bus) uintptr_t base; /* Find device+function for this controller */ - devfn = i2c_soc_bus_to_devfn(bus); + devfn = dw_i2c_soc_bus_to_devfn(bus); if (devfn < 0) return (uintptr_t)NULL; diff --git a/src/soc/intel/skylake/i2c.c b/src/soc/intel/skylake/i2c.c index 6b457ce62c..56260d702f 100644 --- a/src/soc/intel/skylake/i2c.c +++ b/src/soc/intel/skylake/i2c.c @@ -20,7 +20,7 @@ #include <soc/pci_devs.h> #include "chip.h" -const struct dw_i2c_bus_config *i2c_get_soc_cfg(unsigned int bus, +const struct dw_i2c_bus_config *dw_i2c_get_soc_cfg(unsigned int bus, const struct device *dev) { const struct soc_intel_skylake_config *config; @@ -35,12 +35,12 @@ const struct dw_i2c_bus_config *i2c_get_soc_cfg(unsigned int bus, return &config->i2c[bus]; } -uintptr_t i2c_get_soc_early_base(unsigned int bus) +uintptr_t dw_i2c_get_soc_early_base(unsigned int bus) { return EARLY_I2C_BASE(bus); } -int i2c_soc_devfn_to_bus(unsigned int devfn) +int dw_i2c_soc_devfn_to_bus(unsigned int devfn) { switch (devfn) { case PCH_DEVFN_I2C0: @@ -59,7 +59,7 @@ int i2c_soc_devfn_to_bus(unsigned int devfn) return -1; } -int i2c_soc_bus_to_devfn(unsigned int bus) +int dw_i2c_soc_bus_to_devfn(unsigned int bus) { switch (bus) { case 0: |