Skip to content

Commit e384010

Browse files
committed
Merge branch 'linux-5.15-trunk/at91/spi' into linux-5.15-mchp
2 parents f598314 + c4d4b76 commit e384010

1 file changed

Lines changed: 3 additions & 6 deletions

File tree

drivers/spi/atmel-quadspi.c

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -455,6 +455,9 @@ static bool atmel_qspi_supports_op(struct spi_mem *mem,
455455
{
456456
struct atmel_qspi *aq = spi_controller_get_devdata(mem->spi->master);
457457

458+
if (!spi_mem_default_supports_op(mem, op))
459+
return false;
460+
458461
if (aq->caps->octal) {
459462
if (atmel_qspi_sama7g5_find_mode(op) < 0)
460463
return false;
@@ -470,12 +473,6 @@ static bool atmel_qspi_supports_op(struct spi_mem *mem,
470473
op->dummy.nbytes == 0)
471474
return false;
472475

473-
/* DTR ops not supported. */
474-
if (op->cmd.dtr || op->addr.dtr || op->dummy.dtr || op->data.dtr)
475-
return false;
476-
if (op->cmd.nbytes != 1)
477-
return false;
478-
479476
return true;
480477
}
481478

0 commit comments

Comments
 (0)