diff options
| author | Sekhar Nori <nsekhar@ti.com> | 2018-05-02 12:34:15 +0300 |
|---|---|---|
| committer | Sekhar Nori <nsekhar@ti.com> | 2018-05-02 12:34:15 +0300 |
| commit | ccfadbb759bed3cc40336e2c486e619e3bf8590b (patch) | |
| tree | b9f794fd56cfc3210d706a676cbf2124e54ec0f2 /drivers/mtd | |
| parent | 8e730c7f907a7ea4af760eb2058ca44b72cfb518 (diff) | |
| parent | 7c4db57cdb00a799722445b8dee8ca6fe12ec8d6 (diff) | |
| download | linux-ccfadbb759bed3cc40336e2c486e619e3bf8590b.tar.xz | |
Merge branch 'v4.18/nand-cs-simplification' into v4.18/soc
Diffstat (limited to 'drivers/mtd')
| -rw-r--r-- | drivers/mtd/nand/raw/davinci_nand.c | 6 |
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 */ |