Commit 160396a7 authored by David S. Miller's avatar David S. Miller

Revert "net: phy: mdio-gpio: Fix working over slow can_sleep GPIOs"

This reverts commit dfa0d55f.

Discussion still ongoing, I shouldn't have applied this.
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5594923f
...@@ -63,7 +63,7 @@ static void mdio_dir(struct mdiobb_ctrl *ctrl, int dir) ...@@ -63,7 +63,7 @@ static void mdio_dir(struct mdiobb_ctrl *ctrl, int dir)
* assume the pin serves as pull-up. If direction is * assume the pin serves as pull-up. If direction is
* output, the default value is high. * output, the default value is high.
*/ */
gpiod_set_value_cansleep(bitbang->mdo, 1); gpiod_set_value(bitbang->mdo, 1);
return; return;
} }
...@@ -78,7 +78,7 @@ static int mdio_get(struct mdiobb_ctrl *ctrl) ...@@ -78,7 +78,7 @@ static int mdio_get(struct mdiobb_ctrl *ctrl)
struct mdio_gpio_info *bitbang = struct mdio_gpio_info *bitbang =
container_of(ctrl, struct mdio_gpio_info, ctrl); container_of(ctrl, struct mdio_gpio_info, ctrl);
return gpiod_get_value_cansleep(bitbang->mdio); return gpiod_get_value(bitbang->mdio);
} }
static void mdio_set(struct mdiobb_ctrl *ctrl, int what) static void mdio_set(struct mdiobb_ctrl *ctrl, int what)
...@@ -87,9 +87,9 @@ static void mdio_set(struct mdiobb_ctrl *ctrl, int what) ...@@ -87,9 +87,9 @@ static void mdio_set(struct mdiobb_ctrl *ctrl, int what)
container_of(ctrl, struct mdio_gpio_info, ctrl); container_of(ctrl, struct mdio_gpio_info, ctrl);
if (bitbang->mdo) if (bitbang->mdo)
gpiod_set_value_cansleep(bitbang->mdo, what); gpiod_set_value(bitbang->mdo, what);
else else
gpiod_set_value_cansleep(bitbang->mdio, what); gpiod_set_value(bitbang->mdio, what);
} }
static void mdc_set(struct mdiobb_ctrl *ctrl, int what) static void mdc_set(struct mdiobb_ctrl *ctrl, int what)
...@@ -97,7 +97,7 @@ static void mdc_set(struct mdiobb_ctrl *ctrl, int what) ...@@ -97,7 +97,7 @@ static void mdc_set(struct mdiobb_ctrl *ctrl, int what)
struct mdio_gpio_info *bitbang = struct mdio_gpio_info *bitbang =
container_of(ctrl, struct mdio_gpio_info, ctrl); container_of(ctrl, struct mdio_gpio_info, ctrl);
gpiod_set_value_cansleep(bitbang->mdc, what); gpiod_set_value(bitbang->mdc, what);
} }
static const struct mdiobb_ops mdio_gpio_ops = { static const struct mdiobb_ops mdio_gpio_ops = {
...@@ -162,10 +162,6 @@ static int mdio_gpio_probe(struct platform_device *pdev) ...@@ -162,10 +162,6 @@ static int mdio_gpio_probe(struct platform_device *pdev)
if (ret) if (ret)
return ret; return ret;
if (gpiod_cansleep(bitbang->mdc) || gpiod_cansleep(bitbang->mdio) ||
gpiod_cansleep(bitbang->mdo))
dev_warn(&pdev->dev, "Slow GPIO pins might wreak havoc into MDIO bus timing");
if (pdev->dev.of_node) { if (pdev->dev.of_node) {
bus_id = of_alias_get_id(pdev->dev.of_node, "mdio-gpio"); bus_id = of_alias_get_id(pdev->dev.of_node, "mdio-gpio");
if (bus_id < 0) { if (bus_id < 0) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment