PCI: imx6: Explicitly request exclusive reset control
authorPhilipp Zabel <p.zabel@pengutronix.de>
Wed, 19 Jul 2017 15:25:56 +0000 (17:25 +0200)
committerBjorn Helgaas <bhelgaas@google.com>
Thu, 3 Aug 2017 21:41:08 +0000 (16:41 -0500)
Commit a53e35db70d1 ("reset: Ensure drivers are explicit when requesting
reset lines") started to transition the reset control request API calls to
explicitly state whether the driver needs exclusive or shared reset control
behavior. Convert all drivers requesting exclusive resets to the explicit
API call so the temporary transition helpers can be removed.

No functional changes.

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Cc: Richard Zhu <hongxing.zhu@nxp.com>
Cc: Lucas Stach <l.stach@pengutronix.de>
drivers/pci/dwc/pci-imx6.c

index bf5c3616e344845ccb89c0e2c55a50d12dbda79f..5a2ece394ad39b4fb13f99f9368657c4d7aee08d 100644 (file)
@@ -778,14 +778,15 @@ static int imx6_pcie_probe(struct platform_device *pdev)
                }
                break;
        case IMX7D:
-               imx6_pcie->pciephy_reset = devm_reset_control_get(dev,
-                                                                 "pciephy");
+               imx6_pcie->pciephy_reset = devm_reset_control_get_exclusive(dev,
+                                                                           "pciephy");
                if (IS_ERR(imx6_pcie->pciephy_reset)) {
                        dev_err(dev, "Failed to get PCIEPHY reset control\n");
                        return PTR_ERR(imx6_pcie->pciephy_reset);
                }
 
-               imx6_pcie->apps_reset = devm_reset_control_get(dev, "apps");
+               imx6_pcie->apps_reset = devm_reset_control_get_exclusive(dev,
+                                                                        "apps");
                if (IS_ERR(imx6_pcie->apps_reset)) {
                        dev_err(dev, "Failed to get PCIE APPS reset control\n");
                        return PTR_ERR(imx6_pcie->apps_reset);