aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLucas Stach <l.stach@pengutronix.de>2014-03-28 12:52:57 -0400
committerBjorn Helgaas <bhelgaas@google.com>2014-05-30 13:24:39 -0400
commit5c40eea7783bbcdd5795cd7d50b7b3fd9a94dc94 (patch)
treeda5f57a041f3a2d32dc4e99757f92e70f9fd4277
parente521519a84f6d796d3cff756969cd5902c9550dd (diff)
PCI: imx6: Remove optional (and unused) IRQs
They are dropped with the new binding. Signed-off-by: Lucas Stach <l.stach@pengutronix.de> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Acked-by: Richard Zhu <r65037@freescale.com>
-rw-r--r--drivers/pci/host/pci-imx6.c42
1 files changed, 0 insertions, 42 deletions
diff --git a/drivers/pci/host/pci-imx6.c b/drivers/pci/host/pci-imx6.c
index ccaeed88597a..29e77508d285 100644
--- a/drivers/pci/host/pci-imx6.c
+++ b/drivers/pci/host/pci-imx6.c
@@ -32,9 +32,6 @@
32 32
33struct imx6_pcie { 33struct imx6_pcie {
34 int reset_gpio; 34 int reset_gpio;
35 int power_on_gpio;
36 int wake_up_gpio;
37 int disable_gpio;
38 struct clk *pcie_bus; 35 struct clk *pcie_bus;
39 struct clk *pcie_phy; 36 struct clk *pcie_phy;
40 struct clk *pcie; 37 struct clk *pcie;
@@ -230,9 +227,6 @@ static int imx6_pcie_deassert_core_reset(struct pcie_port *pp)
230 struct imx6_pcie *imx6_pcie = to_imx6_pcie(pp); 227 struct imx6_pcie *imx6_pcie = to_imx6_pcie(pp);
231 int ret; 228 int ret;
232 229
233 if (gpio_is_valid(imx6_pcie->power_on_gpio))
234 gpio_set_value(imx6_pcie->power_on_gpio, 1);
235
236 regmap_update_bits(imx6_pcie->iomuxc_gpr, IOMUXC_GPR1, 230 regmap_update_bits(imx6_pcie->iomuxc_gpr, IOMUXC_GPR1,
237 IMX6Q_GPR1_PCIE_TEST_PD, 0 << 18); 231 IMX6Q_GPR1_PCIE_TEST_PD, 0 << 18);
238 regmap_update_bits(imx6_pcie->iomuxc_gpr, IOMUXC_GPR1, 232 regmap_update_bits(imx6_pcie->iomuxc_gpr, IOMUXC_GPR1,
@@ -531,42 +525,6 @@ static int __init imx6_pcie_probe(struct platform_device *pdev)
531 } 525 }
532 } 526 }
533 527
534 imx6_pcie->power_on_gpio = of_get_named_gpio(np, "power-on-gpio", 0);
535 if (gpio_is_valid(imx6_pcie->power_on_gpio)) {
536 ret = devm_gpio_request_one(&pdev->dev,
537 imx6_pcie->power_on_gpio,
538 GPIOF_OUT_INIT_LOW,
539 "PCIe power enable");
540 if (ret) {
541 dev_err(&pdev->dev, "unable to get power-on gpio\n");
542 return ret;
543 }
544 }
545
546 imx6_pcie->wake_up_gpio = of_get_named_gpio(np, "wake-up-gpio", 0);
547 if (gpio_is_valid(imx6_pcie->wake_up_gpio)) {
548 ret = devm_gpio_request_one(&pdev->dev,
549 imx6_pcie->wake_up_gpio,
550 GPIOF_IN,
551 "PCIe wake up");
552 if (ret) {
553 dev_err(&pdev->dev, "unable to get wake-up gpio\n");
554 return ret;
555 }
556 }
557
558 imx6_pcie->disable_gpio = of_get_named_gpio(np, "disable-gpio", 0);
559 if (gpio_is_valid(imx6_pcie->disable_gpio)) {
560 ret = devm_gpio_request_one(&pdev->dev,
561 imx6_pcie->disable_gpio,
562 GPIOF_OUT_INIT_HIGH,
563 "PCIe disable endpoint");
564 if (ret) {
565 dev_err(&pdev->dev, "unable to get disable-ep gpio\n");
566 return ret;
567 }
568 }
569
570 /* Fetch clocks */ 528 /* Fetch clocks */
571 imx6_pcie->pcie_phy = devm_clk_get(&pdev->dev, "pcie_phy"); 529 imx6_pcie->pcie_phy = devm_clk_get(&pdev->dev, "pcie_phy");
572 if (IS_ERR(imx6_pcie->pcie_phy)) { 530 if (IS_ERR(imx6_pcie->pcie_phy)) {