shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 03:15:31 +09:00
Code Issues Packages Projects Releases Wiki Activity

Revert "ODROID-COMMON: drivers/spi: Set the 64 bits per word by default"

Browse Source 
This reverts commit 1cff1ec2e4.

Change-Id: I59f92b783a89be3d9fca5663a929b30ccfa33972
This commit is contained in:
Luke go
2021-01-21 11:40:35 +09:00
committed by Chris
parent a5d2fdc45b
commit 9ac7382ab2
1 changed files with 5 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/spi/spi-meson-spicc.c
View File

@@ -479,9 +479,11 @@ static inline void meson_spicc_tx(struct meson_spicc_device *spicc)
static void meson_spicc_setup_pio_burst(struct meson_spicc_device *spicc)
{
unsigned int burst_len = min_t(unsigned int,
spicc->xfer_remain / spicc->bytes_per_word,
spicc->data->fifo_size);
unsigned int burst_len;
burst_len = min_t(unsigned int,
spicc->xfer_remain / spicc->bytes_per_word,
spicc->data->fifo_size);
/* Setup Xfer variables */
spicc->tx_remain = burst_len;
@@ -599,18 +601,6 @@ static int meson_spicc_transfer_one(struct spi_master *master,
spicc->rx_buf = (u8 *)xfer->rx_buf;
spicc->xfer_remain = xfer->len;
#if defined(CONFIG_ARCH_MESON64_ODROID_COMMON)
if ((xfer->len >= 64) && (xfer->bits_per_word == 8) && ((xfer->len % 8) == 0)) {
int cnt = xfer->len / 8;
int i;
u64 *tx_buf = (u64 *) &spicc->tx_buf[0];
for (i = 0; i < cnt; i++)
tx_buf[i] = __swab64p((__u64 *) &spicc->tx_buf[i * 8]);
xfer->bits_per_word = 64;
}
#endif
/* Pre-calculate word size */
spicc->bytes_per_word =
DIV_ROUND_UP(spicc->xfer->bits_per_word, 8);