Attention is currently required from: Jason Glenesk, Raul Rangel, Matt DeVillier, Fred Reitberger, Felix Held.
Arthur Heymans has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/68140 )
Change subject: soc/amd/*: Hook up smbus ops to devicetree ......................................................................
soc/amd/*: Hook up smbus ops to devicetree
Change-Id: Iab75f8c28a247f1370f4425e19cc215678bfa3e5 Signed-off-by: Arthur Heymans arthur@aheymans.xyz --- M src/soc/amd/cezanne/chipset.cb M src/soc/amd/common/block/smbus/sm.c M src/soc/amd/mendocino/chipset_mendocino.cb M src/soc/amd/mendocino/chipset_rembrandt.cb M src/soc/amd/picasso/chipset.cb 5 files changed, 15 insertions(+), 13 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/40/68140/1
diff --git a/src/soc/amd/cezanne/chipset.cb b/src/soc/amd/cezanne/chipset.cb index 3426f4e..fa42e8a 100644 --- a/src/soc/amd/cezanne/chipset.cb +++ b/src/soc/amd/cezanne/chipset.cb @@ -91,7 +91,7 @@ device pci 0.2 alias i2s_ac97 off end # I2S/AC'97 Audio end
- device pci 14.0 alias smbus on end # primary FCH function + device pci 14.0 alias smbus on ops amd_smbus_ops end # primary FCH function device pci 14.3 alias lpc_bridge on end
device pci 18.0 alias data_fabric_0 on end diff --git a/src/soc/amd/common/block/smbus/sm.c b/src/soc/amd/common/block/smbus/sm.c index 801a154..e958831 100644 --- a/src/soc/amd/common/block/smbus/sm.c +++ b/src/soc/amd/common/block/smbus/sm.c @@ -3,7 +3,6 @@ #include <amdblocks/acpimmio.h> #include <device/device.h> #include <device/pci.h> -#include <device/pci_ids.h> #include <device/smbus.h> #include <device/smbus_host.h>
@@ -64,7 +63,7 @@ } #endif
-static struct device_operations smbus_ops = { +static struct device_operations amd_smbus_ops = { .read_resources = noop_read_resources, .set_resources = noop_set_resources, .enable_resources = pci_dev_enable_resources, @@ -75,10 +74,3 @@ .acpi_name = smbus_acpi_name, #endif }; - -static const struct pci_driver smbus_driver __pci_driver = { - .ops = &smbus_ops, - .vendor = PCI_VID_AMD, - /* PCI device ID is used on all integrated FCHs except Family 16h Models 00h-3Fh */ - .device = PCI_DID_AMD_CZ_SMBUS, -}; diff --git a/src/soc/amd/mendocino/chipset_mendocino.cb b/src/soc/amd/mendocino/chipset_mendocino.cb index e687ec7..3f0d2f2 100644 --- a/src/soc/amd/mendocino/chipset_mendocino.cb +++ b/src/soc/amd/mendocino/chipset_mendocino.cb @@ -69,7 +69,7 @@ device pci 0.0 alias xhci_2 off end # Might also be a dummy device with different PCI DID end
- device pci 14.0 alias smbus on end # primary FCH function + device pci 14.0 alias smbus on ops amd_smbus_ops end # primary FCH function device pci 14.3 alias lpc_bridge on end
device pci 18.0 alias data_fabric_0 on end diff --git a/src/soc/amd/mendocino/chipset_rembrandt.cb b/src/soc/amd/mendocino/chipset_rembrandt.cb index bfdddef..31499b8 100644 --- a/src/soc/amd/mendocino/chipset_rembrandt.cb +++ b/src/soc/amd/mendocino/chipset_rembrandt.cb @@ -69,7 +69,7 @@ device pci 0.0 alias xhci_2 off end # Might also be a dummy device with different PCI DID end
- device pci 14.0 alias smbus on end # primary FCH function + device pci 14.0 alias smbus on ops amd_smbus_ops end # primary FCH function device pci 14.3 alias lpc_bridge on end
device pci 18.0 alias data_fabric_0 on end diff --git a/src/soc/amd/picasso/chipset.cb b/src/soc/amd/picasso/chipset.cb index 0ed7c73..1fee7f8 100644 --- a/src/soc/amd/picasso/chipset.cb +++ b/src/soc/amd/picasso/chipset.cb @@ -32,7 +32,7 @@ device pci 0.1 alias xgbe_0 off end device pci 0.2 alias xgbe_1 off end end - device pci 14.0 alias smbus on end # primary FCH function + device pci 14.0 alias smbus on ops amd_smbus_ops end # primary FCH function device pci 14.3 alias lpc_bridge on end device pci 14.6 alias sdhci off end device pci 18.0 alias data_fabric_0 on ops picasso_data_fabric_ops end