aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mtd/nand/txx9ndfmc.c
diff options
context:
space:
mode:
authorBrian Norris <computersforpeace@gmail.com>2016-09-28 13:34:58 -0700
committerBrian Norris <computersforpeace@gmail.com>2016-10-03 09:51:35 -0700
commit1e2da4ad2e9b23556630bc774d3b1aaa61c0a69e (patch)
treec886868b46dac770418459eaaa0988504011f2e8 /drivers/mtd/nand/txx9ndfmc.c
parent5e149073ba427f99c5e751e558670d034a278f77 (diff)
parentd44154f969a44269a9288c274c1c2fd9e85df8a5 (diff)
downloadkernel_replicant_linux-1e2da4ad2e9b23556630bc774d3b1aaa61c0a69e.tar.gz
kernel_replicant_linux-1e2da4ad2e9b23556630bc774d3b1aaa61c0a69e.tar.bz2
kernel_replicant_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/txx9ndfmc.c')
-rw-r--r--drivers/mtd/nand/txx9ndfmc.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/mtd/nand/txx9ndfmc.c b/drivers/mtd/nand/txx9ndfmc.c
index 04d63f56baa4..0a14fda2e41b 100644
--- a/drivers/mtd/nand/txx9ndfmc.c
+++ b/drivers/mtd/nand/txx9ndfmc.c
@@ -303,8 +303,7 @@ static int __init txx9ndfmc_probe(struct platform_device *dev)
dev_info(&dev->dev, "CLK:%ldMHz HOLD:%d SPW:%d\n",
(gbusclk + 500000) / 1000000, hold, spw);
- spin_lock_init(&drvdata->hw_control.lock);
- init_waitqueue_head(&drvdata->hw_control.wq);
+ nand_hw_control_init(&drvdata->hw_control);
platform_set_drvdata(dev, drvdata);
txx9ndfmc_initialize(dev);