[rt2x00-users] [PATCH 3/3] rt2x00: Add antenna setting for RT3070/RT3090 with RX antenna diversity support
Helmut Schaa
helmut.schaa at googlemail.com
Mon Jan 17 19:59:11 EST 2011
Hi Jay,
Am Montag, 17. Januar 2011 schrieb Jay_Hung at ralinktech.com:
> From: RA-Jay Hung <jay_hung at ralinktech.com>
>
> For RT3070/RT3090 with RX antenna diversity support, we must select
> default antenna using gpio control way even if we do not turn on
> antenna diversity feature.
I haven't reviewed that one in detail just some small comments.
> Signed-off-by: RA-Jay Hung <jay_hung at ralinktech.com>
> ---
> drivers/net/wireless/rt2x00/rt2800.h | 3 +
> drivers/net/wireless/rt2x00/rt2800lib.c | 64 ++++++++++++++++++++++++++----
> drivers/net/wireless/rt2x00/rt2x00.h | 2 +
> 3 files changed, 60 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/net/wireless/rt2x00/rt2800.h b/drivers/net/wireless/rt2x00/rt2800.h
> index 094db1a..ec5624d 100644
> --- a/drivers/net/wireless/rt2x00/rt2800.h
> +++ b/drivers/net/wireless/rt2x00/rt2800.h
> @@ -270,6 +270,7 @@
>
> /*
> * GPIO_CTRL_CFG:
> + * GPIOD: GPIO direction, 0: Output, 1: Input
> */
> #define GPIO_CTRL_CFG 0x0228
> #define GPIO_CTRL_CFG_BIT0 FIELD32(0x00000001)
> @@ -281,6 +282,7 @@
> #define GPIO_CTRL_CFG_BIT6 FIELD32(0x00000040)
> #define GPIO_CTRL_CFG_BIT7 FIELD32(0x00000080)
> #define GPIO_CTRL_CFG_BIT8 FIELD32(0x00000100)
> +#define GPIO_CTRL_CFG_GPIOD FIELD32(0x00000800)
>
> /*
> * MCU_CMD_CFG
> @@ -2068,6 +2070,7 @@ struct mac_iveiv_entry {
> #define MCU_LED_LED_POLARITY 0x54
> #define MCU_RADAR 0x60
> #define MCU_BOOT_SIGNAL 0x72
> +#define MCU_ANT_SELECT 0X73
> #define MCU_BBP_SIGNAL 0x80
> #define MCU_POWER_SAVE 0x83
>
> diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c
> index c3cac3d..4befc07 100644
> --- a/drivers/net/wireless/rt2x00/rt2800lib.c
> +++ b/drivers/net/wireless/rt2x00/rt2800lib.c
> @@ -1550,10 +1550,30 @@ void rt2800_config_erp(struct rt2x00_dev *rt2x00dev, struct rt2x00lib_erp *erp,
> }
> EXPORT_SYMBOL_GPL(rt2800_config_erp);
>
> +static void rt2800_set_ant_diversity(struct rt2x00_dev *rt2x00dev, enum antenna ant)
> +{
> + u32 reg;
> + u8 eesk_pin = (ant == ANTENNA_A) ? 1 : 0;
> + u8 gpio_bit3 = (ant == ANTENNA_A) ? 0 : 1;
> +
> + if (rt2x00_is_pci(rt2x00dev)) {
> + rt2800_register_read(rt2x00dev, E2PROM_CSR, ®);
> + rt2x00_set_field32(®, E2PROM_CSR_DATA_CLOCK, eesk_pin);
> + rt2800_register_write(rt2x00dev, E2PROM_CSR, reg);
> + } else if (rt2x00_is_usb(rt2x00dev))
> + rt2800_mcu_request(rt2x00dev, MCU_ANT_SELECT, 0xff, eesk_pin, 0);
> +
> + rt2800_register_read(rt2x00dev, GPIO_CTRL_CFG, ®);
> + rt2x00_set_field32(®, GPIO_CTRL_CFG_GPIOD, 1);
> + rt2x00_set_field32(®, GPIO_CTRL_CFG_BIT3, gpio_bit3);
> + rt2800_register_write(rt2x00dev, GPIO_CTRL_CFG, reg);
> +}
> +
> void rt2800_config_ant(struct rt2x00_dev *rt2x00dev, struct antenna_setup *ant)
> {
> u8 r1;
> u8 r3;
> + u16 eeprom;
>
> rt2800_bbp_read(rt2x00dev, 1, &r1);
> rt2800_bbp_read(rt2x00dev, 3, &r3);
> @@ -1561,7 +1581,7 @@ void rt2800_config_ant(struct rt2x00_dev *rt2x00dev, struct antenna_setup *ant)
> /*
> * Configure the TX antenna.
> */
> - switch ((int)ant->tx) {
> + switch (ant->tx_chain_num) {
> case 1:
> rt2x00_set_field8(&r1, BBP1_TX_ANTENNA, 0);
> break;
> @@ -1576,8 +1596,13 @@ void rt2800_config_ant(struct rt2x00_dev *rt2x00dev, struct antenna_setup *ant)
> /*
> * Configure the RX antenna.
> */
> - switch ((int)ant->rx) {
> + switch (ant->rx_chain_num) {
> case 1:
> + rt2x00_eeprom_read(rt2x00dev, EEPROM_NIC_CONF1, &eeprom);
> + if (rt2x00_rt(rt2x00dev, RT3070) || rt2x00_rt(rt2x00dev, RT3090)) {
> + if (rt2x00_get_field16(eeprom, EEPROM_NIC_CONF1_ANT_DIVERSITY))
> + rt2800_set_ant_diversity(rt2x00dev, rt2x00dev->default_ant.rx);
> + }
> rt2x00_set_field8(&r3, BBP3_RX_ANTENNA, 0);
> break;
> case 2:
> @@ -1623,13 +1648,13 @@ static void rt2800_config_channel_rf2xxx(struct rt2x00_dev *rt2x00dev,
> {
> rt2x00_set_field32(&rf->rf4, RF4_FREQ_OFFSET, rt2x00dev->freq_offset);
>
> - if (rt2x00dev->default_ant.tx == 1)
> + if (rt2x00dev->default_ant.tx_chain_num == 1)
> rt2x00_set_field32(&rf->rf2, RF2_ANTENNA_TX1, 1);
>
> - if (rt2x00dev->default_ant.rx == 1) {
> + if (rt2x00dev->default_ant.rx_chain_num == 1) {
> rt2x00_set_field32(&rf->rf2, RF2_ANTENNA_RX1, 1);
> rt2x00_set_field32(&rf->rf2, RF2_ANTENNA_RX2, 1);
> - } else if (rt2x00dev->default_ant.rx == 2)
> + } else if (rt2x00dev->default_ant.rx_chain_num == 2)
> rt2x00_set_field32(&rf->rf2, RF2_ANTENNA_RX2, 1);
>
> if (rf->channel > 14) {
> @@ -1776,13 +1801,13 @@ static void rt2800_config_channel(struct rt2x00_dev *rt2x00dev,
> tx_pin = 0;
>
> /* Turn on unused PA or LNA when not using 1T or 1R */
> - if (rt2x00dev->default_ant.tx != 1) {
> + if (rt2x00dev->default_ant.tx_chain_num == 2) {
> rt2x00_set_field32(&tx_pin, TX_PIN_CFG_PA_PE_A1_EN, 1);
> rt2x00_set_field32(&tx_pin, TX_PIN_CFG_PA_PE_G1_EN, 1);
> }
>
> /* Turn on unused PA or LNA when not using 1T or 1R */
> - if (rt2x00dev->default_ant.rx != 1) {
> + if (rt2x00dev->default_ant.rx_chain_num == 2) {
> rt2x00_set_field32(&tx_pin, TX_PIN_CFG_LNA_PE_A1_EN, 1);
> rt2x00_set_field32(&tx_pin, TX_PIN_CFG_LNA_PE_G1_EN, 1);
> }
> @@ -3195,11 +3220,32 @@ int rt2800_init_eeprom(struct rt2x00_dev *rt2x00dev)
> /*
> * Identify default antenna configuration.
> */
> - rt2x00dev->default_ant.tx =
> + rt2x00dev->default_ant.tx_chain_num =
> rt2x00_get_field16(eeprom, EEPROM_NIC_CONF0_TXPATH);
> - rt2x00dev->default_ant.rx =
> + rt2x00dev->default_ant.rx_chain_num =
> rt2x00_get_field16(eeprom, EEPROM_NIC_CONF0_RXPATH);
>
> + rt2x00_eeprom_read(rt2x00dev, EEPROM_NIC_CONF1, &eeprom);
> +
> + if (rt2x00_rt(rt2x00dev, RT3070) || rt2x00_rt(rt2x00dev, RT3090)) {
Is this really only valid for RT3070 and RT3090?
> + value = rt2x00_get_field16(eeprom, EEPROM_NIC_CONF1_ANT_DIVERSITY);
> + switch (value) {
> + case 0:
> + case 1:
> + case 2:
> + rt2x00dev->default_ant.tx = ANTENNA_A;
> + rt2x00dev->default_ant.rx = ANTENNA_A;
> + break;
> + case 3:
> + rt2x00dev->default_ant.tx = ANTENNA_A;
> + rt2x00dev->default_ant.rx = ANTENNA_B;
> + break;
> + }
> + } else {
> + rt2x00dev->default_ant.tx = ANTENNA_A;
> + rt2x00dev->default_ant.rx = ANTENNA_A;
> + }
> +
> /*
> * Read frequency offset and RF programming sequence.
> */
> diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
> index 96c2edd..0ed4f27 100644
> --- a/drivers/net/wireless/rt2x00/rt2x00.h
> +++ b/drivers/net/wireless/rt2x00/rt2x00.h
> @@ -225,6 +225,8 @@ struct channel_info {
> struct antenna_setup {
> enum antenna rx;
> enum antenna tx;
> + u8 rx_chain_num;
> + u8 tx_chain_num;
Mind to explain why this is needed?
Thanks,
Helmut
More information about the users
mailing list