From: Bjorn Helgaas <bhelgaas@xxxxxxxxxx>
Add a struct rcar_variant to hold details about differences between the
different R-Car variants we support. No functional change intended.
The benefit is that we can find all this information with the existing
single of_device_get_match_data() call. A subsequent commit will remove
an of_find_matching_node() call by extending this structure.
Signed-off-by: Bjorn Helgaas <bhelgaas@xxxxxxxxxx>
Cc: Liang He <windhl@xxxxxxx>
Cc: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
---
drivers/pci/controller/pcie-rcar-host.c | 53 +++++++++++++++----------
1 file changed, 33 insertions(+), 20 deletions(-)
diff --git a/drivers/pci/controller/pcie-rcar-host.c b/drivers/pci/controller/pcie-rcar-host.c
index 997c4df6a1e7..ccf13aafa1e5 100644
--- a/drivers/pci/controller/pcie-rcar-host.c
+++ b/drivers/pci/controller/pcie-rcar-host.c
@@ -56,13 +56,19 @@ static void __iomem *pcie_base;
static struct device *pcie_dev;
#endif
+struct rcar_pcie_host;
+
+struct rcar_variant {
+ int (*phy_init_fn)(struct rcar_pcie_host *host);
+};
+
/* Structure representing the PCIe interface */
struct rcar_pcie_host {
- struct rcar_pcie pcie;
- struct phy *phy;
- struct clk *bus_clk;
- struct rcar_msi msi;
- int (*phy_init_fn)(struct rcar_pcie_host *host);
+ struct rcar_pcie pcie;
+ struct phy *phy;
+ struct clk *bus_clk;
+ struct rcar_msi msi;
+ const struct rcar_variant *variant;
};
static DEFINE_SPINLOCK(pmsr_lock);
@@ -958,19 +964,26 @@ static int rcar_pcie_parse_map_dma_ranges(struct rcar_pcie_host *host)
return err;
}
+static const struct rcar_variant rcar_h1_data = {
+ .phy_init_fn = rcar_pcie_phy_init_h1,
+};
+
+static const struct rcar_variant rcar_gen2_data = {
+ .phy_init_fn = rcar_pcie_phy_init_gen2,
+};
+
+static const struct rcar_variant rcar_gen3_data = {
+ .phy_init_fn = rcar_pcie_phy_init_gen3,
+};
+
static const struct of_device_id rcar_pcie_of_match[] = {
- { .compatible = "renesas,pcie-r8a7779",
- .data = rcar_pcie_phy_init_h1 },
- { .compatible = "renesas,pcie-r8a7790",
- .data = rcar_pcie_phy_init_gen2 },
- { .compatible = "renesas,pcie-r8a7791",
- .data = rcar_pcie_phy_init_gen2 },
- { .compatible = "renesas,pcie-rcar-gen2",
- .data = rcar_pcie_phy_init_gen2 },
- { .compatible = "renesas,pcie-r8a7795",
- .data = rcar_pcie_phy_init_gen3 },
- { .compatible = "renesas,pcie-rcar-gen3",
- .data = rcar_pcie_phy_init_gen3 },
+ { .compatible = "renesas,pcie-r8a7779", .data = &rcar_h1_data },
+ { .compatible = "renesas,pcie-r8a7790", .data = &rcar_gen2_data },
+ { .compatible = "renesas,pcie-r8a7791", .data = &rcar_gen2_data },
+ { .compatible = "renesas,pcie-rcar-gen2", .data = &rcar_gen2_data },
+
+ { .compatible = "renesas,pcie-r8a7795", .data = &rcar_gen3_data },
+ { .compatible = "renesas,pcie-rcar-gen3", .data = &rcar_gen3_data },
{},
};
@@ -1015,8 +1028,8 @@ static int rcar_pcie_probe(struct platform_device *pdev)
if (err)
goto err_clk_disable;
- host->phy_init_fn = of_device_get_match_data(dev);
- err = host->phy_init_fn(host);
+ host->variant = of_device_get_match_data(dev);
+ err = host->variant->phy_init_fn(host);
if (err) {
dev_err(dev, "failed to init PCIe PHY\n");
goto err_clk_disable;
@@ -1084,7 +1097,7 @@ static int __maybe_unused rcar_pcie_resume(struct device *dev)
return 0;
/* Failure to get a link might just be that no cards are inserted */
- err = host->phy_init_fn(host);
+ err = host->variant->phy_init_fn(host);
if (err) {
dev_info(dev, "PCIe link down\n");
return 0;
--
2.25.1
