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

Commit c292188e authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "net: phy: Add skip sw reset capability"

parents 40cc9d35 cf163a84

drivers/net/phy/phy_device.c

+8 −6
Original line number Diff line number Diff line
@@ -852,6 +852,7 @@ int phy_init_hw(struct phy_device *phydev) 
	if (!phydev->drv || !phydev->drv->config_init)

		return 0;



	if (!phydev->skip_sw_reset) {

		if (phydev->drv->soft_reset)

			ret = phydev->drv->soft_reset(phydev);

		else
@@ -859,6 +860,7 @@ int phy_init_hw(struct phy_device *phydev) 


		if (ret < 0)

			return ret;

	}



	ret = phy_scan_fixups(phydev);

	if (ret < 0)

include/linux/phy.h

+1 −0
Original line number Diff line number Diff line
@@ -412,6 +412,7 @@ struct phy_device { 
	bool suspended;

	bool sysfs_links;

	bool loopback_enabled;

	bool skip_sw_reset;



	enum phy_state state;