pci: sh7780: Use PCI_CONF1_ADDRESS() macro

PCI sh7780 driver 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/drivers/pci/pci_sh7780.c b/drivers/pci/pci_sh7780.c
index 06d711a6cb9ec32748351fee29fef6a8b26acffe..7533286c015609ae0e891dc5c01c5eb093667bd6 100644 (file)
--- a/drivers/pci/pci_sh7780.c
+++ b/drivers/pci/pci_sh7780.c
@@ -34,9 +34,9 @@
 int pci_sh4_read_config_dword(struct pci_controller *hose,
                                    pci_dev_t dev, int offset, u32 *value)
 {
-       u32 par_data = 0x80000000 | dev;
+       u32 par_data = PCI_CONF1_ADDRESS(PCI_BUS(dev), PCI_DEV(dev), PCI_FUNC(dev), offset);
 
-       p4_out(par_data | (offset & 0xfc), SH7780_PCIPAR);
+       p4_out(par_data, SH7780_PCIPAR);
        *value = p4_in(SH7780_PCIPDR);
 
        return 0;
@@ -45,9 +45,9 @@ int pci_sh4_read_config_dword(struct pci_controller *hose,
 int pci_sh4_write_config_dword(struct pci_controller *hose,
                                     pci_dev_t dev, int offset, u32 value)
 {
-       u32 par_data = 0x80000000 | dev;
+       u32 par_data = PCI_CONF1_ADDRESS(PCI_BUS(dev), PCI_DEV(dev), PCI_FUNC(dev), offset);
 
-       p4_out(par_data | (offset & 0xfc), SH7780_PCIPAR);
+       p4_out(par_data, SH7780_PCIPAR);
        p4_out(value, SH7780_PCIPDR);
        return 0;
 }