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

Commit 9b280722 authored by Teemu Paasikivi's avatar Teemu Paasikivi Committed by John W. Linville
Browse files

wl1271: Added IO reset and init functions 



Added reset and init functions to IO layer of the driver.

Signed-off-by: default avatarTeemu Paasikivi <ext-teemu.3.paasikivi@nokia.com>
Reviewed-by: default avatarJuuso Oikarinen <juuso.oikarinen@nokia.com>
Signed-off-by: default avatarJuuso Oikarinen <juuso.oikarinen@nokia.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 7b048c52

drivers/net/wireless/wl12xx/wl1271_io.c

+10 −0
Original line number Original line Diff line number Diff line
@@ -115,6 +115,16 @@ int wl1271_set_partition(struct wl1271 *wl, 
	return 0;

	return 0;

}

}





void wl1271_io_reset(struct wl1271 *wl)

{

	wl1271_spi_reset(wl);

}



void wl1271_io_init(struct wl1271 *wl)

{

	wl1271_spi_init(wl);

}



void wl1271_raw_write(struct wl1271 *wl, int addr, void *buf,

void wl1271_raw_write(struct wl1271 *wl, int addr, void *buf,

		      size_t len, bool fixed)

		      size_t len, bool fixed)

{

{

drivers/net/wireless/wl12xx/wl1271_io.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -27,6 +27,8 @@ 




struct wl1271;

struct wl1271;





void wl1271_io_reset(struct wl1271 *wl);

void wl1271_io_init(struct wl1271 *wl);





/* Raw target IO, address is not translated */

/* Raw target IO, address is not translated */

void wl1271_raw_write(struct wl1271 *wl, int addr, void *buf,

void wl1271_raw_write(struct wl1271 *wl, int addr, void *buf,

drivers/net/wireless/wl12xx/wl1271_main.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -648,8 +648,8 @@ static int wl1271_chip_wakeup(struct wl1271 *wl) 
	msleep(WL1271_PRE_POWER_ON_SLEEP);

	msleep(WL1271_PRE_POWER_ON_SLEEP);

	wl1271_power_on(wl);

	wl1271_power_on(wl);

	msleep(WL1271_POWER_ON_SLEEP);

	msleep(WL1271_POWER_ON_SLEEP);

	wl1271_spi_reset(wl);

	wl1271_io_reset(wl);

	wl1271_spi_init(wl);

	wl1271_io_init(wl);





	/* We don't need a real memory partition here, because we only want

	/* We don't need a real memory partition here, because we only want

	 * to use the registers at this point. */

	 * to use the registers at this point. */