summaryrefslogtreecommitdiff
path: root/drivers/mtd
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2018-05-25 14:57:56 +0300
committerOlof Johansson <olof@lixom.net>2018-05-25 14:57:56 +0300
commit8787ad3563bdc1c54703859108320b32444cb6b8 (patch)
tree79f57453ec03f985dcc1f46684c6fe919a7c8c06 /drivers/mtd
parent3a19f20c5a279c331e9b613d66c62ef523a36401 (diff)
parentccfadbb759bed3cc40336e2c486e619e3bf8590b (diff)
downloadlinux-8787ad3563bdc1c54703859108320b32444cb6b8.tar.xz
Merge tag 'davinci-for-v4.18/soc' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/soc
DaVinci SoC support updates for v4.18 Mainly contains patches to move NAND chipselect to platform data (currently platform device id is being used). These patches have been acked by NAND maintainer and because of the driver dependency an immutable branch has been provided to Boris. The other patch is to remove an unnecessary postcore_initcall() on DM644x which is needed for common clock framework conversion. * tag 'davinci-for-v4.18/soc' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci: ARM: davinci: dm644x: remove unnecessary postcore_initcall() ARM: davinci: aemif: stop using pdev->id as nand chipselect mtd: rawnand: davinci: stop using pdev->id as chipselect ARM: davinci: neuros-osd2: specify the chipselect in davinci_nand_pdata ARM: davinci: dm646x-evm: specify the chipselect in davinci_nand_pdata ARM: davinci: mityomapl138: specify the chipselect in davinci_nand_pdata ARM: davinci: dm644x-evm: specify the chipselect in davinci_nand_pdata ARM: davinci: dm365-evm: specify the chipselect in davinci_nand_pdata ARM: davinci: dm355-leopard: specify the chipselect in davinci_nand_pdata ARM: davinci: dm355-evm: specify the chipselect in davinci_nand_pdata ARM: davinci: da850-evm: specify the chipselect in davinci_nand_pdata ARM: davinci: da830-evm: specify the chipselect in davinci_nand_pdata mtd: rawnand: davinci: store the core chipselect number in platform data Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/mtd')
-rw-r--r--drivers/mtd/nand/raw/davinci_nand.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mtd/nand/raw/davinci_nand.c b/drivers/mtd/nand/raw/davinci_nand.c
index 0f09518d980f..0797abecda68 100644
--- a/drivers/mtd/nand/raw/davinci_nand.c
+++ b/drivers/mtd/nand/raw/davinci_nand.c
@@ -547,7 +547,7 @@ static struct davinci_nand_pdata
return ERR_PTR(-ENOMEM);
if (!of_property_read_u32(pdev->dev.of_node,
"ti,davinci-chipselect", &prop))
- pdev->id = prop;
+ pdata->core_chipsel = prop;
else
return ERR_PTR(-EINVAL);
@@ -629,7 +629,7 @@ static int nand_davinci_probe(struct platform_device *pdev)
return -ENODEV;
/* which external chipselect will we be managing? */
- if (pdev->id < 0 || pdev->id > 3)
+ if (pdata->core_chipsel < 0 || pdata->core_chipsel > 3)
return -ENODEV;
info = devm_kzalloc(&pdev->dev, sizeof(*info), GFP_KERNEL);
@@ -685,7 +685,7 @@ static int nand_davinci_probe(struct platform_device *pdev)
info->ioaddr = (uint32_t __force) vaddr;
info->current_cs = info->ioaddr;
- info->core_chipsel = pdev->id;
+ info->core_chipsel = pdata->core_chipsel;
info->mask_chipsel = pdata->mask_chipsel;
/* use nandboot-capable ALE/CLE masks by default */