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

Commit 15cea993 authored by Ohad Ben-Cohen's avatar Ohad Ben-Cohen Committed by John W. Linville
Browse files

wl1271: make ref_clock configurable by board 



The wl1271 device is using a reference clock that may change
between board to board.

Make the ref_clock parameter configurable by board settings
instead of having a hard coded value in the sources.

Signed-off-by: default avatarOhad Ben-Cohen <ohad@wizery.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 09cecc34

drivers/net/wireless/wl12xx/wl1271.h

+1 −0
Original line number Diff line number Diff line
@@ -330,6 +330,7 @@ struct wl1271 { 


	void (*set_power)(bool enable);

	int irq;

	int ref_clock;



	spinlock_t wl_lock;

drivers/net/wireless/wl12xx/wl1271_boot.c

+7 −4
Original line number Diff line number Diff line
@@ -457,17 +457,20 @@ int wl1271_boot(struct wl1271 *wl) 
{

	int ret = 0;

	u32 tmp, clk, pause;

	int ref_clock = wl->ref_clock;



	wl1271_boot_hw_version(wl);



	if (REF_CLOCK == 0 || REF_CLOCK == 2 || REF_CLOCK == 4)

	if (ref_clock == 0 || ref_clock == 2 || ref_clock == 4)

		/* ref clk: 19.2/38.4/38.4-XTAL */

		clk = 0x3;

	else if (REF_CLOCK == 1 || REF_CLOCK == 3)

	else if (ref_clock == 1 || ref_clock == 3)

		/* ref clk: 26/52 */

		clk = 0x5;

	else

		return -EINVAL;



	if (REF_CLOCK != 0) {

	if (ref_clock != 0) {

		u16 val;

		/* Set clock type (open drain) */

		val = wl1271_top_reg_read(wl, OCP_REG_CLK_TYPE);
@@ -516,7 +519,7 @@ int wl1271_boot(struct wl1271 *wl) 
	wl1271_debug(DEBUG_BOOT, "clk2 0x%x", clk);



	/* 2 */

	clk |= (REF_CLOCK << 1) << 4;

	clk |= (ref_clock << 1) << 4;

	wl1271_write32(wl, DRPW_SCRATCH_START, clk);



	wl1271_set_partition(wl, &part_table[PART_WORK]);

drivers/net/wireless/wl12xx/wl1271_boot.h

+0 −1
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ struct wl1271_static_data { 
/* delay between retries */

#define INIT_LOOP_DELAY 50



#define REF_CLOCK            2

#define WU_COUNTER_PAUSE_VAL 0x3FF

#define WELP_ARM_COMMAND_VAL 0x4

drivers/net/wireless/wl12xx/wl1271_sdio.c

+1 −0
Original line number Diff line number Diff line
@@ -234,6 +234,7 @@ static int __devinit wl1271_probe(struct sdio_func *func, 
	}



	wl->irq = wlan_data->irq;

	wl->ref_clock = wlan_data->board_ref_clock;



	ret = request_irq(wl->irq, wl1271_irq, 0, DRIVER_NAME, wl);

	if (ret < 0) {

drivers/net/wireless/wl12xx/wl1271_spi.c

+2 −0
Original line number Diff line number Diff line
@@ -372,6 +372,8 @@ static int __devinit wl1271_probe(struct spi_device *spi) 
		goto out_free;

	}



	wl->ref_clock = pdata->board_ref_clock;



	wl->irq = spi->irq;

	if (wl->irq < 0) {

		wl1271_error("irq missing in platform data");