diff --git a/southbridge/amd/rs690/gfx.c b/southbridge/amd/rs690/gfx.c index fcfd08c7c8..726c8109dc 100644 --- a/southbridge/amd/rs690/gfx.c +++ b/southbridge/amd/rs690/gfx.c @@ -571,6 +571,7 @@ struct device_operations rs690_gfx = { .constructor = default_device_constructor, .phase2_setup_scan_bus = rs690_internal_gfx_enable, .phase3_scan = 0, + .phase4_enable_disable = rs690_enable, .phase4_read_resources = rs690_gfx_read_resources, .phase4_set_resources = rs690_gfx_set_resources, .phase5_enable_resources = pci_dev_enable_resources, diff --git a/southbridge/amd/rs690/ht.c b/southbridge/amd/rs690/ht.c index 99dcf94eb2..810647c87e 100644 --- a/southbridge/amd/rs690/ht.c +++ b/southbridge/amd/rs690/ht.c @@ -87,6 +87,7 @@ struct device_operations rs690_ht = { .constructor = default_device_constructor, .phase2_setup_scan_bus = rs690_enable, .phase3_scan = 0, + .phase4_enable_disable = rs690_enable, .phase4_read_resources = pci_dev_read_resources, .phase4_set_resources = pci_dev_set_resources, .phase5_enable_resources = pci_dev_enable_resources, diff --git a/southbridge/amd/rs690/pcie.c b/southbridge/amd/rs690/pcie.c index b1e2f8b50a..23f9f13d86 100644 --- a/southbridge/amd/rs690/pcie.c +++ b/southbridge/amd/rs690/pcie.c @@ -399,6 +399,7 @@ struct device_operations rs690_pcie = { .device = PCI_DEVICE_ID_ATI_RS690_PCIE}}}, .constructor = default_device_constructor, .phase3_scan = pci_scan_bridge, + .phase4_enable_disable = rs690_enable, .phase4_read_resources = pci_bus_read_resources, .phase4_set_resources = pci_dev_set_resources, .phase5_enable_resources = pci_bus_enable_resources, diff --git a/southbridge/amd/sb600/ac97.c b/southbridge/amd/sb600/ac97.c index 0b4f4c9881..5322a89ab5 100644 --- a/southbridge/amd/sb600/ac97.c +++ b/southbridge/amd/sb600/ac97.c @@ -38,6 +38,7 @@ struct device_operations ac97audio = { .device = PCI_DEVICE_ID_ATI_SB600_ACI}}}, .constructor = default_device_constructor, .phase3_scan = 0, + .phase4_enable_disable = sb600_enable, .phase4_read_resources = pci_dev_read_resources, .phase4_set_resources = pci_dev_set_resources, .phase5_enable_resources = pci_dev_enable_resources, @@ -51,6 +52,7 @@ struct device_operations ac97modem = { .device = PCI_DEVICE_ID_ATI_SB600_MCI}}}, .constructor = default_device_constructor, .phase3_scan = 0, + .phase4_enable_disable = sb600_enable, .phase4_read_resources = pci_dev_read_resources, .phase4_set_resources = pci_dev_set_resources, .phase5_enable_resources = pci_dev_enable_resources, diff --git a/southbridge/amd/sb600/hda.c b/southbridge/amd/sb600/hda.c index 2753470647..fff3d05ef5 100644 --- a/southbridge/amd/sb600/hda.c +++ b/southbridge/amd/sb600/hda.c @@ -279,6 +279,7 @@ struct device_operations sb600_hda = { {.pci = {.vendor = PCI_VENDOR_ID_ATI, .device = PCI_DEVICE_ID_ATI_SB600_HDA}}}, .constructor = default_device_constructor, + .phase4_enable_disable = sb600_enable, .phase4_read_resources = pci_dev_read_resources, .phase4_set_resources = pci_dev_set_resources, .phase5_enable_resources = pci_dev_enable_resources, diff --git a/southbridge/amd/sb600/ide.c b/southbridge/amd/sb600/ide.c index c58d88d626..439dacc892 100644 --- a/southbridge/amd/sb600/ide.c +++ b/southbridge/amd/sb600/ide.c @@ -70,6 +70,7 @@ struct device_operations sb600_ide = { {.pci = {.vendor = PCI_VENDOR_ID_ATI, .device = PCI_DEVICE_ID_ATI_SB600_IDE}}}, .constructor = default_device_constructor, + .phase4_enable_disable = sb600_enable, .phase4_read_resources = pci_dev_read_resources, .phase4_set_resources = pci_dev_set_resources, .phase5_enable_resources = pci_dev_enable_resources, diff --git a/southbridge/amd/sb600/lpc.c b/southbridge/amd/sb600/lpc.c index d350d62c6a..e95ed178d4 100644 --- a/southbridge/amd/sb600/lpc.c +++ b/southbridge/amd/sb600/lpc.c @@ -213,6 +213,7 @@ struct device_operations sb600_lpc = { .device = PCI_DEVICE_ID_ATI_SB600_LPC}}}, .constructor = default_device_constructor, .phase3_scan = scan_static_bus, + .phase4_enable_disable = sb600_enable, .phase4_read_resources = sb600_lpc_read_resources, .phase4_set_resources = pci_dev_set_resources, .phase5_enable_resources = sb600_lpc_enable_resources, diff --git a/southbridge/amd/sb600/sata.c b/southbridge/amd/sb600/sata.c index 8a6ed7f27f..2daf2bee52 100644 --- a/southbridge/amd/sb600/sata.c +++ b/southbridge/amd/sb600/sata.c @@ -193,6 +193,7 @@ struct device_operations sb600_sata = { {.pci = {.vendor = PCI_VENDOR_ID_ATI, .device = PCI_DEVICE_ID_ATI_SB600_SATA}}}, .constructor = default_device_constructor, + .phase4_enable_disable = sb600_enable, .phase4_read_resources = pci_dev_read_resources, .phase4_set_resources = pci_dev_set_resources, .phase5_enable_resources = pci_dev_enable_resources, diff --git a/southbridge/amd/sb600/sb600.c b/southbridge/amd/sb600/sb600.c index 25efe311ec..c39dcf89f3 100644 --- a/southbridge/amd/sb600/sb600.c +++ b/southbridge/amd/sb600/sb600.c @@ -201,16 +201,3 @@ void sb600_enable(struct device * dev) deviceid); } } - -struct device_operations sb600 = { - .id = {.type = DEVICE_ID_PCI, - {.pci = {.vendor = PCI_VENDOR_ID_AMD, - .device = PCI_DEVICE_ID_ATI_SB600_LPC}}}, - .constructor = default_device_constructor, - .phase3_scan = 0, - .phase4_enable_disable = sb600_enable, - .phase4_read_resources = pci_dev_read_resources, - .phase4_set_resources = pci_dev_set_resources, - .phase6_init = NULL, - .ops_pci = &pci_dev_ops_pci, -}; diff --git a/southbridge/amd/sb600/sb600.dts b/southbridge/amd/sb600/sb600.dts deleted file mode 100644 index f45a5b54d0..0000000000 --- a/southbridge/amd/sb600/sb600.dts +++ /dev/null @@ -1,23 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2008 Ronald G. Minnich - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -{ - device_operations = "sb600"; -}; diff --git a/southbridge/amd/sb600/sm.c b/southbridge/amd/sb600/sm.c index 6ec8bda9b2..7528d1dc6b 100644 --- a/southbridge/amd/sb600/sm.c +++ b/southbridge/amd/sb600/sm.c @@ -395,6 +395,7 @@ struct device_operations sb600_sm = { .device = PCI_DEVICE_ID_ATI_SB600_SM}}}, .constructor = default_device_constructor, .phase3_scan = 0, + .phase4_enable_disable = sb600_enable, .phase4_read_resources = sb600_sm_read_resources, .phase4_set_resources = sb600_sm_set_resources, .phase5_enable_resources = pci_dev_enable_resources, diff --git a/southbridge/amd/sb600/usb.c b/southbridge/amd/sb600/usb.c index d9cc9cf9dc..2843f9328d 100644 --- a/southbridge/amd/sb600/usb.c +++ b/southbridge/amd/sb600/usb.c @@ -205,6 +205,7 @@ struct device_operations sb600_usb2 = { .device = PCI_DEVICE_ID_ATI_SB600_USB2}}}, .constructor = default_device_constructor, .phase3_scan = scan_static_bus, + .phase4_enable_disable = sb600_enable, .phase4_read_resources = pci_dev_read_resources, .phase4_set_resources = usb_set_resources, .phase5_enable_resources = pci_dev_enable_resources,