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

Commit 1d614665 authored by Victor Goldenshtein's avatar Victor Goldenshtein Committed by Luciano Coelho
Browse files

wl18xx: add new phy configuration parameters for telec support 



Add back-off settings to the wl18xx_mac_and_phy_params.  We had an
empty space where the new parameters are added, so this change doesn't
affect backwards-compatibility with older firmwares.

Update WL18XX_CONF_VERSION accordingly.

Signed-off-by: default avatarVictor Goldenshtein <victorg@ti.com>
Signed-off-by: default avatarLuciano Coelho <coelho@ti.com>
parent 5dc283fe

drivers/net/wireless/ti/wl18xx/conf.h

+4 −3
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
#define __WL18XX_CONF_H__



#define WL18XX_CONF_MAGIC	0x10e100ca

#define WL18XX_CONF_VERSION	(WLCORE_CONF_VERSION | 0x0005)

#define WL18XX_CONF_VERSION	(WLCORE_CONF_VERSION | 0x0006)

#define WL18XX_CONF_MASK	0x0000ffff

#define WL18XX_CONF_SIZE	(WLCORE_CONF_SIZE + \

				 sizeof(struct wl18xx_priv_conf))
@@ -70,8 +70,9 @@ struct wl18xx_mac_and_phy_params { 
	u8 pwr_limit_reference_11_abg;

	u8 per_chan_pwr_limit_arr_11p[NUM_OF_CHANNELS_11_P];

	u8 pwr_limit_reference_11p;

	u8 spare1[9];

	u8 spare2[9];

	u8 spare1;

	u8 per_chan_bo_mode_11_abg[13];

	u8 per_chan_bo_mode_11_p[4];

	u8 primary_clock_setting_time;

	u8 clock_valid_on_wake_up;

	u8 secondary_clock_setting_time;

drivers/net/wireless/ti/wl18xx/main.c

+5 −0
Original line number Diff line number Diff line
@@ -547,6 +547,11 @@ static struct wl18xx_priv_conf wl18xx_default_priv_conf = { 
			0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,

			0xff, 0xff, 0xff, 0xff, 0xff, 0xff },

		.pwr_limit_reference_11p	= 0x64,

		.per_chan_bo_mode_11_abg	= { 0x00, 0x00, 0x00, 0x00,

						    0x00, 0x00, 0x00, 0x00,

						    0x00, 0x00, 0x00, 0x00,

						    0x00 },

		.per_chan_bo_mode_11_p		= { 0x00, 0x00, 0x00, 0x00 },

		.per_chan_pwr_limit_arr_11p	= { 0xff, 0xff, 0xff, 0xff,

						    0xff, 0xff, 0xff },

		.psat				= 0,