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>

diff --git a/arch/m68k/cpu/mcf5445x/pci.c b/arch/m68k/cpu/mcf5445x/pci.c
index af02c4934c97980b7e7bbca4db4418785dd08f04..d487468d0bfa64bb669a4ee3b32e22ed1a8a3fa1 100644 (file)
--- 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;                                                       \
 }