| Message ID | 1414667897-2277-1-git-send-email-xose.vazquez@gmail.com (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
On 10/30/2014, 12:18 PM, Xose Vazquez Perez wrote: > From: Canek Peláez Valdés <canek@ciencias.unam.mx> Hi, what is this, please? No commit message, no upstream SHA, we cannot take the two as they stand... > Cc: stable@vger.kernel.org > Acked-by: Stanislaw Gruszka <sgruszka@redhat.com> > Cc: Stanislaw Gruszka <sgruszka@redhat.com> > Cc: Helmut Schaa <helmut.schaa@googlemail.com> > Cc: John W. Linville <linville@tuxdriver.com> > Cc: users@rt2x00.serialmonkey.com > Cc: linux-wireless@vger.kernel.org > Signed-off-by: Canek Peláez Valdés <canek@ciencias.unam.mx> > Signed-off-by: John W. Linville <linville@tuxdriver.com> > --- > drivers/net/wireless/rt2x00/rt2800.h | 4 +++- > drivers/net/wireless/rt2x00/rt2800lib.c | 6 ++++++ > 2 files changed, 9 insertions(+), 1 deletion(-) > > diff --git a/drivers/net/wireless/rt2x00/rt2800.h b/drivers/net/wireless/rt2x00/rt2800.h > index a394a9a..b7434df 100644 > --- a/drivers/net/wireless/rt2x00/rt2800.h > +++ b/drivers/net/wireless/rt2x00/rt2800.h > @@ -52,6 +52,7 @@ > * RF5592 2.4G/5G 2T2R > * RF3070 2.4G 1T1R > * RF5360 2.4G 1T1R > + * RF5362 2.4G 1T1R > * RF5370 2.4G 1T1R > * RF5390 2.4G 1T1R > */ > @@ -72,6 +73,7 @@ > #define RF3070 0x3070 > #define RF3290 0x3290 > #define RF5360 0x5360 > +#define RF5362 0x5362 > #define RF5370 0x5370 > #define RF5372 0x5372 > #define RF5390 0x5390 > @@ -2145,7 +2147,7 @@ struct mac_iveiv_entry { > /* Bits [7-4] for RF3320 (RT3370/RT3390), on other chipsets reserved */ > #define RFCSR3_PA1_BIAS_CCK FIELD8(0x70) > #define RFCSR3_PA2_CASCODE_BIAS_CCKK FIELD8(0x80) > -/* Bits for RF3290/RF5360/RF5370/RF5372/RF5390/RF5392 */ > +/* Bits for RF3290/RF5360/RF5362/RF5370/RF5372/RF5390/RF5392 */ > #define RFCSR3_VCOCAL_EN FIELD8(0x80) > /* Bits for RF3050 */ > #define RFCSR3_BIT1 FIELD8(0x02) > diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c > index 893c9d5..9f57a2d 100644 > --- a/drivers/net/wireless/rt2x00/rt2800lib.c > +++ b/drivers/net/wireless/rt2x00/rt2800lib.c > @@ -3186,6 +3186,7 @@ static void rt2800_config_channel(struct rt2x00_dev *rt2x00dev, > break; > case RF3070: > case RF5360: > + case RF5362: > case RF5370: > case RF5372: > case RF5390: > @@ -3203,6 +3204,7 @@ static void rt2800_config_channel(struct rt2x00_dev *rt2x00dev, > rt2x00_rf(rt2x00dev, RF3290) || > rt2x00_rf(rt2x00dev, RF3322) || > rt2x00_rf(rt2x00dev, RF5360) || > + rt2x00_rf(rt2x00dev, RF5362) || > rt2x00_rf(rt2x00dev, RF5370) || > rt2x00_rf(rt2x00dev, RF5372) || > rt2x00_rf(rt2x00dev, RF5390) || > @@ -4317,6 +4319,7 @@ void rt2800_vco_calibration(struct rt2x00_dev *rt2x00dev) > case RF3070: > case RF3290: > case RF5360: > + case RF5362: > case RF5370: > case RF5372: > case RF5390: > @@ -7095,6 +7098,7 @@ static int rt2800_init_eeprom(struct rt2x00_dev *rt2x00dev) > case RF3320: > case RF3322: > case RF5360: > + case RF5362: > case RF5370: > case RF5372: > case RF5390: > @@ -7551,6 +7555,7 @@ static int rt2800_probe_hw_mode(struct rt2x00_dev *rt2x00dev) > case RF3320: > case RF3322: > case RF5360: > + case RF5362: > case RF5370: > case RF5372: > case RF5390: > @@ -7680,6 +7685,7 @@ static int rt2800_probe_hw_mode(struct rt2x00_dev *rt2x00dev) > case RF3070: > case RF3290: > case RF5360: > + case RF5362: > case RF5370: > case RF5372: > case RF5390: >
On Fri, Oct 31, 2014 at 10:47:12AM +0100, Jiri Slaby wrote: > On 10/30/2014, 12:18 PM, Xose Vazquez Perez wrote: > > From: Canek Peláez Valdés <canek@ciencias.unam.mx> > > Hi, what is this, please? No commit message, no upstream SHA, we cannot > take the two as they stand... This is: commit ac0372abf8524a7572a9cdaac6495eb2eba20457 Author: Canek Peláez Valdés <canek@ciencias.unam.mx> Date: Sun Aug 24 19:06:11 2014 -0500 rt2x00: support Ralink 5362. -- 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
On Fri, Oct 31, 2014 at 10:51:56AM +0100, Stanislaw Gruszka wrote: > > > > On Fri, Oct 31, 2014 at 10:47:12AM +0100, Jiri Slaby wrote: > > On 10/30/2014, 12:18 PM, Xose Vazquez Perez wrote: > > > From: Canek Peláez Valdés <canek@ciencias.unam.mx> > > > > Hi, what is this, please? No commit message, no upstream SHA, we cannot > > take the two as they stand... > > This is: > > commit ac0372abf8524a7572a9cdaac6495eb2eba20457 > Author: Canek Peláez Valdés <canek@ciencias.unam.mx> > Date: Sun Aug 24 19:06:11 2014 -0500 > > rt2x00: support Ralink 5362. > -- > To unsubscribe from this list: send the line "unsubscribe stable" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html Thanks, queuing this patch for the 3.16 kernel. Cheers, -- Luís -- 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 --git a/drivers/net/wireless/rt2x00/rt2800.h b/drivers/net/wireless/rt2x00/rt2800.h index a394a9a..b7434df 100644 --- a/drivers/net/wireless/rt2x00/rt2800.h +++ b/drivers/net/wireless/rt2x00/rt2800.h @@ -52,6 +52,7 @@ * RF5592 2.4G/5G 2T2R * RF3070 2.4G 1T1R * RF5360 2.4G 1T1R + * RF5362 2.4G 1T1R * RF5370 2.4G 1T1R * RF5390 2.4G 1T1R */ @@ -72,6 +73,7 @@ #define RF3070 0x3070 #define RF3290 0x3290 #define RF5360 0x5360 +#define RF5362 0x5362 #define RF5370 0x5370 #define RF5372 0x5372 #define RF5390 0x5390 @@ -2145,7 +2147,7 @@ struct mac_iveiv_entry { /* Bits [7-4] for RF3320 (RT3370/RT3390), on other chipsets reserved */ #define RFCSR3_PA1_BIAS_CCK FIELD8(0x70) #define RFCSR3_PA2_CASCODE_BIAS_CCKK FIELD8(0x80) -/* Bits for RF3290/RF5360/RF5370/RF5372/RF5390/RF5392 */ +/* Bits for RF3290/RF5360/RF5362/RF5370/RF5372/RF5390/RF5392 */ #define RFCSR3_VCOCAL_EN FIELD8(0x80) /* Bits for RF3050 */ #define RFCSR3_BIT1 FIELD8(0x02) diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c index 893c9d5..9f57a2d 100644 --- a/drivers/net/wireless/rt2x00/rt2800lib.c +++ b/drivers/net/wireless/rt2x00/rt2800lib.c @@ -3186,6 +3186,7 @@ static void rt2800_config_channel(struct rt2x00_dev *rt2x00dev, break; case RF3070: case RF5360: + case RF5362: case RF5370: case RF5372: case RF5390: @@ -3203,6 +3204,7 @@ static void rt2800_config_channel(struct rt2x00_dev *rt2x00dev, rt2x00_rf(rt2x00dev, RF3290) || rt2x00_rf(rt2x00dev, RF3322) || rt2x00_rf(rt2x00dev, RF5360) || + rt2x00_rf(rt2x00dev, RF5362) || rt2x00_rf(rt2x00dev, RF5370) || rt2x00_rf(rt2x00dev, RF5372) || rt2x00_rf(rt2x00dev, RF5390) || @@ -4317,6 +4319,7 @@ void rt2800_vco_calibration(struct rt2x00_dev *rt2x00dev) case RF3070: case RF3290: case RF5360: + case RF5362: case RF5370: case RF5372: case RF5390: @@ -7095,6 +7098,7 @@ static int rt2800_init_eeprom(struct rt2x00_dev *rt2x00dev) case RF3320: case RF3322: case RF5360: + case RF5362: case RF5370: case RF5372: case RF5390: @@ -7551,6 +7555,7 @@ static int rt2800_probe_hw_mode(struct rt2x00_dev *rt2x00dev) case RF3320: case RF3322: case RF5360: + case RF5362: case RF5370: case RF5372: case RF5390: @@ -7680,6 +7685,7 @@ static int rt2800_probe_hw_mode(struct rt2x00_dev *rt2x00dev) case RF3070: case RF3290: case RF5360: + case RF5362: case RF5370: case RF5372: case RF5390: