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

Commit 412512c4 authored by Rafał Miłecki's avatar Rafał Miłecki Committed by Kishon Vijay Abraham I
Browse files

phy: bcm-ns-usb3: always wait for idle after writing to the PHY reg 



Move MDIO specific code to the writing helper function. This makes init
code a bit more generic and doesn't require it to track what happens
after every write.

Signed-off-by: default avatarRafał Miłecki <rafal@milecki.pl>
Signed-off-by: default avatarKishon Vijay Abraham I <kishon@ti.com>
parent 80886f7c

drivers/phy/broadcom/phy-bcm-ns-usb3.c

+1 −10
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ static int bcm_ns_usb3_mdio_phy_write(struct bcm_ns_usb3 *usb3, u16 reg, 
	tmp |= value;

	writel(tmp, usb3->ccb_mii + BCMA_CCB_MII_MNG_CMD_DATA);



	return 0;

	return bcm_ns_usb3_mii_mng_wait_idle(usb3);

}



static int bcm_ns_usb3_phy_init_ns_bx(struct bcm_ns_usb3 *usb3)
@@ -143,9 +143,6 @@ static int bcm_ns_usb3_phy_init_ns_bx(struct bcm_ns_usb3 *usb3) 
	/* Deaaserting PLL Reset */

	bcm_ns_usb3_mdio_phy_write(usb3, BCM_NS_USB3_PLLA_CONTROL1, 0x8000);



	/* Waiting MII Mgt interface idle */

	bcm_ns_usb3_mii_mng_wait_idle(usb3);



	/* Deasserting USB3 system reset */

	writel(0, usb3->dmp + BCMA_RESET_CTL);
@@ -169,9 +166,6 @@ static int bcm_ns_usb3_phy_init_ns_bx(struct bcm_ns_usb3 *usb3) 
	/* Enabling SSC */

	bcm_ns_usb3_mdio_phy_write(usb3, BCM_NS_USB3_TX_PMD_CONTROL1, 0x1003);



	/* Waiting MII Mgt interface idle */

	bcm_ns_usb3_mii_mng_wait_idle(usb3);



	return 0;

}
@@ -205,9 +199,6 @@ static int bcm_ns_usb3_phy_init_ns_ax(struct bcm_ns_usb3 *usb3) 


	bcm_ns_usb3_mdio_phy_write(usb3, BCM_NS_USB3_TX_PMD_CONTROL1, 0x1003);



	/* Waiting MII Mgt interface idle */

	bcm_ns_usb3_mii_mng_wait_idle(usb3);



	/* Deasserting USB3 system reset */

	writel(0, usb3->dmp + BCMA_RESET_CTL);