diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-01-25 09:20:49 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-01-25 09:20:49 +0100 |
| commit | 692665c621bb73f298d37bf6c6dad47ef94a5c2b (patch) | |
| tree | e8a304fb67125cbae6403434edc424b77efcaf97 /drivers/mtd/nand/tango_nand.c | |
| parent | dt-bindings: mt8173-mtu3: add reference clock (diff) | |
| parent | Linux 4.10-rc5 (diff) | |
| download | linux-692665c621bb73f298d37bf6c6dad47ef94a5c2b.tar.xz linux-692665c621bb73f298d37bf6c6dad47ef94a5c2b.zip | |
Merge 4.10-rc5 into usb-next
We need the USB fixes in here as well to handle future merge issues and
dependancies.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
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); |