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

Commit 052a625a authored by Luciano Coelho's avatar Luciano Coelho Committed by John W. Linville
Browse files

wl12xx: add support for fixed address in wl12xx_spi_read 



In the wl1271 implementation, we need to read memory from the register
partition using fixed addresses.  This change adds the possibility to request
fixed address when calling wl12xx_spi_read() or wl12xx_spi_reg_read().

Signed-off-by: default avatarLuciano Coelho <luciano.coelho@nokia.com>
Signed-off-by: default avatarKalle Valo <kalle.valo@nokia.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 27797d68

drivers/net/wireless/wl12xx/spi.c

+8 −4
Original line number Diff line number Diff line
@@ -258,7 +258,7 @@ int wl12xx_set_partition(struct wl12xx *wl, 
}



void wl12xx_spi_read(struct wl12xx *wl, int addr, void *buf,

		     size_t len)

		     size_t len, bool fixed)

{

	struct spi_transfer t[3];

	struct spi_message m;
@@ -273,6 +273,9 @@ void wl12xx_spi_read(struct wl12xx *wl, int addr, void *buf, 
	*cmd |= (len << WSPI_CMD_BYTE_LENGTH_OFFSET) & WSPI_CMD_BYTE_LENGTH;

	*cmd |= addr & WSPI_CMD_BYTE_ADDR;



	if (fixed)

		*cmd |= WSPI_CMD_FIXED;



	spi_message_init(&m);

	memset(t, 0, sizeof(t));
@@ -335,7 +338,7 @@ void wl12xx_spi_mem_read(struct wl12xx *wl, int addr, void *buf, 


	physical = wl12xx_translate_mem_addr(wl, addr);



	wl12xx_spi_read(wl, physical, buf, len);

	wl12xx_spi_read(wl, physical, buf, len, false);

}



void wl12xx_spi_mem_write(struct wl12xx *wl, int addr, void *buf,
@@ -348,13 +351,14 @@ void wl12xx_spi_mem_write(struct wl12xx *wl, int addr, void *buf, 
	wl12xx_spi_write(wl, physical, buf, len);

}



void wl12xx_spi_reg_read(struct wl12xx *wl, int addr, void *buf, size_t len)

void wl12xx_spi_reg_read(struct wl12xx *wl, int addr, void *buf, size_t len,

			 bool fixed)

{

	int physical;



	physical = wl12xx_translate_reg_addr(wl, addr);



	wl12xx_spi_read(wl, physical, buf, len);

	wl12xx_spi_read(wl, physical, buf, len, fixed);

}



void wl12xx_spi_reg_write(struct wl12xx *wl, int addr, void *buf, size_t len)

drivers/net/wireless/wl12xx/spi.h

+6 −3
Original line number Diff line number Diff line
@@ -71,8 +71,9 @@ 




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

void wl12xx_spi_read(struct wl12xx *wl, int addr, void *buf, size_t len);

void wl12xx_spi_write(struct wl12xx *wl, int addr, void *buf, size_t len);

void wl12xx_spi_read(struct wl12xx *wl, int addr, void *buf,

		     size_t len, bool fixed);



/* Memory target IO, address is tranlated to partition 0 */

void wl12xx_spi_mem_read(struct wl12xx *wl, int addr, void *buf, size_t len);
@@ -81,7 +82,8 @@ u32 wl12xx_mem_read32(struct wl12xx *wl, int addr); 
void wl12xx_mem_write32(struct wl12xx *wl, int addr, u32 val);



/* Registers IO */

void wl12xx_spi_reg_read(struct wl12xx *wl, int addr, void *buf, size_t len);

void wl12xx_spi_reg_read(struct wl12xx *wl, int addr, void *buf, size_t len,

			 bool fixed);

void wl12xx_spi_reg_write(struct wl12xx *wl, int addr, void *buf,size_t len);

u32 wl12xx_reg_read32(struct wl12xx *wl, int addr);

void wl12xx_reg_write32(struct wl12xx *wl, int addr, u32 val);
@@ -95,7 +97,8 @@ int wl12xx_set_partition(struct wl12xx *wl, 


static inline u32 wl12xx_read32(struct wl12xx *wl, int addr)

{

	wl12xx_spi_read(wl, addr, &wl->buffer_32, sizeof(wl->buffer_32));

	wl12xx_spi_read(wl, addr, &wl->buffer_32,

			sizeof(wl->buffer_32), false);



	return wl->buffer_32;

}