]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
PCI: keystone: Remove iATU register mapping
authorKunihiko Hayashi <hayashi.kunihiko@socionext.com>
Wed, 30 Sep 2020 05:36:07 +0000 (14:36 +0900)
committerLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Tue, 13 Oct 2020 08:52:49 +0000 (09:52 +0100)
After applying "PCI: dwc: Add common iATU register support",
there is no need to set own iATU in the Keystone driver itself.

Suggested-by: Rob Herring <robh@kernel.org>
Link: https://lore.kernel.org/r/1601444167-11316-5-git-send-email-hayashi.kunihiko@socionext.com
Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Reviewed-by: Rob Herring <robh@kernel.org>
Cc: Murali Karicheri <m-karicheri2@ti.com>
Cc: Jingoo Han <jingoohan1@gmail.com>
Cc: Gustavo Pimentel <gustavo.pimentel@synopsys.com>
drivers/pci/controller/dwc/pci-keystone.c

index b554812dace7754e286eda0107524a2f372dae9e..a222728238caeb9e9afd71e8dde7258559c50df4 100644 (file)
@@ -1154,7 +1154,6 @@ static int __init ks_pcie_probe(struct platform_device *pdev)
        struct keystone_pcie *ks_pcie;
        struct device_link **link;
        struct gpio_desc *gpiod;
-       void __iomem *atu_base;
        struct resource *res;
        unsigned int version;
        void __iomem *base;
@@ -1275,23 +1274,12 @@ static int __init ks_pcie_probe(struct platform_device *pdev)
                goto err_get_sync;
        }
 
-       if (pci->version >= 0x480A) {
-               atu_base = devm_platform_ioremap_resource_byname(pdev, "atu");
-               if (IS_ERR(atu_base)) {
-                       ret = PTR_ERR(atu_base);
-                       goto err_get_sync;
-               }
-
-               pci->atu_base = atu_base;
-
+       if (pci->version >= 0x480A)
                ret = ks_pcie_am654_set_mode(dev, mode);
-               if (ret < 0)
-                       goto err_get_sync;
-       } else {
+       else
                ret = ks_pcie_set_mode(dev);
-               if (ret < 0)
-                       goto err_get_sync;
-       }
+       if (ret < 0)
+               goto err_get_sync;
 
        switch (mode) {
        case DW_PCIE_RC_TYPE: