summaryrefslogtreecommitdiff
path: root/src/northbridge/amd/amdmct
diff options
context:
space:
mode:
authorElyes HAOUAS <ehaouas@noos.fr>2018-12-05 11:02:11 +0100
committerKyösti Mälkki <kyosti.malkki@gmail.com>2018-12-28 05:40:56 +0000
commitafc63844e2b889f746163914afe3733c8b4ae1b4 (patch)
treeef078542ee723f811ff6b0c1cd2f1f52c016595b /src/northbridge/amd/amdmct
parentacaa581a474660e9c34cb4930cd63c77660f6e16 (diff)
src/northbridge: Get rid of device_t
Use of device_t is deprecated. Change-Id: I862bad4e889af3d25a771637a9ffc4f9d0b26d33 Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr> Reviewed-on: https://review.coreboot.org/c/30046 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Diffstat (limited to 'src/northbridge/amd/amdmct')
-rw-r--r--src/northbridge/amd/amdmct/mct_ddr3/s3utils.c35
1 files changed, 31 insertions, 4 deletions
diff --git a/src/northbridge/amd/amdmct/mct_ddr3/s3utils.c b/src/northbridge/amd/amdmct/mct_ddr3/s3utils.c
index eb39c811f9..c4db5c5f6b 100644
--- a/src/northbridge/amd/amdmct/mct_ddr3/s3utils.c
+++ b/src/northbridge/amd/amdmct/mct_ddr3/s3utils.c
@@ -67,7 +67,14 @@ ssize_t get_s3nv_file_offset(void)
return s3nv_region.region.offset;
}
-static uint32_t read_config32_dct(device_t dev, uint8_t node, uint8_t dct, uint32_t reg) {
+#ifdef __SIMPLE_DEVICE__
+static uint32_t read_config32_dct(pci_devfn_t dev, uint8_t node, uint8_t dct,
+ uint32_t reg)
+#else
+static uint32_t read_config32_dct(struct device *dev, uint8_t node, uint8_t dct,
+ uint32_t reg)
+#endif
+{
if (is_fam15h()) {
uint32_t dword;
#ifdef __PRE_RAM__
@@ -89,7 +96,14 @@ static uint32_t read_config32_dct(device_t dev, uint8_t node, uint8_t dct, uint3
return pci_read_config32(dev, reg);
}
-static void write_config32_dct(device_t dev, uint8_t node, uint8_t dct, uint32_t reg, uint32_t value) {
+#ifdef __SIMPLE_DEVICE__
+static void write_config32_dct(pci_devfn_t dev, uint8_t node, uint8_t dct,
+ uint32_t reg, uint32_t value)
+#else
+static void write_config32_dct(struct device *dev, uint8_t node, uint8_t dct,
+ uint32_t reg, uint32_t value)
+#endif
+{
if (is_fam15h()) {
uint32_t dword;
#ifdef __PRE_RAM__
@@ -111,7 +125,13 @@ static void write_config32_dct(device_t dev, uint8_t node, uint8_t dct, uint32_t
pci_write_config32(dev, reg, value);
}
-static uint32_t read_amd_dct_index_register(device_t dev, uint32_t index_ctl_reg, uint32_t index)
+#ifdef __SIMPLE_DEVICE__
+static uint32_t read_amd_dct_index_register(pci_devfn_t dev,
+ uint32_t index_ctl_reg, uint32_t index)
+#else
+static uint32_t read_amd_dct_index_register(struct device *dev,
+ uint32_t index_ctl_reg, uint32_t index)
+#endif
{
uint32_t dword;
@@ -125,7 +145,14 @@ static uint32_t read_amd_dct_index_register(device_t dev, uint32_t index_ctl_reg
return dword;
}
-static uint32_t read_amd_dct_index_register_dct(device_t dev, uint8_t node, uint8_t dct, uint32_t index_ctl_reg, uint32_t index)
+#ifdef __SIMPLE_DEVICE__
+static uint32_t read_amd_dct_index_register_dct(pci_devfn_t dev, uint8_t node,
+ uint8_t dct, uint32_t index_ctl_reg, uint32_t index)
+#else
+static uint32_t read_amd_dct_index_register_dct(struct device *dev,
+ uint8_t node, uint8_t dct, uint32_t index_ctl_reg,
+ uint32_t index)
+#endif
{
if (is_fam15h()) {
uint32_t dword;