erebion/coreboot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

UPSTREAM: soc/intel/fsp_baytrail: transition away from device_t

Browse source 
Replace the use of the old device_t definition inside
soc/intel/fsp_baytrail.

BUG=none
BRANCH=none
TEST=none

Change-Id: I208de00fab4cefe1e35b26f2ece16117750de2e4
Signed-off-by: Patrick Georgi <pgeorgi@chromium.org>
Original-Commit-Id: fb94dcf5d5
Original-Change-Id: I2791346289c04049e6f032c8e120e4be9ba6657f
Original-Signed-off-by: Antonello Dettori <dev@dettori.io>
Original-Reviewed-on: https://review.coreboot.org/17319
Original-Tested-by: build bot (Jenkins)
Original-Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Reviewed-on: https://chromium-review.googlesource.com/459507
This commit is contained in:
Antonello Dettori 2016-11-08 18:44:46 +01:00 • committed by chrome-bot
commit 2e34645354
4 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/soc/intel/fsp_baytrail/include/soc/acpi.h
View file

@ -26,9 +26,12 @@ void acpi_create_serialio_ssdt(acpi_header_t *ssdt);
void acpi_fill_in_fadt(acpi_fadt_t * fadt, acpi_facs_t * facs, void *dsdt);
unsigned long acpi_madt_irq_overrides(unsigned long current);
void acpi_init_gnvs(global_nvs_t *gnvs);
#ifndef __SIMPLE_DEVICE__
unsigned long southcluster_write_acpi_tables(device_t device,
unsigned long current,
struct acpi_rsdp *rsdp);
void southcluster_inject_dsdt(device_t device);
#endif
#endif /* _BAYTRAIL_ACPI_H_ */

4
src/soc/intel/fsp_baytrail/pmutil.c
View file

@ -24,9 +24,9 @@
#if defined(__SMM__)
static const device_t pcu_dev = PCI_DEV(0, PCU_DEV, 0);
static const pci_devfn_t pcu_dev = PCI_DEV(0, PCU_DEV, 0);
static inline device_t get_pcu_dev(void)
static inline pci_devfn_t get_pcu_dev(void)
{
return pcu_dev;
}

2
src/soc/intel/fsp_baytrail/smihandler.c
View file

@ -67,7 +67,7 @@ static void busmaster_disable_on_bus(int bus)
for (slot = 0; slot < 0x20; slot++) {
for (func = 0; func < 8; func++) {
u32 reg32;
device_t dev = PCI_DEV(bus, slot, func);
pci_devfn_t dev = PCI_DEV(bus, slot, func);
val = pci_read_config32(dev, PCI_VENDOR_ID);

3
src/soc/intel/fsp_baytrail/spi.c
View file

@ -251,12 +251,13 @@ static void read_reg(const void *src, void *value, uint32_t size)
static ich9_spi_regs *spi_regs(void)
{
device_t dev;
uint32_t sbase;
#ifdef __SMM__
pci_devfn_t dev;
dev = PCI_DEV(0, LPC_DEV, LPC_FUNC);
#else
device_t dev;
dev = dev_find_slot(0, PCI_DEVFN(LPC_DEV, LPC_FUNC));
#endif
pci_read_config_dword(dev, SBASE, &sbase);