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

Commit b85c804b authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: wigig_sensing: use 32 bit transactions for SPI block read"

parents dd787055 da7ab3c9

arch/arm64/configs/vendor/kona-perf_defconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -282,6 +282,7 @@ CONFIG_HDCP_QSEECOM=y 
CONFIG_QSEECOM=y

CONFIG_QSEECOM=y

CONFIG_UID_SYS_STATS=y

CONFIG_UID_SYS_STATS=y

CONFIG_OKL4_USER_VIRQ=y

CONFIG_OKL4_USER_VIRQ=y

CONFIG_WIGIG_SENSING_SPI=m

CONFIG_SCSI=y

CONFIG_SCSI=y

CONFIG_BLK_DEV_SD=y

CONFIG_BLK_DEV_SD=y

CONFIG_CHR_DEV_SG=y

CONFIG_CHR_DEV_SG=y

arch/arm64/configs/vendor/kona_defconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -292,6 +292,7 @@ CONFIG_HDCP_QSEECOM=y 
CONFIG_QSEECOM=y

CONFIG_QSEECOM=y

CONFIG_UID_SYS_STATS=y

CONFIG_UID_SYS_STATS=y

CONFIG_OKL4_USER_VIRQ=y

CONFIG_OKL4_USER_VIRQ=y

CONFIG_WIGIG_SENSING_SPI=m

CONFIG_SCSI=y

CONFIG_SCSI=y

CONFIG_BLK_DEV_SD=y

CONFIG_BLK_DEV_SD=y

CONFIG_CHR_DEV_SG=y

CONFIG_CHR_DEV_SG=y

drivers/misc/wigig_sensing.c

+2 −3
Original line number Original line Diff line number Diff line
@@ -244,13 +244,12 @@ static int spis_block_read_mem(struct spi_device *spi, 
		.tx_buf = ctx->tx_buf,

		.tx_buf = ctx->tx_buf,

		.rx_buf = ctx->rx_buf,

		.rx_buf = ctx->rx_buf,

		.len = sz,

		.len = sz,

		.bits_per_word = 8,

		.bits_per_word = 32,

		/*.bits_per_word = 32,*/

	};

	};

	u32 frame = 0xB << 24;

	u32 frame = 0xB << 24;





	frame |= address & 0xFFFFFF;

	frame |= address & 0xFFFFFF;

	frame = cpu_to_be32(frame);

	frame = cpu_to_le32(frame);





	/* Read length must be in 32 bit units */

	/* Read length must be in 32 bit units */

	if (length & 3) {

	if (length & 3) {