Commit 777e5e6b authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'remotes/lorenzo/pci/ftpci100' 

- Rename PCI_IOSIZE, etc in ftpci100 to avoid macro name collisions (Randy
  Dunlap)

* remotes/lorenzo/pci/ftpci100:
  PCI: ftpci100: Rename macro name collision
parents c04881e8 5be967d5

drivers/pci/controller/pci-ftpci100.c

+15 −15
Original line number Diff line number Diff line
@@ -34,12 +34,12 @@ 
 * Special configuration registers directly in the first few words

 * in I/O space.

 */

#define PCI_IOSIZE	0x00

#define PCI_PROT	0x04 /* AHB protection */

#define PCI_CTRL	0x08 /* PCI control signal */

#define PCI_SOFTRST	0x10 /* Soft reset counter and response error enable */

#define PCI_CONFIG	0x28 /* PCI configuration command register */

#define PCI_DATA	0x2C

#define FTPCI_IOSIZE	0x00

#define FTPCI_PROT	0x04 /* AHB protection */

#define FTPCI_CTRL	0x08 /* PCI control signal */

#define FTPCI_SOFTRST	0x10 /* Soft reset counter and response error enable */

#define FTPCI_CONFIG	0x28 /* PCI configuration command register */

#define FTPCI_DATA	0x2C



#define FARADAY_PCI_STATUS_CMD		0x04 /* Status and command */

#define FARADAY_PCI_PMC			0x40 /* Power management control */
@@ -195,9 +195,9 @@ static int faraday_raw_pci_read_config(struct faraday_pci *p, int bus_number, 
			PCI_CONF_FUNCTION(PCI_FUNC(fn)) |

			PCI_CONF_WHERE(config) |

			PCI_CONF_ENABLE,

			p->base + PCI_CONFIG);

			p->base + FTPCI_CONFIG);



	*value = readl(p->base + PCI_DATA);

	*value = readl(p->base + FTPCI_DATA);



	if (size == 1)

		*value = (*value >> (8 * (config & 3))) & 0xFF;
@@ -230,17 +230,17 @@ static int faraday_raw_pci_write_config(struct faraday_pci *p, int bus_number, 
			PCI_CONF_FUNCTION(PCI_FUNC(fn)) |

			PCI_CONF_WHERE(config) |

			PCI_CONF_ENABLE,

			p->base + PCI_CONFIG);

			p->base + FTPCI_CONFIG);



	switch (size) {

	case 4:

		writel(value, p->base + PCI_DATA);

		writel(value, p->base + FTPCI_DATA);

		break;

	case 2:

		writew(value, p->base + PCI_DATA + (config & 3));

		writew(value, p->base + FTPCI_DATA + (config & 3));

		break;

	case 1:

		writeb(value, p->base + PCI_DATA + (config & 3));

		writeb(value, p->base + FTPCI_DATA + (config & 3));

		break;

	default:

		ret = PCIBIOS_BAD_REGISTER_NUMBER;
@@ -469,7 +469,7 @@ static int faraday_pci_probe(struct platform_device *pdev) 
		if (!faraday_res_to_memcfg(io->start - win->offset,

					   resource_size(io), &val)) {

			/* setup I/O space size */

			writel(val, p->base + PCI_IOSIZE);

			writel(val, p->base + FTPCI_IOSIZE);

		} else {

			dev_err(dev, "illegal IO mem size\n");

			return -EINVAL;
@@ -477,11 +477,11 @@ static int faraday_pci_probe(struct platform_device *pdev) 
	}



	/* Setup hostbridge */

	val = readl(p->base + PCI_CTRL);

	val = readl(p->base + FTPCI_CTRL);

	val |= PCI_COMMAND_IO;

	val |= PCI_COMMAND_MEMORY;

	val |= PCI_COMMAND_MASTER;

	writel(val, p->base + PCI_CTRL);

	writel(val, p->base + FTPCI_CTRL);

	/* Mask and clear all interrupts */

	faraday_raw_pci_write_config(p, 0, 0, FARADAY_PCI_CTRL2 + 2, 2, 0xF000);

	if (variant->cascaded_irq) {