aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabio Estevam <fabio.estevam@freescale.com>2014-01-05 19:08:25 -0500
committerDavid S. Miller <davem@davemloft.net>2014-01-05 20:24:28 -0500
commit7d30622dbe64a7207af8a98f48d4a4ef00ab658a (patch)
tree644d5f4bdb10ef876a5dfda894bf13dd5c76d09c
parent723a6c7a297b509d6d779aba3be3a0fb8c374d99 (diff)
fec: Revert "fec: Do not assume that PHY reset is active low"
In order to keep DT compatibility we need to revert this, otherwise the original dts files will no longer work with this driver change. This reverts commit 7a399e3a2e05bc580a78ea72371b3896827f72e1. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ethernet/freescale/fec_main.c14
1 files changed, 4 insertions, 10 deletions
diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c
index 45b8b22b9987..50bb71c663e2 100644
--- a/drivers/net/ethernet/freescale/fec_main.c
+++ b/drivers/net/ethernet/freescale/fec_main.c
@@ -2049,8 +2049,6 @@ static void fec_reset_phy(struct platform_device *pdev)
2049 int err, phy_reset; 2049 int err, phy_reset;
2050 int msec = 1; 2050 int msec = 1;
2051 struct device_node *np = pdev->dev.of_node; 2051 struct device_node *np = pdev->dev.of_node;
2052 enum of_gpio_flags flags;
2053 bool port;
2054 2052
2055 if (!np) 2053 if (!np)
2056 return; 2054 return;
@@ -2060,22 +2058,18 @@ static void fec_reset_phy(struct platform_device *pdev)
2060 if (msec > 1000) 2058 if (msec > 1000)
2061 msec = 1; 2059 msec = 1;
2062 2060
2063 phy_reset = of_get_named_gpio_flags(np, "phy-reset-gpios", 0, &flags); 2061 phy_reset = of_get_named_gpio(np, "phy-reset-gpios", 0);
2064 if (!gpio_is_valid(phy_reset)) 2062 if (!gpio_is_valid(phy_reset))
2065 return; 2063 return;
2066 2064
2067 if (flags & OF_GPIO_ACTIVE_LOW) 2065 err = devm_gpio_request_one(&pdev->dev, phy_reset,
2068 port = GPIOF_OUT_INIT_LOW; 2066 GPIOF_OUT_INIT_LOW, "phy-reset");
2069 else
2070 port = GPIOF_OUT_INIT_HIGH;
2071
2072 err = devm_gpio_request_one(&pdev->dev, phy_reset, port, "phy-reset");
2073 if (err) { 2067 if (err) {
2074 dev_err(&pdev->dev, "failed to get phy-reset-gpios: %d\n", err); 2068 dev_err(&pdev->dev, "failed to get phy-reset-gpios: %d\n", err);
2075 return; 2069 return;
2076 } 2070 }
2077 msleep(msec); 2071 msleep(msec);
2078 gpio_set_value(phy_reset, !port); 2072 gpio_set_value(phy_reset, 1);
2079} 2073}
2080#else /* CONFIG_OF */ 2074#else /* CONFIG_OF */
2081static void fec_reset_phy(struct platform_device *pdev) 2075static void fec_reset_phy(struct platform_device *pdev)