|
@@ -97,7 +97,6 @@
|
|
|
struct rcar_pci_priv {
|
|
|
struct device *dev;
|
|
|
void __iomem *reg;
|
|
|
- struct resource io_res;
|
|
|
struct resource mem_res;
|
|
|
struct resource *cfg_res;
|
|
|
unsigned busnr;
|
|
@@ -273,7 +272,6 @@ static int rcar_pci_setup(int nr, struct pci_sys_data *sys)
|
|
|
rcar_pci_setup_errirq(priv);
|
|
|
|
|
|
/* Add PCI resources */
|
|
|
- pci_add_resource(&sys->resources, &priv->io_res);
|
|
|
pci_add_resource(&sys->resources, &priv->mem_res);
|
|
|
|
|
|
/* Setup bus number based on platform device id / of bus-range */
|
|
@@ -371,14 +369,6 @@ static int rcar_pci_probe(struct platform_device *pdev)
|
|
|
return -ENOMEM;
|
|
|
|
|
|
priv->mem_res = *mem_res;
|
|
|
- /*
|
|
|
- * The controller does not support/use port I/O,
|
|
|
- * so setup a dummy port I/O region here.
|
|
|
- */
|
|
|
- priv->io_res.start = priv->mem_res.start;
|
|
|
- priv->io_res.end = priv->mem_res.end;
|
|
|
- priv->io_res.flags = IORESOURCE_IO;
|
|
|
-
|
|
|
priv->cfg_res = cfg_res;
|
|
|
|
|
|
priv->irq = platform_get_irq(pdev, 0);
|
|
@@ -421,6 +411,7 @@ static int rcar_pci_probe(struct platform_device *pdev)
|
|
|
hw_private[0] = priv;
|
|
|
memset(&hw, 0, sizeof(hw));
|
|
|
hw.nr_controllers = ARRAY_SIZE(hw_private);
|
|
|
+ hw.io_optional = 1;
|
|
|
hw.private_data = hw_private;
|
|
|
hw.map_irq = rcar_pci_map_irq;
|
|
|
hw.ops = &rcar_pci_ops;
|