diff options
Diffstat (limited to 'src/southbridge')
| -rw-r--r-- | src/southbridge/amd/sb600/hda.c | 4 | ||||
| -rw-r--r-- | src/southbridge/amd/sb600/lpc.c | 14 | ||||
| -rw-r--r-- | src/southbridge/amd/sb600/sata.c | 2 | ||||
| -rw-r--r-- | src/southbridge/amd/sb600/sb600.c | 16 | ||||
| -rw-r--r-- | src/southbridge/amd/sb600/sb600.h | 5 | ||||
| -rw-r--r-- | src/southbridge/amd/sb600/sm.c | 12 | ||||
| -rw-r--r-- | src/southbridge/amd/sb600/usb.c | 2 |
7 files changed, 28 insertions, 27 deletions
diff --git a/src/southbridge/amd/sb600/hda.c b/src/southbridge/amd/sb600/hda.c index bb2b2b1c25..367866f11f 100644 --- a/src/southbridge/amd/sb600/hda.c +++ b/src/southbridge/amd/sb600/hda.c @@ -150,7 +150,7 @@ static u32 cim_verb_data[] = { static u32 find_verb(u32 viddid, u32 ** verb) { - device_t azalia_dev = dev_find_slot(0, PCI_DEVFN(0x14, 2)); + struct device *azalia_dev = dev_find_slot(0, PCI_DEVFN(0x14, 2)); struct southbridge_amd_sb600_config *cfg = (struct southbridge_amd_sb600_config *)azalia_dev->chip_info; if (!cfg) @@ -265,7 +265,7 @@ static void hda_init(struct device *dev) void *base; struct resource *res; u32 codec_mask; - device_t sm_dev; + struct device *sm_dev; /* Enable azalia - PM_io 0x59[4], disable ac97 - PM_io 0x59[1..0] */ pm_iowrite(0x59, 0xB); diff --git a/src/southbridge/amd/sb600/lpc.c b/src/southbridge/amd/sb600/lpc.c index 0541518ca1..70699d092c 100644 --- a/src/southbridge/amd/sb600/lpc.c +++ b/src/southbridge/amd/sb600/lpc.c @@ -31,11 +31,11 @@ #include <cpu/amd/powernow.h> #include "sb600.h" -static void lpc_init(device_t dev) +static void lpc_init(struct device *dev) { u8 byte; u32 dword; - device_t sm_dev; + struct device *sm_dev; /* Enable the LPC Controller */ sm_dev = dev_find_slot(0, PCI_DEVFN(0x14, 0)); @@ -67,7 +67,7 @@ static void lpc_init(device_t dev) setup_i8254(); /* Initialize i8254 timers */ } -static void sb600_lpc_read_resources(device_t dev) +static void sb600_lpc_read_resources(struct device *dev) { struct resource *res; @@ -103,7 +103,7 @@ static void sb600_lpc_read_resources(device_t dev) * @param dev the device whose children's resources are to be enabled * */ -static void sb600_lpc_enable_childrens_resources(device_t dev) +static void sb600_lpc_enable_childrens_resources(struct device *dev) { struct bus *link; u32 reg, reg_x; @@ -115,7 +115,7 @@ static void sb600_lpc_enable_childrens_resources(device_t dev) reg_x = pci_read_config32(dev, 0x48); for (link = dev->link_list; link; link = link->next) { - device_t child; + struct device *child; for (child = link->children; child; child = child->sibling) { if (child->enabled @@ -214,7 +214,7 @@ static void sb600_lpc_enable_childrens_resources(device_t dev) pci_write_config8(dev, 0x74, wiosize); } -static void sb600_lpc_enable_resources(device_t dev) +static void sb600_lpc_enable_resources(struct device *dev) { pci_dev_enable_resources(dev); sb600_lpc_enable_childrens_resources(dev); @@ -224,7 +224,7 @@ static void sb600_lpc_enable_resources(device_t dev) extern u16 pm_base; -static void southbridge_acpi_fill_ssdt_generator(device_t device) { +static void southbridge_acpi_fill_ssdt_generator(struct device *device) { amd_generate_powernow(pm_base + 8, 6, 1); } diff --git a/src/southbridge/amd/sb600/sata.c b/src/southbridge/amd/sb600/sata.c index dbb4ec5229..650bb3969a 100644 --- a/src/southbridge/amd/sb600/sata.c +++ b/src/southbridge/amd/sb600/sata.c @@ -66,7 +66,7 @@ static void sata_init(struct device *dev) struct southbridge_ati_sb600_config *conf; conf = dev->chip_info; - device_t sm_dev; + struct device *sm_dev; /* SATA SMBus Disable */ /* sm_dev = pci_locate_device(PCI_ID(0x1002, 0x4385), 0); */ sm_dev = dev_find_slot(0, PCI_DEVFN(0x14, 0)); diff --git a/src/southbridge/amd/sb600/sb600.c b/src/southbridge/amd/sb600/sb600.c index 9e57ac21eb..9acd2cf77e 100644 --- a/src/southbridge/amd/sb600/sb600.c +++ b/src/southbridge/amd/sb600/sb600.c @@ -23,9 +23,9 @@ #include <device/pci_ops.h> #include "sb600.h" -static device_t find_sm_dev(device_t dev, u32 devfn) +static struct device *find_sm_dev(struct device *dev, u32 devfn) { - device_t sm_dev; + struct device *sm_dev; sm_dev = dev_find_slot(dev->bus->secondary, devfn); if (!sm_dev) @@ -45,7 +45,7 @@ static device_t find_sm_dev(device_t dev, u32 devfn) return sm_dev; } -void set_sm_enable_bits(device_t sm_dev, u32 reg_pos, u32 mask, u32 val) +void set_sm_enable_bits(struct device *sm_dev, u32 reg_pos, u32 mask, u32 val) { u32 reg_old, reg; reg = reg_old = pci_read_config32(sm_dev, reg_pos); @@ -88,8 +88,8 @@ u8 pm2_ioread(u8 reg) return pmio_read_index(PM2_INDEX, reg); } -static void set_pmio_enable_bits(device_t sm_dev, u32 reg_pos, - u32 mask, u32 val) +static void set_pmio_enable_bits(struct device *sm_dev, u32 reg_pos, u32 mask, + u32 val) { u8 reg_old, reg; reg = reg_old = pm_ioread(reg_pos); @@ -100,10 +100,10 @@ static void set_pmio_enable_bits(device_t sm_dev, u32 reg_pos, } } -void sb600_enable(device_t dev) +void sb600_enable(struct device *dev) { - device_t sm_dev = 0; - device_t bus_dev = 0; + struct device *sm_dev = NULL; + struct device *bus_dev = NULL; int index = -1; u32 deviceid; u32 vendorid; diff --git a/src/southbridge/amd/sb600/sb600.h b/src/southbridge/amd/sb600/sb600.h index 94ee861536..d955a70f4e 100644 --- a/src/southbridge/amd/sb600/sb600.h +++ b/src/southbridge/amd/sb600/sb600.h @@ -36,8 +36,9 @@ extern void pm2_iowrite(u8 reg, u8 value); extern u8 pm2_ioread(u8 reg); #ifndef __SIMPLE_DEVICE__ -extern void set_sm_enable_bits(device_t sm_dev, u32 reg_pos, u32 mask, u32 val); -void sb600_enable(device_t dev); +extern void set_sm_enable_bits(struct device *sm_dev, u32 reg_pos, u32 mask, + u32 val); +void sb600_enable(struct device *dev); #endif void sb600_lpc_port80(void); diff --git a/src/southbridge/amd/sb600/sm.c b/src/southbridge/amd/sb600/sm.c index 5773ae272a..371ffcd6a2 100644 --- a/src/southbridge/amd/sb600/sm.c +++ b/src/southbridge/amd/sb600/sm.c @@ -40,7 +40,7 @@ * SB600 enables all USB controllers by default in SMBUS Control. * SB600 enables SATA by default in SMBUS Control. */ -static void sm_init(device_t dev) +static void sm_init(struct device *dev) { u8 byte; u8 byte_old; @@ -216,7 +216,7 @@ static void sm_init(device_t dev) abcfg_reg(0x50, 1 << 3, 1 << 3); } -static int lsmbus_recv_byte(device_t dev) +static int lsmbus_recv_byte(struct device *dev) { u32 device; struct resource *res; @@ -230,7 +230,7 @@ static int lsmbus_recv_byte(device_t dev) return do_smbus_recv_byte(res->base, device); } -static int lsmbus_send_byte(device_t dev, u8 val) +static int lsmbus_send_byte(struct device *dev, u8 val) { u32 device; struct resource *res; @@ -244,7 +244,7 @@ static int lsmbus_send_byte(device_t dev, u8 val) return do_smbus_send_byte(res->base, device, val); } -static int lsmbus_read_byte(device_t dev, u8 address) +static int lsmbus_read_byte(struct device *dev, u8 address) { u32 device; struct resource *res; @@ -258,7 +258,7 @@ static int lsmbus_read_byte(device_t dev, u8 address) return do_smbus_read_byte(res->base, device, address); } -static int lsmbus_write_byte(device_t dev, u8 address, u8 val) +static int lsmbus_write_byte(struct device *dev, u8 address, u8 val) { u32 device; struct resource *res; @@ -278,7 +278,7 @@ static struct smbus_bus_operations lops_smbus_bus = { .write_byte = lsmbus_write_byte, }; -static void sb600_sm_read_resources(device_t dev) +static void sb600_sm_read_resources(struct device *dev) { struct resource *res; u8 byte; diff --git a/src/southbridge/amd/sb600/usb.c b/src/southbridge/amd/sb600/usb.c index 3be2312006..85df6c5989 100644 --- a/src/southbridge/amd/sb600/usb.c +++ b/src/southbridge/amd/sb600/usb.c @@ -33,7 +33,7 @@ static void usb_init(struct device *dev) u32 dword; /* Enable OHCI0-4 and EHCI Controllers */ - device_t sm_dev; + struct device *sm_dev; sm_dev = dev_find_slot(0, PCI_DEVFN(0x14, 0)); byte = pci_read_config8(sm_dev, 0x68); byte |= 0x3F; |