summaryrefslogtreecommitdiff
path: root/arch/m68k/cpu
diff options
context:
space:
mode:
authorPali Rohár <pali@kernel.org>2021-11-26 11:42:51 +0100
committerTom Rini <trini@konsulko.com>2022-01-12 14:21:24 -0500
commitc49f1fa8927340e7e3ea19f6ec6164510f9cd737 (patch)
treee2217e568d42d49aae2eda930c672d8263c6985b /arch/m68k/cpu
parent7598759d194e09a8301f2912739feda9cb7dcb70 (diff)
downloadu-boot-c49f1fa8927340e7e3ea19f6ec6164510f9cd737.tar.gz
u-boot-c49f1fa8927340e7e3ea19f6ec6164510f9cd737.tar.bz2
u-boot-c49f1fa8927340e7e3ea19f6ec6164510f9cd737.zip
m68k: mcf5445x: pci: Use PCI_CONF1_ADDRESS() macro
mcf5445x platform uses standard format of Config Address for PCI Configuration Mechanism #1. So use new U-Boot macro PCI_CONF1_ADDRESS(). Signed-off-by: Pali Rohár <pali@kernel.org> Reviewed-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'arch/m68k/cpu')
-rw-r--r--arch/m68k/cpu/mcf5445x/pci.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/m68k/cpu/mcf5445x/pci.c b/arch/m68k/cpu/mcf5445x/pci.c
index af02c4934c..d487468d0b 100644
--- a/arch/m68k/cpu/mcf5445x/pci.c
+++ b/arch/m68k/cpu/mcf5445x/pci.c
@@ -26,12 +26,11 @@
int pci_##rw##_cfg_##size(struct pci_controller *hose, \
pci_dev_t dev, int offset, type val) \
{ \
- u32 addr = 0; \
- u16 cfg_type = 0; \
- addr = ((offset & 0xfc) | cfg_type | (dev) | 0x80000000); \
+ u32 addr = PCI_CONF1_ADDRESS(PCI_BUS(dev), PCI_DEV(dev), \
+ PCI_FUNC(dev), offset); \
out_be32(hose->cfg_addr, addr); \
cfg_##rw(val, hose->cfg_data + (offset & mask), type, op); \
- out_be32(hose->cfg_addr, addr & 0x7fffffff); \
+ out_be32(hose->cfg_addr, addr & ~PCI_CONF1_ENABLE); \
return 0; \
}