|
@@ -33,6 +33,7 @@
|
|
|
|
|
|
struct imx6_pcie {
|
|
struct imx6_pcie {
|
|
int reset_gpio;
|
|
int reset_gpio;
|
|
|
|
+ bool gpio_active_high;
|
|
struct clk *pcie_bus;
|
|
struct clk *pcie_bus;
|
|
struct clk *pcie_phy;
|
|
struct clk *pcie_phy;
|
|
struct clk *pcie_inbound_axi;
|
|
struct clk *pcie_inbound_axi;
|
|
@@ -348,9 +349,11 @@ static int imx6_pcie_deassert_core_reset(struct pcie_port *pp)
|
|
|
|
|
|
/* Some boards don't have PCIe reset GPIO. */
|
|
/* Some boards don't have PCIe reset GPIO. */
|
|
if (gpio_is_valid(imx6_pcie->reset_gpio)) {
|
|
if (gpio_is_valid(imx6_pcie->reset_gpio)) {
|
|
- gpio_set_value_cansleep(imx6_pcie->reset_gpio, 0);
|
|
|
|
|
|
+ gpio_set_value_cansleep(imx6_pcie->reset_gpio,
|
|
|
|
+ imx6_pcie->gpio_active_high);
|
|
msleep(100);
|
|
msleep(100);
|
|
- gpio_set_value_cansleep(imx6_pcie->reset_gpio, 1);
|
|
|
|
|
|
+ gpio_set_value_cansleep(imx6_pcie->reset_gpio,
|
|
|
|
+ !imx6_pcie->gpio_active_high);
|
|
}
|
|
}
|
|
|
|
|
|
if (imx6_pcie->is_imx6sx)
|
|
if (imx6_pcie->is_imx6sx)
|
|
@@ -600,9 +603,14 @@ static int __init imx6_pcie_probe(struct platform_device *pdev)
|
|
|
|
|
|
/* Fetch GPIOs */
|
|
/* Fetch GPIOs */
|
|
imx6_pcie->reset_gpio = of_get_named_gpio(np, "reset-gpio", 0);
|
|
imx6_pcie->reset_gpio = of_get_named_gpio(np, "reset-gpio", 0);
|
|
|
|
+ imx6_pcie->gpio_active_high = of_property_read_bool(np,
|
|
|
|
+ "reset-gpio-active-high");
|
|
if (gpio_is_valid(imx6_pcie->reset_gpio)) {
|
|
if (gpio_is_valid(imx6_pcie->reset_gpio)) {
|
|
ret = devm_gpio_request_one(&pdev->dev, imx6_pcie->reset_gpio,
|
|
ret = devm_gpio_request_one(&pdev->dev, imx6_pcie->reset_gpio,
|
|
- GPIOF_OUT_INIT_LOW, "PCIe reset");
|
|
|
|
|
|
+ imx6_pcie->gpio_active_high ?
|
|
|
|
+ GPIOF_OUT_INIT_HIGH :
|
|
|
|
+ GPIOF_OUT_INIT_LOW,
|
|
|
|
+ "PCIe reset");
|
|
if (ret) {
|
|
if (ret) {
|
|
dev_err(&pdev->dev, "unable to get reset gpio\n");
|
|
dev_err(&pdev->dev, "unable to get reset gpio\n");
|
|
return ret;
|
|
return ret;
|