diff mbox

[2/5] rt2x00: rt2800 - Fix default vgc values for RT3572

Message ID 1347827393-26948-3-git-send-email-gwingerde@gmail.com (mailing list archive)
State Not Applicable, archived
Headers show

Commit Message

Gertjan van Wingerde Sept. 16, 2012, 8:29 p.m. UTC 
Align with the values used by the RT3572 Ralink vendor driver v2.5.0.0.

Signed-off-by: Gertjan van Wingerde <gwingerde@gmail.com>

Comments

Ivo van Doorn Sept. 17, 2012, 3:27 p.m. UTC | #1 
On Sun, Sep 16, 2012 at 10:29 PM, Gertjan van Wingerde
<gwingerde@gmail.com> wrote:
> Align with the values used by the RT3572 Ralink vendor driver v2.5.0.0.
>
> Signed-off-by: Gertjan van Wingerde <gwingerde@gmail.com>

Acked-by: Ivo van Doorn <IvDoorn@gmail.com>

> diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c
> index cec4a99..17b8a28 100644
> --- a/drivers/net/wireless/rt2x00/rt2800lib.c
> +++ b/drivers/net/wireless/rt2x00/rt2800lib.c
> @@ -2904,16 +2904,21 @@ static u8 rt2800_get_default_vgc(struct rt2x00_dev *rt2x00dev)
>                     rt2x00_rt(rt2x00dev, RT3090) ||
>                     rt2x00_rt(rt2x00dev, RT3290) ||
>                     rt2x00_rt(rt2x00dev, RT3390) ||
> +                   rt2x00_rt(rt2x00dev, RT3572) ||
>                     rt2x00_rt(rt2x00dev, RT5390) ||
>                     rt2x00_rt(rt2x00dev, RT5392))
>                         vgc = 0x1c + (2 * rt2x00dev->lna_gain);
>                 else
>                         vgc = 0x2e + rt2x00dev->lna_gain;
>         } else { /* 5GHZ band */
> -               if (!test_bit(CONFIG_CHANNEL_HT40, &rt2x00dev->flags))
> -                       vgc = 0x32 + (rt2x00dev->lna_gain * 5) / 3;
> -               else
> -                       vgc = 0x3a + (rt2x00dev->lna_gain * 5) / 3;
> +               if (rt2x00_rt(rt2x00dev, RT3572))
> +                       vgc = 0x22 + (rt2x00dev->lna_gain * 5) / 3;
> +               else {
> +                       if (!test_bit(CONFIG_CHANNEL_HT40, &rt2x00dev->flags))
> +                               vgc = 0x32 + (rt2x00dev->lna_gain * 5) / 3;
> +                       else
> +                               vgc = 0x3a + (rt2x00dev->lna_gain * 5) / 3;
> +               }
>         }
>
>         return vgc;
> --
> 1.7.11.1
>
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c
index cec4a99..17b8a28 100644
--- a/drivers/net/wireless/rt2x00/rt2800lib.c
+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
@@ -2904,16 +2904,21 @@  static u8 rt2800_get_default_vgc(struct rt2x00_dev *rt2x00dev)
 		    rt2x00_rt(rt2x00dev, RT3090) ||
 		    rt2x00_rt(rt2x00dev, RT3290) ||
 		    rt2x00_rt(rt2x00dev, RT3390) ||
+		    rt2x00_rt(rt2x00dev, RT3572) ||
 		    rt2x00_rt(rt2x00dev, RT5390) ||
 		    rt2x00_rt(rt2x00dev, RT5392))
 			vgc = 0x1c + (2 * rt2x00dev->lna_gain);
 		else
 			vgc = 0x2e + rt2x00dev->lna_gain;
 	} else { /* 5GHZ band */
-		if (!test_bit(CONFIG_CHANNEL_HT40, &rt2x00dev->flags))
-			vgc = 0x32 + (rt2x00dev->lna_gain * 5) / 3;
-		else
-			vgc = 0x3a + (rt2x00dev->lna_gain * 5) / 3;
+		if (rt2x00_rt(rt2x00dev, RT3572))
+			vgc = 0x22 + (rt2x00dev->lna_gain * 5) / 3;
+		else {
+			if (!test_bit(CONFIG_CHANNEL_HT40, &rt2x00dev->flags))
+				vgc = 0x32 + (rt2x00dev->lna_gain * 5) / 3;
+			else
+				vgc = 0x3a + (rt2x00dev->lna_gain * 5) / 3;
+		}
 	}
 
 	return vgc;