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

Commit 83b5db89 authored by David Woodhouse's avatar David Woodhouse Committed by John W. Linville
Browse files

[PATCH] bcm43xx: Fix machine check on PPC for version 1 PHY 



Recent changes in the specs that were introduced in commit
740ac4fb were incorrect and resulted in machine check
errors on the PPC architecture for G PHY's with a revision number equal to 1. The
two offending changes are reverted.

Signed-off-by: default avatarDavid Woodhouse <dwmw2@infradead.org>
Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 7265c5d1

drivers/net/wireless/bcm43xx/bcm43xx_phy.c

+2 −2
Original line number Diff line number Diff line
@@ -757,7 +757,7 @@ static void bcm43xx_phy_initb5(struct bcm43xx_private *bcm) 
	if (radio->version == 0x2050)

		bcm43xx_phy_write(bcm, 0x0038, 0x0667);



	if (phy->type == BCM43xx_PHYTYPE_G) {

	if (phy->connected) {

		if (radio->version == 0x2050) {

			bcm43xx_radio_write16(bcm, 0x007A,

					      bcm43xx_radio_read16(bcm, 0x007A)
@@ -1192,7 +1192,7 @@ static void bcm43xx_phy_initg(struct bcm43xx_private *bcm) 
		bcm43xx_phy_write(bcm, 0x0811, 0x0400);

		bcm43xx_phy_write(bcm, 0x0015, 0x00C0);

	}

	if (phy->connected) {

	if (phy->rev >= 2 && phy->connected) {

		tmp = bcm43xx_phy_read(bcm, 0x0400) & 0xFF;

		if (tmp < 6) {

			bcm43xx_phy_write(bcm, 0x04C2, 0x1816);