diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2018-10-20 11:45:47 -0500 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2018-10-20 11:45:47 -0500 |
commit | b7c18dc06ad12059abc0961522d446553f8a755b (patch) | |
tree | d5d94228ffacb6df390e7fa7d92c0901a0665ea4 /drivers/pci/controller/pcie-mobiveil.c | |
parent | Merge branch 'remotes/lorenzo/pci/cadence' (diff) | |
parent | PCI: aardvark: Implement emulated root PCI bridge config space (diff) | |
download | linux-dev-b7c18dc06ad12059abc0961522d446553f8a755b.tar.xz linux-dev-b7c18dc06ad12059abc0961522d446553f8a755b.zip |
Merge branch 'remotes/lorenzo/pci/controller-misc'
- Remove redundant controller tests for "device_type == pci" (Rob
Herring)
- Document R-Car E3 (R8A77990) bindings (Tho Vu)
- Add device tree support for R-Car r8a7744 (Biju Das)
- Drop unused mvebu PCIe capability code (Thomas Petazzoni)
- Add shared PCI bridge emulation code (Thomas Petazzoni)
- Convert mvebu to use shared PCI bridge emulation (Thomas Petazzoni)
- Add aardvark Root Port emulation (Thomas Petazzoni)
* remotes/lorenzo/pci/controller-misc:
PCI: aardvark: Implement emulated root PCI bridge config space
PCI: mvebu: Convert to PCI emulated bridge config space
PCI: mvebu: Drop unused PCI express capability code
PCI: Introduce PCI bridge emulated config space common logic
dt-bindings: PCI: rcar: Add device tree support for r8a7744
dt-bindings: PCI: rcar: Add device tree support for r8a7744
DT: pci: rcar-pci: document R8A77990 bindings
PCI: Remove unnecessary check of device_type == pci
Diffstat (limited to 'drivers/pci/controller/pcie-mobiveil.c')
-rw-r--r-- | drivers/pci/controller/pcie-mobiveil.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/pci/controller/pcie-mobiveil.c b/drivers/pci/controller/pcie-mobiveil.c index a939e8d31735..77052a0712d0 100644 --- a/drivers/pci/controller/pcie-mobiveil.c +++ b/drivers/pci/controller/pcie-mobiveil.c @@ -301,13 +301,6 @@ static int mobiveil_pcie_parse_dt(struct mobiveil_pcie *pcie) struct platform_device *pdev = pcie->pdev; struct device_node *node = dev->of_node; struct resource *res; - const char *type; - - type = of_get_property(node, "device_type", NULL); - if (!type || strcmp(type, "pci")) { - dev_err(dev, "invalid \"device_type\" %s\n", type); - return -EINVAL; - } /* map config resource */ res = platform_get_resource_byname(pdev, IORESOURCE_MEM, |