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

Commit 2971e66f authored by Stanislaw Gruszka's avatar Stanislaw Gruszka Committed by John W. Linville
Browse files

rt2800: move GPIO_SWITCH setup to 3390 specific rfcsr init 



Acked-by: default avatarGertjan van Wingerde <gwingerde@gmail.com>
Signed-off-by: default avatarStanislaw Gruszka <stf_xl@wp.pl>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent c9a221b2

drivers/net/wireless/rt2x00/rt2800lib.c

+7 −5
Original line number Diff line number Diff line
@@ -4665,6 +4665,8 @@ static void rt2800_init_rfcsr_3352(struct rt2x00_dev *rt2x00dev) 


static void rt2800_init_rfcsr_3390(struct rt2x00_dev *rt2x00dev)

{

	u32 reg;



	rt2800_rf_init_calibration(rt2x00dev, 30);



	rt2800_rfcsr_write(rt2x00dev, 0, 0xa0);
@@ -4699,6 +4701,10 @@ static void rt2800_init_rfcsr_3390(struct rt2x00_dev *rt2x00dev) 
	rt2800_rfcsr_write(rt2x00dev, 29, 0x8f);

	rt2800_rfcsr_write(rt2x00dev, 30, 0x20);

	rt2800_rfcsr_write(rt2x00dev, 31, 0x0f);



	rt2800_register_read(rt2x00dev, GPIO_SWITCH, &reg);

	rt2x00_set_field32(&reg, GPIO_SWITCH_5, 0);

	rt2800_register_write(rt2x00dev, GPIO_SWITCH, reg);

}



static void rt2800_init_rfcsr_3572(struct rt2x00_dev *rt2x00dev)
@@ -4989,11 +4995,7 @@ static int rt2800_init_rfcsr(struct rt2x00_dev *rt2x00dev) 
	}





	if (rt2x00_rt(rt2x00dev, RT3390)) {

		rt2800_register_read(rt2x00dev, GPIO_SWITCH, &reg);

		rt2x00_set_field32(&reg, GPIO_SWITCH_5, 0);

		rt2800_register_write(rt2x00dev, GPIO_SWITCH, reg);

	} else if (rt2x00_rt(rt2x00dev, RT3572)) {

	if (rt2x00_rt(rt2x00dev, RT3572)) {

		rt2800_rfcsr_read(rt2x00dev, 6, &rfcsr);

		rt2x00_set_field8(&rfcsr, RFCSR6_R2, 1);

		rt2800_rfcsr_write(rt2x00dev, 6, rfcsr);