diff options
Diffstat (limited to 'drivers/pci/pci-tegra.c')
| -rw-r--r-- | drivers/pci/pci-tegra.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/drivers/pci/pci-tegra.c b/drivers/pci/pci-tegra.c index 7f10b7af2e..9ef50207ab 100644 --- a/drivers/pci/pci-tegra.c +++ b/drivers/pci/pci-tegra.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0-only /* * Copyright (C) 2014 Lucas Stach <l.stach@pengutronix.de> * @@ -22,7 +22,7 @@ #include <linux/phy/phy.h> #include <linux/reset.h> #include <linux/sizes.h> -#include <mach/tegra-powergate.h> +#include <mach/tegra/tegra-powergate.h> #include <regulator.h> /* register definitions */ @@ -214,7 +214,7 @@ struct tegra_pcie_soc_data { }; struct tegra_pcie { - struct device_d *dev; + struct device *dev; struct pci_controller pci; void __iomem *pads; @@ -822,15 +822,12 @@ static int tegra_pcie_resets_get(struct tegra_pcie *pcie) return PTR_ERR(pcie->afi_rst); pcie->pcie_xrst = reset_control_get(pcie->dev, "pcie_x"); - if (IS_ERR(pcie->pcie_xrst)) - return PTR_ERR(pcie->pcie_xrst); - - return 0; + return PTR_ERR_OR_ZERO(pcie->pcie_xrst); } static int tegra_pcie_get_resources(struct tegra_pcie *pcie) { - struct device_d *dev = pcie->dev; + struct device *dev = pcie->dev; int err; err = tegra_pcie_clocks_get(pcie); @@ -906,7 +903,7 @@ static int tegra_pcie_put_resources(struct tegra_pcie *pcie) static int tegra_pcie_get_xbar_config(struct tegra_pcie *pcie, u32 lanes, u32 *xbar) { - struct device_node *np = pcie->dev->device_node; + struct device_node *np = pcie->dev->of_node; if (of_device_is_compatible(np, "nvidia,tegra124-pcie")) { switch (lanes) { @@ -957,7 +954,7 @@ static int tegra_pcie_get_xbar_config(struct tegra_pcie *pcie, u32 lanes, static int tegra_pcie_parse_dt(struct tegra_pcie *pcie) { const struct tegra_pcie_soc_data *soc = pcie->soc_data; - struct device_node *np = pcie->dev->device_node, *port; + struct device_node *np = pcie->dev->of_node, *port; struct of_pci_range_parser parser; struct of_pci_range range; struct resource *rp_res; @@ -1170,7 +1167,6 @@ static int tegra_pcie_enable(struct tegra_pcie *pcie) tegra_pcie_port_free(port); } - pcie->pci.parent = pcie->dev; pcie->pci.pci_ops = &tegra_pcie_ops; pcie->pci.mem_resource = &pcie->mem; pcie->pci.mem_pref_resource = &pcie->prefetch; @@ -1233,8 +1229,9 @@ static __maybe_unused struct of_device_id tegra_pcie_of_match[] = { /* sentinel */ }, }; +MODULE_DEVICE_TABLE(of, tegra_pcie_of_match); -static int tegra_pcie_probe(struct device_d *dev) +static int tegra_pcie_probe(struct device *dev) { struct tegra_pcie *pcie; int err; @@ -1243,6 +1240,9 @@ static int tegra_pcie_probe(struct device_d *dev) if (!pcie) return -ENOMEM; + pcie->pci.parent = pcie->dev; + pci_controller_init(&pcie->pci); + INIT_LIST_HEAD(&pcie->buses); INIT_LIST_HEAD(&pcie->ports); dev_get_drvdata(dev, (const void **)&pcie->soc_data); @@ -1280,7 +1280,7 @@ put_resources: return err; } -static struct driver_d tegra_pcie_driver = { +static struct driver tegra_pcie_driver = { .name = "tegra-pcie", .of_compatible = DRV_OF_COMPAT(tegra_pcie_of_match), .probe = tegra_pcie_probe, |