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

Commit da6cc32c authored by Oleksandr Suvorov's avatar Oleksandr Suvorov Committed by Greg Kroah-Hartman
Browse files

spi: fsl-lpspi: remove unneeded array 



[ Upstream commit 2fa98705a9289c758b6154a22174aa8d4041a285 ]

- replace the array with the shift operation
- remove the extra comparing operation.

Signed-off-by: default avatarOleksandr Suvorov <oleksandr.suvorov@toradex.com>
Link: https://lore.kernel.org/r/20200220141143.3902922-2-oleksandr.suvorov@toradex.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Stable-dep-of: 730bbfaf7d48 ("spi: spi-fsl-lpspi: Fix scldiv calculation")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 3bb46e26

drivers/spi/spi-fsl-lpspi.c

+2 −5
Original line number Diff line number Diff line
@@ -67,8 +67,6 @@ 
#define TCR_RXMSK	BIT(19)

#define TCR_TXMSK	BIT(18)



static int clkdivs[] = {1, 2, 4, 8, 16, 32, 64, 128};



struct lpspi_config {

	u8 bpw;

	u8 chip_select;
@@ -271,15 +269,14 @@ static int fsl_lpspi_set_bitrate(struct fsl_lpspi_data *fsl_lpspi) 
	}



	for (prescale = 0; prescale < 8; prescale++) {

		scldiv = perclk_rate /

			 (clkdivs[prescale] * config.speed_hz) - 2;

		scldiv = perclk_rate / config.speed_hz / (1 << prescale) - 2;

		if (scldiv < 256) {

			fsl_lpspi->config.prescale = prescale;

			break;

		}

	}



	if (prescale == 8 && scldiv >= 256)

	if (scldiv >= 256)

		return -EINVAL;



	writel(scldiv | (scldiv << 8) | ((scldiv >> 1) << 16),