Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 79abb48a authored by Martin Schiller's avatar Martin Schiller Committed by Greg Kroah-Hartman
Browse files

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



[ Upstream commit df5a8ec64eed7fe45b556cfff503acd6429ab817 ]

Up until commit 7e5fbd1e ("net: mdio-gpio: Convert to use gpiod
functions where possible"), the _cansleep variants of the gpio_ API was
used. After that commit and the change to gpiod_ API, the _cansleep()
was dropped. This then results in WARN_ON() when used with GPIO
devices which do sleep. Add back the _cansleep() to avoid this.

Fixes: 7e5fbd1e ("net: mdio-gpio: Convert to use gpiod functions where possible")
Signed-off-by: default avatarMartin Schiller <ms@dev.tdt.de>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5811532f

drivers/net/phy/mdio-gpio.c

+5 −5
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ static void mdio_dir(struct mdiobb_ctrl *ctrl, int dir) 
		 * assume the pin serves as pull-up. If direction is

		 * output, the default value is high.

		 */

		gpiod_set_value(bitbang->mdo, 1);

		gpiod_set_value_cansleep(bitbang->mdo, 1);

		return;

	}
@@ -78,7 +78,7 @@ static int mdio_get(struct mdiobb_ctrl *ctrl) 
	struct mdio_gpio_info *bitbang =

		container_of(ctrl, struct mdio_gpio_info, ctrl);



	return gpiod_get_value(bitbang->mdio);

	return gpiod_get_value_cansleep(bitbang->mdio);

}



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);



	if (bitbang->mdo)

		gpiod_set_value(bitbang->mdo, what);

		gpiod_set_value_cansleep(bitbang->mdo, what);

	else

		gpiod_set_value(bitbang->mdio, what);

		gpiod_set_value_cansleep(bitbang->mdio, 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) 
	struct mdio_gpio_info *bitbang =

		container_of(ctrl, struct mdio_gpio_info, ctrl);



	gpiod_set_value(bitbang->mdc, what);

	gpiod_set_value_cansleep(bitbang->mdc, what);

}



static const struct mdiobb_ops mdio_gpio_ops = {