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

Commit afb7d3cd authored by Luciano Coelho's avatar Luciano Coelho
Browse files

wl12xx: move hardcoded hci_io_ds value into the conf struct 



Instead of hardcoding the hci_io_ds configuration that we write to the
SDIO_IO_DS top registed, read it from the default configuration so
that it's easier to change for different platforms.

Reported-by: default avatarIdo Yariv <ido@wizery.com>
Signed-off-by: default avatarLuciano Coelho <coelho@ti.com>
parent 6277ed65

drivers/net/wireless/wl12xx/boot.c

+1 −1
Original line number Diff line number Diff line
@@ -779,7 +779,7 @@ int wl1271_load_firmware(struct wl1271 *wl) 
	 * to upload_fw) */



	if (wl->chip.id == CHIP_ID_1283_PG20)

		wl1271_top_reg_write(wl, SDIO_IO_DS, HCI_IO_DS_6MA);

		wl1271_top_reg_write(wl, SDIO_IO_DS, wl->conf.hci_io_ds);



	ret = wl1271_boot_upload_firmware(wl);

	if (ret < 0)

drivers/net/wireless/wl12xx/boot.h

+7 −4
Original line number Diff line number Diff line
@@ -117,10 +117,13 @@ struct wl1271_static_data { 
#define SDIO_IO_DS                   0xd14



/* SDIO/wSPI DS configuration values */

#define HCI_IO_DS_8MA                0

#define HCI_IO_DS_4MA                1 /* default */

#define HCI_IO_DS_6MA                2

#define HCI_IO_DS_2MA                3

enum {

	HCI_IO_DS_8MA = 0,

	HCI_IO_DS_4MA = 1, /* default */

	HCI_IO_DS_6MA = 2,

	HCI_IO_DS_2MA = 3,

};



/* end PLL configuration algorithm for wl128x */



#endif

drivers/net/wireless/wl12xx/conf.h

+1 −0
Original line number Diff line number Diff line
@@ -1206,6 +1206,7 @@ struct conf_drv_settings { 
	struct conf_ht_setting ht;

	struct conf_memory_settings mem_wl127x;

	struct conf_memory_settings mem_wl128x;

	u8 hci_io_ds;

};



#endif

drivers/net/wireless/wl12xx/main.c

+1 −0
Original line number Diff line number Diff line
@@ -319,6 +319,7 @@ static struct conf_drv_settings default_conf = { 
		.min_req_rx_blocks            = 22,

		.tx_min                       = 27,

	},

	.hci_io_ds = HCI_IO_DS_6MA,

};



static void __wl1271_op_remove_interface(struct wl1271 *wl);