Commit d980b8d1 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'MDIO-bus-reset-GPIO-cleanups' 



Sergei Shtylyov says:

====================
MDIO bus reset GPIO cleanups

Commit 4c5e7a2c ("dt-bindings: mdio: Clarify binding document")
declared that a MDIO reset GPIO property should have only a single GPIO
reference/specifier, however the supporting code was left intact...
Here's a couple of the obvious cleanups to that code:

[1/2] mdio_bus: handle only single PHY reset GPIO
[2/2] mdio_bus: use devm_gpiod_get_optional()
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 61d3e1d9 fe0e4052

drivers/net/phy/mdio_bus.c

+16 −35
Original line number Diff line number Diff line
@@ -353,34 +353,19 @@ int __mdiobus_register(struct mii_bus *bus, struct module *owner) 


	mutex_init(&bus->mdio_lock);



	/* de-assert bus level PHY GPIO resets */

	if (bus->num_reset_gpios > 0) {

		bus->reset_gpiod = devm_kcalloc(&bus->dev,

						 bus->num_reset_gpios,

						 sizeof(struct gpio_desc *),

						 GFP_KERNEL);

		if (!bus->reset_gpiod)

			return -ENOMEM;

	}



	for (i = 0; i < bus->num_reset_gpios; i++) {

		gpiod = devm_gpiod_get_index(&bus->dev, "reset", i,

					     GPIOD_OUT_LOW);

	/* de-assert bus level PHY GPIO reset */

	gpiod = devm_gpiod_get_optional(&bus->dev, "reset", GPIOD_OUT_LOW);

	if (IS_ERR(gpiod)) {

			err = PTR_ERR(gpiod);

			if (err != -ENOENT) {

				dev_err(&bus->dev,

					"mii_bus %s couldn't get reset GPIO\n",

		dev_err(&bus->dev, "mii_bus %s couldn't get reset GPIO\n",

			bus->id);

				return err;

			}

		} else {

			bus->reset_gpiod[i] = gpiod;

		return PTR_ERR(gpiod);

	} else	if (gpiod) {

		bus->reset_gpiod = gpiod;



		gpiod_set_value_cansleep(gpiod, 1);

		udelay(bus->reset_delay_us);

		gpiod_set_value_cansleep(gpiod, 0);

	}

	}



	if (bus->reset)

		bus->reset(bus);
@@ -414,10 +399,8 @@ error: 
	}



	/* Put PHYs in RESET to save power */

	for (i = 0; i < bus->num_reset_gpios; i++) {

		if (bus->reset_gpiod[i])

			gpiod_set_value_cansleep(bus->reset_gpiod[i], 1);

	}

	if (bus->reset_gpiod)

		gpiod_set_value_cansleep(bus->reset_gpiod, 1);



	device_del(&bus->dev);

	return err;
@@ -442,10 +425,8 @@ void mdiobus_unregister(struct mii_bus *bus) 
	}



	/* Put PHYs in RESET to save power */

	for (i = 0; i < bus->num_reset_gpios; i++) {

		if (bus->reset_gpiod[i])

			gpiod_set_value_cansleep(bus->reset_gpiod[i], 1);

	}

	if (bus->reset_gpiod)

		gpiod_set_value_cansleep(bus->reset_gpiod, 1);



	device_del(&bus->dev);

}

drivers/of/of_mdio.c

+0 −1
Original line number Diff line number Diff line
@@ -226,7 +226,6 @@ int of_mdiobus_register(struct mii_bus *mdio, struct device_node *np) 
	/* Get bus level PHY reset GPIO details */

	mdio->reset_delay_us = DEFAULT_GPIO_RESET_DELAY;

	of_property_read_u32(np, "reset-delay-us", &mdio->reset_delay_us);

	mdio->num_reset_gpios = of_gpio_named_count(np, "reset-gpios");



	/* Register the MDIO bus */

	rc = mdiobus_register(mdio);

include/linux/phy.h

+2 −4
Original line number Diff line number Diff line
@@ -226,10 +226,8 @@ struct mii_bus { 


	/* GPIO reset pulse width in microseconds */

	int reset_delay_us;

	/* Number of reset GPIOs */

	int num_reset_gpios;

	/* Array of RESET GPIO descriptors */

	struct gpio_desc **reset_gpiod;

	/* RESET GPIO descriptor pointer */

	struct gpio_desc *reset_gpiod;

};

#define to_mii_bus(d) container_of(d, struct mii_bus, dev)

CRA Git | Maintained and supported by SUSTech CRA and CCSE