diff options
| author | Miquel Raynal <miquel.raynal@bootlin.com> | 2024-11-21 17:04:19 +0100 |
|---|---|---|
| committer | Miquel Raynal <miquel.raynal@bootlin.com> | 2024-11-21 17:04:19 +0100 |
| commit | 944477516bda30bc11e2c30e355da8dd6df48aaf (patch) | |
| tree | 6b9a040622d52dc302c314e3aa179712a4970422 /drivers/mtd/nand/raw/cadence-nand-controller.c | |
| parent | 34267d3c26fe5e43589fc8c2b50ab033b261ee8e (diff) | |
| parent | af264e5989055ac33f413c4c80874345cda0cc97 (diff) | |
Merge tag 'nand/for-6.13' into mtd/next
SPI-NAND changes:
A load of fixes to Winbond manufacturer driver have been done, plus a
structure constification.
Raw NAND changes:
The GPMI driver has been improved on the power management side.
The Davinci driver has been cleaned up.
A leak in the Atmel driver plus some typos in the core have been fixed.
Diffstat (limited to 'drivers/mtd/nand/raw/cadence-nand-controller.c')
| -rw-r--r-- | drivers/mtd/nand/raw/cadence-nand-controller.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/nand/raw/cadence-nand-controller.c b/drivers/mtd/nand/raw/cadence-nand-controller.c index a6a165735725..8d1d710e439d 100644 --- a/drivers/mtd/nand/raw/cadence-nand-controller.c +++ b/drivers/mtd/nand/raw/cadence-nand-controller.c @@ -1891,7 +1891,7 @@ static int cadence_nand_read_buf(struct cdns_nand_ctrl *cdns_ctrl, int len_in_words = (data_dma_width == 4) ? len >> 2 : len >> 3; - /* read alingment data */ + /* read alignment data */ if (data_dma_width == 4) ioread32_rep(cdns_ctrl->io.virt, buf, len_in_words); #ifdef CONFIG_64BIT |