diff options
| author | Brian Norris <computersforpeace@gmail.com> | 2016-09-28 13:34:58 -0700 |
|---|---|---|
| committer | Brian Norris <computersforpeace@gmail.com> | 2016-10-03 09:51:35 -0700 |
| commit | 1e2da4ad2e9b23556630bc774d3b1aaa61c0a69e (patch) | |
| tree | c886868b46dac770418459eaaa0988504011f2e8 /drivers/mtd/nand/jz4780_nand.c | |
| parent | 5e149073ba427f99c5e751e558670d034a278f77 (diff) | |
| parent | d44154f969a44269a9288c274c1c2fd9e85df8a5 (diff) | |
| download | linux-1e2da4ad2e9b23556630bc774d3b1aaa61c0a69e.tar.gz linux-1e2da4ad2e9b23556630bc774d3b1aaa61c0a69e.tar.bz2 linux-1e2da4ad2e9b23556630bc774d3b1aaa61c0a69e.zip | |
Merge tag 'for-4.9' of github.com:linux-nand/linux
"
Notable core changes:
- add the infrastructure to automate NAND timings configuration
- provide a generic DT property to maximize ECC strength
The rest is just a bunch of minor drivers and core fixes/cleanup
patches.
"
Also not noted: some refactoring in the core bad block table handling,
to help with improving some of the logic in error cases.
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Diffstat (limited to 'drivers/mtd/nand/jz4780_nand.c')
| -rw-r--r-- | drivers/mtd/nand/jz4780_nand.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/mtd/nand/jz4780_nand.c b/drivers/mtd/nand/jz4780_nand.c index 175f67da25af..a39bb70175ee 100644 --- a/drivers/mtd/nand/jz4780_nand.c +++ b/drivers/mtd/nand/jz4780_nand.c @@ -368,9 +368,8 @@ static int jz4780_nand_probe(struct platform_device *pdev) nfc->dev = dev; nfc->num_banks = num_banks; - spin_lock_init(&nfc->controller.lock); + nand_hw_control_init(&nfc->controller); INIT_LIST_HEAD(&nfc->chips); - init_waitqueue_head(&nfc->controller.wq); ret = jz4780_nand_init_chips(nfc, pdev); if (ret) { |