From bfca8efab37497dba0753f38d914a759b007be0e Mon Sep 17 00:00:00 2001 From: Zheng Bao Date: Sat, 19 Jun 2010 06:55:17 +0000 Subject: Trivial. Cleaning up about the blank line. Signed-off-by: Zheng Bao Acked-by: Zheng Bao git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5634 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/southbridge/amd/sb700/sb700.c | 32 ++++++++++++++++---------------- src/southbridge/amd/sb700/sb700_lpc.c | 2 -- src/southbridge/amd/sb700/sb700_sm.c | 8 ++++---- src/southbridge/amd/sb700/sb700_usb.c | 3 +-- 4 files changed, 21 insertions(+), 24 deletions(-) (limited to 'src') diff --git a/src/southbridge/amd/sb700/sb700.c b/src/southbridge/amd/sb700/sb700.c index 39ae3a6b34..05c855a406 100644 --- a/src/southbridge/amd/sb700/sb700.c +++ b/src/southbridge/amd/sb700/sb700.c @@ -120,21 +120,21 @@ void sb700_enable(device_t dev) printk(BIOS_DEBUG, "sb700_enable()\n"); -/* -* 0:11.0 SATA bit 8 of sm_dev 0xac : 1 - enable, default + 32 * 3 -* 0:12.0 OHCI0-USB1 bit 0 of sm_dev 0x68 -* 0:12.1 OHCI1-USB1 bit 1 of sm_dev 0x68 -* 0:12.2 EHCI-USB1 bit 2 of sm_dev 0x68 -* 0:13.0 OHCI0-USB2 bit 4 of sm_dev 0x68 -* 0:13.1 OHCI1-USB2 bit 5 of sm_dev 0x68 -* 0:13.2 EHCI-USB2 bit 6 of sm_dev 0x68 -* 0:14.5 OHCI0-USB3 bit 7 of sm_dev 0x68 -* 0:14.0 SMBUS 0 -* 0:14.1 IDE 1 -* 0:14.2 HDA bit 3 of pm_io 0x59 : 1 - enable, default + 32 * 4 -* 0:14.3 LPC bit 20 of sm_dev 0x64 : 0 - disable, default + 32 * 1 -* 0:14.4 PCI 4 -*/ + /* + * 0:11.0 SATA bit 8 of sm_dev 0xac : 1 - enable, default + 32 * 3 + * 0:12.0 OHCI0-USB1 bit 0 of sm_dev 0x68 + * 0:12.1 OHCI1-USB1 bit 1 of sm_dev 0x68 + * 0:12.2 EHCI-USB1 bit 2 of sm_dev 0x68 + * 0:13.0 OHCI0-USB2 bit 4 of sm_dev 0x68 + * 0:13.1 OHCI1-USB2 bit 5 of sm_dev 0x68 + * 0:13.2 EHCI-USB2 bit 6 of sm_dev 0x68 + * 0:14.5 OHCI0-USB3 bit 7 of sm_dev 0x68 + * 0:14.0 SMBUS 0 + * 0:14.1 IDE 1 + * 0:14.2 HDA bit 3 of pm_io 0x59 : 1 - enable, default + 32 * 4 + * 0:14.3 LPC bit 20 of sm_dev 0x64 : 0 - disable, default + 32 * 1 + * 0:14.4 PCI 4 + */ if (dev->device == 0x0000) { vendorid = pci_read_config32(dev, PCI_VENDOR_ID); deviceid = (vendorid >> 16) & 0xffff; @@ -143,6 +143,7 @@ void sb700_enable(device_t dev) vendorid = dev->vendor; deviceid = dev->device; } + bus_dev = dev->bus->dev; if ((bus_dev->vendor == PCI_VENDOR_ID_ATI) && (bus_dev->device == PCI_DEVICE_ID_ATI_SB700_PCI)) { @@ -156,7 +157,6 @@ void sb700_enable(device_t dev) case 5 << 3: ; } - return; } diff --git a/src/southbridge/amd/sb700/sb700_lpc.c b/src/southbridge/amd/sb700/sb700_lpc.c index 87b77ca28f..3a75512260 100644 --- a/src/southbridge/amd/sb700/sb700_lpc.c +++ b/src/southbridge/amd/sb700/sb700_lpc.c @@ -58,7 +58,6 @@ static void lpc_init(device_t dev) byte = pci_read_config8(dev, 0x78); byte &= ~(1 << 1); pci_write_config8(dev, 0x78, byte); - } static void sb700_lpc_read_resources(device_t dev) @@ -100,7 +99,6 @@ static void sb700_lpc_set_resources(struct device *dev) /* Specical case. SPI Base Address. The SpiRomEnable should be set. */ res = find_resource(dev, 0xA0); pci_write_config32(dev, 0xA0, res->base | 1 << 1); - } /** diff --git a/src/southbridge/amd/sb700/sb700_sm.c b/src/southbridge/amd/sb700/sb700_sm.c index d053aff0fd..65ccce9199 100644 --- a/src/southbridge/amd/sb700/sb700_sm.c +++ b/src/southbridge/amd/sb700/sb700_sm.c @@ -72,7 +72,6 @@ static void sm_init(device_t dev) dword |= 1 << 13; pci_write_config16(dev, 0x64, dword); - /* rrg:K8 INTR Enable (BIOS should set this bit after PIC initialization) */ /* rpr 2.1 Enabling Legacy Interrupt */ dword = pci_read_config8(dev, 0x62); @@ -282,6 +281,7 @@ static int lsmbus_write_byte(device_t dev, u8 address, u8 val) return do_smbus_write_byte(res->base, device, address, val); } + static struct smbus_bus_operations lops_smbus_bus = { .recv_byte = lsmbus_recv_byte, .send_byte = lsmbus_send_byte, @@ -335,10 +335,9 @@ static void sb700_sm_read_resources(device_t dev) res->gran = 8; res->flags = IORESOURCE_IO | IORESOURCE_FIXED; - compact_resources(dev); - } + static void sb700_sm_set_resources(struct device *dev) { struct resource *res; @@ -346,7 +345,6 @@ static void sb700_sm_set_resources(struct device *dev) pci_dev_set_resources(dev); - /* rpr2.14: Make HPET MMIO decoding controlled by the memory enable bit in command register of LPC ISA bridage */ byte = pm_ioread(0x52); byte |= 1 << 6; @@ -365,6 +363,7 @@ static void sb700_sm_set_resources(struct device *dev) static struct pci_operations lops_pci = { .set_subsystem = pci_dev_set_subsystem, }; + static struct device_operations smbus_ops = { .read_resources = sb700_sm_read_resources, .set_resources = sb700_sm_set_resources, @@ -374,6 +373,7 @@ static struct device_operations smbus_ops = { .ops_pci = &lops_pci, .ops_smbus_bus = &lops_smbus_bus, }; + static const struct pci_driver smbus_driver __pci_driver = { .ops = &smbus_ops, .vendor = PCI_VENDOR_ID_ATI, diff --git a/src/southbridge/amd/sb700/sb700_usb.c b/src/southbridge/amd/sb700/sb700_usb.c index e1bcf0f723..8ee6e37ac9 100644 --- a/src/southbridge/amd/sb700/sb700_usb.c +++ b/src/southbridge/amd/sb700/sb700_usb.c @@ -42,7 +42,6 @@ static void usb_init(struct device *dev) byte |= 0xFF; pci_write_config8(sm_dev, 0x68, byte); - /* RPR 6.2 Enables the USB PME Event,Enable USB resume support */ byte = pm_ioread(0x61); byte |= 1 << 6; @@ -188,7 +187,6 @@ static void usb_set_resources(struct device *dev) set_ehci_base(base); report_resource_stored(dev, res, ""); #endif - } static struct device_operations usb_ops = { @@ -205,6 +203,7 @@ static const struct pci_driver usb_0_driver __pci_driver = { .vendor = PCI_VENDOR_ID_ATI, .device = PCI_DEVICE_ID_ATI_SB700_USB_18_0, }; + static const struct pci_driver usb_1_driver __pci_driver = { .ops = &usb_ops, .vendor = PCI_VENDOR_ID_ATI, -- cgit v1.2.3