Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'mtd/fixes-for-5.0-rc3' of git://git.infradead.org/linux-mtd
Pull mtd fixes from Boris Brezillon:
"Raw NAND changes:
- jz4740: fix a compilation warning
- fsmc: fix a regression introduced by ->select_chip() deprecation
- denali: fix a regression introduced by NAND_KEEP_TIMINGS addition"
* tag 'mtd/fixes-for-5.0-rc3' of git://git.infradead.org/linux-mtd:
mtd: rawnand: denali: get ->setup_data_interface() working again
mtd: nand: jz4740: fix '__iomem *' vs. '* __iomem'
mtd: rawnand: fsmc: Keep bank enable bit set
+2
-23
+1
-1
drivers/mtd/nand/raw/denali.c
+1
-1
drivers/mtd/nand/raw/denali.c
···
1322
1322
}
1323
1323
1324
1324
/* clk rate info is needed for setup_data_interface */
1325
-
if (denali->clk_rate && denali->clk_x_rate)
1325
+
if (!denali->clk_rate || !denali->clk_x_rate)
1326
1326
chip->options |= NAND_KEEP_TIMINGS;
1327
1327
1328
1328
chip->legacy.dummy_controller.ops = &denali_controller_ops;
-21
drivers/mtd/nand/raw/fsmc_nand.c
-21
drivers/mtd/nand/raw/fsmc_nand.c
···
593
593
dma_xfer(host, (void *)buf, len, DMA_TO_DEVICE);
594
594
}
595
595
596
-
/* fsmc_select_chip - assert or deassert nCE */
597
-
static void fsmc_ce_ctrl(struct fsmc_nand_data *host, bool assert)
598
-
{
599
-
u32 pc = readl(host->regs_va + FSMC_PC);
600
-
601
-
if (!assert)
602
-
writel_relaxed(pc & ~FSMC_ENABLE, host->regs_va + FSMC_PC);
603
-
else
604
-
writel_relaxed(pc | FSMC_ENABLE, host->regs_va + FSMC_PC);
605
-
606
-
/*
607
-
* nCE line changes must be applied before returning from this
608
-
* function.
609
-
*/
610
-
mb();
611
-
}
612
-
613
596
/*
614
597
* fsmc_exec_op - hook called by the core to execute NAND operations
615
598
*
···
609
626
int i;
610
627
611
628
pr_debug("Executing operation [%d instructions]:\n", op->ninstrs);
612
-
613
-
fsmc_ce_ctrl(host, true);
614
629
615
630
for (op_id = 0; op_id < op->ninstrs; op_id++) {
616
631
instr = &op->instrs[op_id];
···
666
685
break;
667
686
}
668
687
}
669
-
670
-
fsmc_ce_ctrl(host, false);
671
688
672
689
return ret;
673
690
}
+1
-1
drivers/mtd/nand/raw/jz4740_nand.c
+1
-1
drivers/mtd/nand/raw/jz4740_nand.c