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

Commit 896cae65 authored by Herton Ronaldo Krzesinski's avatar Herton Ronaldo Krzesinski Committed by John W. Linville
Browse files

rtl8187: move pll reset at start out of ANAPARAM write 



On 8187B start, comment about pll reset, and move it out of ANAPARAM
write sequence, so that code is more readable.

Signed-off-by: default avatarHerton Ronaldo Krzesinski <herton@mandriva.com.br>
Acked-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent a8ff34e3

drivers/net/wireless/rtl818x/rtl8187_dev.c

+7 −8
Original line number Diff line number Diff line
@@ -742,7 +742,6 @@ static int rtl8187b_init_hw(struct ieee80211_hw *dev) 


	rtl818x_iowrite8(priv, &priv->map->EEPROM_CMD,

			 RTL818X_EEPROM_CMD_CONFIG);



	reg = rtl818x_ioread8(priv, &priv->map->CONFIG3);

	reg |= RTL818X_CONFIG3_ANAPARAM_WRITE | RTL818X_CONFIG3_GNT_SELECT;

	rtl818x_iowrite8(priv, &priv->map->CONFIG3, reg);
@@ -752,19 +751,19 @@ static int rtl8187b_init_hw(struct ieee80211_hw *dev) 
			  RTL8187B_RTL8225_ANAPARAM_ON);

	rtl818x_iowrite8(priv, &priv->map->ANAPARAM3,

			 RTL8187B_RTL8225_ANAPARAM3_ON);



	rtl818x_iowrite8(priv, (u8 *)0xFF61, 0x10);

	reg = rtl818x_ioread8(priv, (u8 *)0xFF62);

	rtl818x_iowrite8(priv, (u8 *)0xFF62, reg & ~(1 << 5));

	rtl818x_iowrite8(priv, (u8 *)0xFF62, reg | (1 << 5));



	reg = rtl818x_ioread8(priv, &priv->map->CONFIG3);

	reg &= ~RTL818X_CONFIG3_ANAPARAM_WRITE;

	rtl818x_iowrite8(priv, &priv->map->CONFIG3, reg);



	rtl818x_iowrite8(priv, &priv->map->EEPROM_CMD,

			 RTL818X_EEPROM_CMD_NORMAL);



	/* Reset PLL sequence on 8187B. Realtek note: reduces power

	 * consumption about 30 mA */

	rtl818x_iowrite8(priv, (u8 *)0xFF61, 0x10);

	reg = rtl818x_ioread8(priv, (u8 *)0xFF62);

	rtl818x_iowrite8(priv, (u8 *)0xFF62, reg & ~(1 << 5));

	rtl818x_iowrite8(priv, (u8 *)0xFF62, reg | (1 << 5));



	res = rtl8187_cmd_reset(dev);

	if (res)

		return res;