diff options
| author | Antonello Dettori <dev@dettori.io> | 2016-11-08 18:44:46 +0100 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2017-03-23 18:51:58 +0100 |
| commit | 823f7bb9622873fb40f4bdb706dcd83298386290 (patch) | |
| tree | cb8cf7d636d56252be8303a7d4269c10981e1f36 | |
| parent | a34e70e00216b268891da76b44895d09a84d890a (diff) | |
northbridge/via/vx900: transition away from device_t
Replace the use of the old device_t definition inside
northbridge/via/vx900.
Change-Id: I04292a6b698a42a5c582eddcef7cf5a235e1a464
Signed-off-by: Antonello Dettori <dev@dettori.io>
Reviewed-on: https://review.coreboot.org/17317
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
| -rw-r--r-- | src/northbridge/via/vx900/early_smbus.c | 2 | ||||
| -rw-r--r-- | src/northbridge/via/vx900/raminit_ddr3.c | 2 | ||||
| -rw-r--r-- | src/northbridge/via/vx900/vx900.h | 11 |
3 files changed, 13 insertions, 2 deletions
diff --git a/src/northbridge/via/vx900/early_smbus.c b/src/northbridge/via/vx900/early_smbus.c index 93a9254453..0cf7427e5d 100644 --- a/src/northbridge/via/vx900/early_smbus.c +++ b/src/northbridge/via/vx900/early_smbus.c @@ -76,7 +76,7 @@ u8 smbus_read_byte(u32 smbus_dev, u8 addr, u8 offset) void enable_smbus(void) { - device_t dev; + pci_devfn_t dev; u8 reg8; u32 smbus_dev = (u32) SMBUS_IO_BASE; diff --git a/src/northbridge/via/vx900/raminit_ddr3.c b/src/northbridge/via/vx900/raminit_ddr3.c index 2de7734c17..56ec5fda1a 100644 --- a/src/northbridge/via/vx900/raminit_ddr3.c +++ b/src/northbridge/via/vx900/raminit_ddr3.c @@ -1627,7 +1627,7 @@ void vx900_init_dram_ddr3(const dimm_layout * dimm_addr) dimm_info dimm_prop; ramctr_timing ctrl_prop; rank_layout ranks; - device_t mcu; + pci_devfn_t mcu; if (!ram_check_noprint_nodie(1 << 20, 1 << 20)) { printram("RAM is already initialized. Skipping init\n"); diff --git a/src/northbridge/via/vx900/vx900.h b/src/northbridge/via/vx900/vx900.h index 2590ab2ca3..12e5733e61 100644 --- a/src/northbridge/via/vx900/vx900.h +++ b/src/northbridge/via/vx900/vx900.h @@ -41,6 +41,16 @@ uint64_t get_uma_memory_base(void); /* We use these throughout the code. They really belong in a generic part of * coreboot, but until bureaucracy gets them there, we still need them */ + +#ifdef __SIMPLE_DEVICE__ +void dump_pci_device(pci_devfn_t dev); +void pci_mod_config8(pci_devfn_t dev, unsigned int where, + uint8_t clr_mask, uint8_t set_mask); +void pci_mod_config16(pci_devfn_t dev, unsigned int where, + uint16_t clr_mask, uint16_t set_mask); +void pci_mod_config32(pci_devfn_t dev, unsigned int where, + uint32_t clr_mask, uint32_t set_mask); +#else void dump_pci_device(device_t dev); void pci_mod_config8(device_t dev, unsigned int where, uint8_t clr_mask, uint8_t set_mask); @@ -48,5 +58,6 @@ void pci_mod_config16(device_t dev, unsigned int where, uint16_t clr_mask, uint16_t set_mask); void pci_mod_config32(device_t dev, unsigned int where, uint32_t clr_mask, uint32_t set_mask); +#endif #endif /* __VX900_H */ |