summaryrefslogtreecommitdiff
path: root/src/southbridge
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2019-08-25 13:05:46 +0300
committerPatrick Georgi <pgeorgi@google.com>2019-10-04 16:29:31 +0000
commit08c76e1f7d08ec9ef6481c725dc26fba4441e766 (patch)
tree6d131fe8469bc260fb7538279d8d944c8f6294dc /src/southbridge
parentf2e1d0ae9a5f0a96c0a9029c9fd93020216bfe66 (diff)
devicetree: Fix improper use of chip_operations
Auto-discoverable PCI devices do not require field .enable_dev of chip_operations to be set. They are matched with PCI drivers by the use of PCI vendor and device ID fields. The name given for the chip_operations struct must match the pathname the way it is present in the devicetree.cb files. If there was no match, util/sconfig would currently choose to use the empty weak declaration it creates in static.c file. Change-Id: I684a087a1f8ee4e1a5fd83450cd371fcfdbb6847 Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/35096 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Marshall Dawson <marshalldawson3rd@gmail.com>
Diffstat (limited to 'src/southbridge')
-rw-r--r--src/southbridge/intel/i82870/pcibridge.c4
-rw-r--r--src/southbridge/ti/pci7420/cardbus.c6
-rw-r--r--src/southbridge/ti/pci7420/firewire.c10
3 files changed, 4 insertions, 16 deletions
diff --git a/src/southbridge/intel/i82870/pcibridge.c b/src/southbridge/intel/i82870/pcibridge.c
index a375568b71..cb6ace8dab 100644
--- a/src/southbridge/intel/i82870/pcibridge.c
+++ b/src/southbridge/intel/i82870/pcibridge.c
@@ -47,3 +47,7 @@ static const struct pci_driver pcix_driver __pci_driver = {
.vendor = PCI_VENDOR_ID_INTEL,
.device = PCI_DEVICE_ID_INTEL_82870_1F0,
};
+
+struct chip_operations southbridge_intel_i82870_ops = {
+ CHIP_NAME("Intel 82870")
+};
diff --git a/src/southbridge/ti/pci7420/cardbus.c b/src/southbridge/ti/pci7420/cardbus.c
index 2c5679b931..44a38ea05c 100644
--- a/src/southbridge/ti/pci7420/cardbus.c
+++ b/src/southbridge/ti/pci7420/cardbus.c
@@ -111,12 +111,6 @@ static const struct pci_driver ti_pci7620_driver __pci_driver = {
.device = 0xac8d,
};
-static void ti_pci7420_enable_dev(struct device *dev)
-{
- /* Nothing here yet */
-}
-
struct chip_operations southbridge_ti_pci7420_ops = {
CHIP_NAME("Texas Instruments PCI7420/7620 Cardbus Controller")
- .enable_dev = ti_pci7420_enable_dev,
};
diff --git a/src/southbridge/ti/pci7420/firewire.c b/src/southbridge/ti/pci7420/firewire.c
index 4058540959..dac273a9e0 100644
--- a/src/southbridge/ti/pci7420/firewire.c
+++ b/src/southbridge/ti/pci7420/firewire.c
@@ -48,13 +48,3 @@ static const struct pci_driver ti_pci7420_driver __pci_driver = {
.vendor = 0x104c,
.device = 0x802e,
};
-
-static void ti_pci7420_firewire_enable_dev(struct device *dev)
-{
- /* Nothing here yet */
-}
-
-struct chip_operations southbridge_ti_pci7420_firewire_ops = {
- CHIP_NAME("Texas Instruments PCI7420/7620 FireWire (IEEE 1394)")
- .enable_dev = ti_pci7420_firewire_enable_dev,
-};