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

Commit ff3cbc2c authored by Andrea Merello's avatar Andrea Merello Committed by John W. Linville
Browse files

rtl8180: introduce functions for setting ANAPARAM 2 and 3 params 



rtl8180 has one register for analog converters setting ,rtl8185 has
two and rtl8187se has three.
Setting those registers require more than a simple write, and for
one of them a function is already provided.
This patch introduces functions for the other two.
rtl8187se will use them. rtl8185 doesen't yet, but should

Signed-off-by: default avatarAndrea Merello <andrea.merello@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent fc32ac91

drivers/net/wireless/rtl818x/rtl8180/dev.c

+40 −0
Original line number Original line Diff line number Diff line
@@ -523,6 +523,46 @@ static void rtl8180_tx(struct ieee80211_hw *dev, 
	}

	}

}

}





static void rtl8180_set_anaparam3(struct rtl8180_priv *priv, u16 anaparam3)

{

	u8 reg;



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

			 RTL818X_EEPROM_CMD_CONFIG);



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

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

		 reg | RTL818X_CONFIG3_ANAPARAM_WRITE);



	rtl818x_iowrite16(priv, &priv->map->ANAPARAM3, anaparam3);



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

		 reg & ~RTL818X_CONFIG3_ANAPARAM_WRITE);



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

			 RTL818X_EEPROM_CMD_NORMAL);

}



void rtl8180_set_anaparam2(struct rtl8180_priv *priv, u32 anaparam2)

{

	u8 reg;



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

			 RTL818X_EEPROM_CMD_CONFIG);



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

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

		 reg | RTL818X_CONFIG3_ANAPARAM_WRITE);



	rtl818x_iowrite32(priv, &priv->map->ANAPARAM2, anaparam2);



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

		 reg & ~RTL818X_CONFIG3_ANAPARAM_WRITE);



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

			 RTL818X_EEPROM_CMD_NORMAL);

}



void rtl8180_set_anaparam(struct rtl8180_priv *priv, u32 anaparam)

void rtl8180_set_anaparam(struct rtl8180_priv *priv, u32 anaparam)

{

{

	u8 reg;

	u8 reg;

drivers/net/wireless/rtl818x/rtl8180/rtl8180.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -145,6 +145,7 @@ struct rtl8180_priv { 




void rtl8180_write_phy(struct ieee80211_hw *dev, u8 addr, u32 data);

void rtl8180_write_phy(struct ieee80211_hw *dev, u8 addr, u32 data);

void rtl8180_set_anaparam(struct rtl8180_priv *priv, u32 anaparam);

void rtl8180_set_anaparam(struct rtl8180_priv *priv, u32 anaparam);

void rtl8180_set_anaparam2(struct rtl8180_priv *priv, u32 anaparam2);





static inline u8 rtl818x_ioread8(struct rtl8180_priv *priv, u8 __iomem *addr)

static inline u8 rtl818x_ioread8(struct rtl8180_priv *priv, u8 __iomem *addr)

{

{

drivers/net/wireless/rtl818x/rtl8180/rtl8225.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -282,6 +282,7 @@ static void rtl8225_rf_set_tx_power(struct ieee80211_hw *dev, int channel) 




	msleep(1); /* FIXME: optional? */

	msleep(1); /* FIXME: optional? */





	/* TODO: use set_anaparam2 dev.c_func*/

	/* anaparam2 on */

	/* anaparam2 on */

	rtl818x_iowrite8(priv, &priv->map->EEPROM_CMD, RTL818X_EEPROM_CMD_CONFIG);

	rtl818x_iowrite8(priv, &priv->map->EEPROM_CMD, RTL818X_EEPROM_CMD_CONFIG);

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

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