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

Commit 5df1ff3a authored by Stanislaw Gruszka's avatar Stanislaw Gruszka Committed by John W. Linville
Browse files

rt2800: initialize BBP_R108 on proper subroutines 



Create helper function and move initialization to subroutines.

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

drivers/net/wireless/rt2x00/rt2800lib.c

+24 −17
Original line number Original line Diff line number Diff line
@@ -3953,6 +3953,20 @@ static void rt2800_init_bbp_early(struct rt2x00_dev *rt2x00dev) 
	rt2800_bbp_write(rt2x00dev, 106, 0x35);

	rt2800_bbp_write(rt2x00dev, 106, 0x35);

}

}





static void rt2800_disable_unused_dac_adc(struct rt2x00_dev *rt2x00dev)

{

	u16 eeprom;

	u8 value;



	rt2800_bbp_read(rt2x00dev, 138, &value);

	rt2x00_eeprom_read(rt2x00dev, EEPROM_NIC_CONF0, &eeprom);

	if (rt2x00_get_field16(eeprom, EEPROM_NIC_CONF0_TXPATH) == 1)

		value |= 0x20;

	if (rt2x00_get_field16(eeprom, EEPROM_NIC_CONF0_RXPATH) == 1)

		value &= ~0x02;

	rt2800_bbp_write(rt2x00dev, 138, value);

}



static void rt2800_init_bbp_305x_soc(struct rt2x00_dev *rt2x00dev)

static void rt2800_init_bbp_305x_soc(struct rt2x00_dev *rt2x00dev)

{

{

	rt2800_bbp_write(rt2x00dev, 31, 0x08);

	rt2800_bbp_write(rt2x00dev, 31, 0x08);
@@ -4062,6 +4076,10 @@ static void rt2800_init_bbp_30xx(struct rt2x00_dev *rt2x00dev) 
	rt2800_bbp_write(rt2x00dev, 105, 0x05);

	rt2800_bbp_write(rt2x00dev, 105, 0x05);





	rt2800_bbp_write(rt2x00dev, 106, 0x35);

	rt2800_bbp_write(rt2x00dev, 106, 0x35);



	if (rt2x00_rt(rt2x00dev, RT3071) ||

	    rt2x00_rt(rt2x00dev, RT3090))

		rt2800_disable_unused_dac_adc(rt2x00dev);

}

}





static void rt2800_init_bbp_3290(struct rt2x00_dev *rt2x00dev)

static void rt2800_init_bbp_3290(struct rt2x00_dev *rt2x00dev)
@@ -4200,6 +4218,8 @@ static void rt2800_init_bbp_3390(struct rt2x00_dev *rt2x00dev) 
	rt2800_bbp_write(rt2x00dev, 105, 0x05);

	rt2800_bbp_write(rt2x00dev, 105, 0x05);





	rt2800_bbp_write(rt2x00dev, 106, 0x35);

	rt2800_bbp_write(rt2x00dev, 106, 0x35);



	rt2800_disable_unused_dac_adc(rt2x00dev);

}

}





static void rt2800_init_bbp_3572(struct rt2x00_dev *rt2x00dev)

static void rt2800_init_bbp_3572(struct rt2x00_dev *rt2x00dev)
@@ -4235,6 +4255,8 @@ static void rt2800_init_bbp_3572(struct rt2x00_dev *rt2x00dev) 
	rt2800_bbp_write(rt2x00dev, 105, 0x05);

	rt2800_bbp_write(rt2x00dev, 105, 0x05);





	rt2800_bbp_write(rt2x00dev, 106, 0x35);

	rt2800_bbp_write(rt2x00dev, 106, 0x35);



	rt2800_disable_unused_dac_adc(rt2x00dev);

}

}





static void rt2800_init_bbp_53xx(struct rt2x00_dev *rt2x00dev)

static void rt2800_init_bbp_53xx(struct rt2x00_dev *rt2x00dev)
@@ -4300,6 +4322,8 @@ static void rt2800_init_bbp_53xx(struct rt2x00_dev *rt2x00dev) 
		rt2800_bbp_write(rt2x00dev, 134, 0xd0);

		rt2800_bbp_write(rt2x00dev, 134, 0xd0);

		rt2800_bbp_write(rt2x00dev, 135, 0xf6);

		rt2800_bbp_write(rt2x00dev, 135, 0xf6);

	}

	}



	rt2800_disable_unused_dac_adc(rt2x00dev);

}

}





static void rt2800_init_bbp_5592(struct rt2x00_dev *rt2x00dev)

static void rt2800_init_bbp_5592(struct rt2x00_dev *rt2x00dev)
@@ -4418,23 +4442,6 @@ static void rt2800_init_bbp(struct rt2x00_dev *rt2x00dev) 
		return;

		return;

	}

	}





	if (rt2x00_rt(rt2x00dev, RT3071) ||

	    rt2x00_rt(rt2x00dev, RT3090) ||

	    rt2x00_rt(rt2x00dev, RT3390) ||

	    rt2x00_rt(rt2x00dev, RT3572) ||

	    rt2x00_rt(rt2x00dev, RT5390) ||

	    rt2x00_rt(rt2x00dev, RT5392)) {

		rt2800_bbp_read(rt2x00dev, 138, &value);



		rt2x00_eeprom_read(rt2x00dev, EEPROM_NIC_CONF0, &eeprom);

		if (rt2x00_get_field16(eeprom, EEPROM_NIC_CONF0_TXPATH) == 1)

			value |= 0x20;

		if (rt2x00_get_field16(eeprom, EEPROM_NIC_CONF0_RXPATH) == 1)

			value &= ~0x02;



		rt2800_bbp_write(rt2x00dev, 138, value);

	}



	if (rt2x00_rt(rt2x00dev, RT3290)) {

	if (rt2x00_rt(rt2x00dev, RT3290)) {

		rt2800_bbp_write(rt2x00dev, 67, 0x24);

		rt2800_bbp_write(rt2x00dev, 67, 0x24);

		rt2800_bbp_write(rt2x00dev, 143, 0x04);

		rt2800_bbp_write(rt2x00dev, 143, 0x04);