diff options
| author | Brian Norris <computersforpeace@gmail.com> | 2017-01-05 09:33:26 -0800 |
|---|---|---|
| committer | Brian Norris <computersforpeace@gmail.com> | 2017-01-05 09:33:26 -0800 |
| commit | 5bdee5496978c6738dd90869b54c0f30c0344ccf (patch) | |
| tree | 6947c5c993ae85c8ee15a77e04cb7efe6bc29597 /drivers/mtd/nand/tango_nand.c | |
| parent | 0c744ea4f77d72b3dcebb7a8f2684633ec79be88 (diff) | |
| parent | cf9e1672a66c49ed8903c01b4c380a2f2dc91b40 (diff) | |
Merge tag 'nand/fixes-for-4.10-rc3' of github.com:linux-nand/linux
From Boris Brezillon:
"""
Fixes for 4.10-rc3
- Forbid compiling xway NAND controller driver as a module
- Fix tango NAND DT binding and make sure the controller is in a clean
state at probe time
- Add dependency on HAS_IOMEM to the oxnas NAND driver
- Fix irq number validity check in the lpc32xx driver
"""
Diffstat (limited to 'drivers/mtd/nand/tango_nand.c')
| -rw-r--r-- | drivers/mtd/nand/tango_nand.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/mtd/nand/tango_nand.c b/drivers/mtd/nand/tango_nand.c index 28c7f474be77..4a5e948c62df 100644 --- a/drivers/mtd/nand/tango_nand.c +++ b/drivers/mtd/nand/tango_nand.c @@ -632,11 +632,13 @@ static int tango_nand_probe(struct platform_device *pdev) if (IS_ERR(nfc->pbus_base)) return PTR_ERR(nfc->pbus_base); + writel_relaxed(MODE_RAW, nfc->pbus_base + PBUS_PAD_MODE); + clk = clk_get(&pdev->dev, NULL); if (IS_ERR(clk)) return PTR_ERR(clk); - nfc->chan = dma_request_chan(&pdev->dev, "nfc_sbox"); + nfc->chan = dma_request_chan(&pdev->dev, "rxtx"); if (IS_ERR(nfc->chan)) return PTR_ERR(nfc->chan); |